Merge branch 'main' into margaritagomez/destination-propel-icon

airbytehq · Mar 6, 2024 · fc0f6c6 · fc0f6c6
2 parents c51aa68 + 4c820b6
commit fc0f6c6
Show file tree

Hide file tree

Showing 412 changed files with 7,987 additions and 8,605 deletions.
diff --git a/.env b/.env
@@ -33,8 +33,10 @@ LOCAL_DOCKER_MOUNT=/tmp/airbyte_local
 HACK_LOCAL_ROOT_PARENT=/tmp
 
 # Storage type
-WORKER_LOGS_STORAGE_TYPE=local
-WORKER_STATE_STORAGE_TYPE=local
+STORAGE_TYPE=local
+STORAGE_BUCKET_LOG=airbyte-dev-logs
+STORAGE_BUCKET_STATE=state-storage
+STORAGE_BUCKET_WORKLOAD_OUTPUT=state-storage
 
 # Proxy Configuration
 # Set to empty values, e.g. "" to disable basic auth

diff --git a/...yte-analytics/src/test/kotlin/io/airbyte/analytics/BlockingShutdownAnalyticsPluginTest.kt b/...yte-analytics/src/test/kotlin/io/airbyte/analytics/BlockingShutdownAnalyticsPluginTest.kt
@@ -35,7 +35,7 @@ class BlockingShutdownAnalyticsPluginTest {
     val bodyJson = "{}"
     val client: Client = mockk()
     val response: Response = mockk()
-    val flushInterval = 60L
+    val flushInterval = 120L
     val writeKey = "write-key"
     val plugin = BlockingShutdownAnalyticsPlugin(flushInterval)
 

diff --git a/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/JobsController.kt b/airbyte-api-server/src/main/kotlin/io/airbyte/api/server/controllers/JobsController.kt
@@ -273,7 +273,7 @@ open class JobsController(
     var field: OrderByFieldEnum = OrderByFieldEnum.CREATEDAT
     var method: OrderByMethodEnum = OrderByMethodEnum.ASC
     if (orderBy != null) {
-      val pattern: java.util.regex.Pattern = java.util.regex.Pattern.compile("([a-zA-Z0-9]+)|(ASC|DESC)")
+      val pattern: java.util.regex.Pattern = java.util.regex.Pattern.compile("([a-zA-Z0-9]+)\\|(ASC|DESC)")
       val matcher: java.util.regex.Matcher = pattern.matcher(orderBy)
       if (!matcher.find()) {
         throw BadRequestProblem("Invalid order by clause provided: $orderBy")

diff --git a/airbyte-api/src/main/openapi/cloud-config.yaml b/airbyte-api/src/main/openapi/cloud-config.yaml
@@ -1307,6 +1307,7 @@ components:
       enum:
         - community
         - certified
+        - archived
         - none
 
     ConnectionProto: