Merge branch 'main' into cyberhippo/external-db-ssl

Author: CyberHippo

.bumpversion.cfg

@@ -33,10 +33,6 @@ replace = appVersion: {new_version}
 search = appVersion: dev
 replace = appVersion: {new_version}
 
-[bumpversion:file:charts/airbyte-pod-sweeper/Chart.yaml]
-search = appVersion: dev
-replace = appVersion: {new_version}
-
 [bumpversion:file:charts/airbyte-server/Chart.yaml]
 search = appVersion: dev
 replace = appVersion: {new_version}

.github/workflows/fe-validate-links.yml

@@ -4,8 +4,8 @@
 name: Airbyte Platform OSS Developer Build
 
 env:
-  S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
-  S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
+  S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.PLATFORM_BUILD_CACHE_ACCESS_KEY_ID }}
+  S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.PLATFORM_BUILD_CACHE_SECRET_KEY }}
 
 on:
   #ability to start task manually in Web UI

.github/workflows/gradle.yml

@@ -15,8 +15,8 @@ jobs:
     steps:
       - name: List and Terminate Instances Older Than 4 Hours
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.PLATFORM_BUILD_CACHE_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.PLATFORM_BUILD_CACHE_SECRET_KEY }}
           # See https://github.com/aws/aws-cli/issues/5623
           AWS_EC2_METADATA_DISABLED: true
         run: |

.github/workflows/slash-commands.yml

@@ -22,6 +22,11 @@ acceptance_tests_logs/
 # Secrets
 secrets
 !airbyte-config/config-secrets/src/main/kotlin/secrets
+!airbyte-config/config-secrets/src/test/kotlin/secrets
+!airbyte-config/config-models/src/main/kotlin/io/airbyte/config/secrets
+!airbyte-config/config-models/src/test/kotlin/io/airbyte/config/secrets
+!airbyte-domain/services/src/main/kotlin/io/airbyte/domain/services/secrets
+!airbyte-domain/services/src/test/kotlin/io/airbyte/domain/services/secrets
 updated_configurations
 !airbyte-integrations/connector-templates/**/secrets
 

.github/workflows/terminate-zombie-build-instances.yml

@@ -5,9 +5,9 @@
 package io.airbyte.analytics
 
 import io.airbyte.api.client.generated.WorkspaceApi
-import io.airbyte.api.client.model.generated.Geography
 import io.airbyte.api.client.model.generated.WorkspaceIdRequestBody
 import io.airbyte.api.client.model.generated.WorkspaceRead
+import io.airbyte.commons.constants.GEOGRAPHY_AUTO
 import io.airbyte.config.Organization
 import io.airbyte.config.ScopeType
 import io.airbyte.data.services.OrganizationService
@@ -141,8 +141,7 @@ class TrackingIdentityFetcherTest {
         anonymousDataCollection = false,
         news = true,
         securityUpdates = true,
-        defaultGeography =
-          Geography.AUTO,
+        defaultGeography = GEOGRAPHY_AUTO,
         name = "",
         slug = "",
         initialSetupComplete = true,
@@ -176,8 +175,7 @@ class TrackingIdentityFetcherTest {
         anonymousDataCollection = true,
         news = true,
         securityUpdates = true,
-        defaultGeography =
-          Geography.AUTO,
+        defaultGeography = GEOGRAPHY_AUTO,
         name = "",
         slug = "",
         initialSetupComplete = true,

.gitignore

@@ -7,9 +7,9 @@ package io.airbyte.api.client.auth
 import okhttp3.Interceptor
 
 /**
- * Custom interface that extends the OkHttp3 {@link Interceptor} interface
- * for dependency injection purposes.  This allows for DI configuration to
- * differentiate between interceptors that should be used by the different
- * API clients (Airbyte API, Workload API, etc.).
+ * Custom interface that extends the OkHttp3 {@link Interceptor} interface for dependency injection purposes.
+ *
+ * This allows for DI configuration to differentiate between interceptors that should be used by the different API clients
+ * (Airbyte API, Workload API, etc.).
  */
 interface AirbyteApiInterceptor : Interceptor

airbyte-analytics/src/test/kotlin/io/airbyte/analytics/TrackingIdentityFetcherTest.kt

@@ -18,16 +18,15 @@ private val logger = KotlinLogging.logger {}
 
 private val UUID_REGEX = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}".toRegex()
 
-fun getUrlTags(httpUrl: HttpUrl?): Array<MetricAttribute> {
-  return httpUrl?.let {
+fun getUrlTags(httpUrl: HttpUrl?): Array<MetricAttribute> =
+  httpUrl?.let {
     val last = it.pathSegments.last()
     if (last.contains(UUID_REGEX)) {
-      return arrayOf(MetricAttribute("url", it.toString().removeSuffix(last)), MetricAttribute("workload-id", last))
+      arrayOf(MetricAttribute("url", it.toString().removeSuffix(last)), MetricAttribute("workload-id", last))
     } else {
-      return arrayOf(MetricAttribute("url", it.toString()))
+      arrayOf(MetricAttribute("url", it.toString()))
     }
   } ?: emptyArray()
-}
 
 const val UNKNOWN = "unknown"