Merge branch 'master' into grubberr/issue-12173-issue-12266-source-gi…

…thub

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.37.0-alpha
+current_version = 0.38.3-alpha
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?

.env

@@ -10,7 +10,7 @@
 
 
 ### SHARED ###
-VERSION=0.37.0-alpha
+VERSION=0.38.3-alpha
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data

.github/actions/start-aws-runner/action.yml

@@ -9,7 +9,7 @@ inputs:
     required: true
   ec2-image-id:
     # github-self-hosted-runner-ubuntu-20-100g-disk-with-cypress-deps
-    default: "ami-08927c058921b27f4"
+    default: "ami-0f23be2f917510c26"
     required: true
   ec2-instance-type:
     default: "c5.2xlarge"

.github/workflows/gradle.yml

@@ -57,6 +57,7 @@ jobs:
               - 'octavia-cli/**'
             connectors:
               - 'airbyte-cdk/**'
+              - 'airbyte-protocol/**'
               - 'airbyte-integrations/**'
             db:
               - 'airbyte-db/**'

.gitignore

@@ -1,6 +1,5 @@
 .gradle
 .idea
-.vscode
 *.iml
 *.swp
 build
@@ -13,7 +12,6 @@ data
 .settings
 **/gmon.out
 static_checker_reports/
-.vscode
 
 # Logs
 acceptance_tests_logs/

.vscode/frontend.code-workspace

@@ -0,0 +1,54 @@
+{
+  "folders": [
+    {
+      "path": "../airbyte-webapp"
+    },
+    {
+      "path": "../airbyte-webapp-e2e-tests"
+    }
+  ],
+  "extensions": {
+    "recommendations": [
+      "dbaeumer.vscode-eslint",
+      "esbenp.prettier-vscode",
+      "ms-vsliveshare.vsliveshare",
+      "eamodio.gitlens"
+    ]
+  },
+  "settings": {
+    "javascript.preferences.quoteStyle": "double",
+    "typescript.preferences.quoteStyle": "double",
+    "javascript.preferences.importModuleSpecifier": "shortest",
+    "typescript.preferences.importModuleSpecifier": "shortest",
+    "javascript.updateImportsOnFileMove.enabled": "always",
+    "typescript.updateImportsOnFileMove.enabled": "always",
+    "editor.detectIndentation": true,
+    "eslint.format.enable": true,
+    "eslint.run": "onType",
+    "[javascript]": {
+      "editor.formatOnSave": true,
+      "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+      "editor.codeActionsOnSave": {
+        "source.organizeImports": false
+      }
+    },
+    "[typescript]": {
+      "editor.formatOnSave": true,
+      "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+      "editor.codeActionsOnSave": {
+        "source.organizeImports": false
+      }
+    },
+    "[typescriptreact]": {
+      "editor.formatOnSave": true,
+      "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+      "editor.codeActionsOnSave": {
+        "source.organizeImports": false
+      }
+    },
+    "[json]": {
+      "editor.formatOnSave": true,
+      "editor.defaultFormatter": "esbenp.prettier-vscode"
+    }
+  }
+}

.vscode/settings.json

@@ -0,0 +1,36 @@
+{
+  "javascript.preferences.quoteStyle": "double",
+  "typescript.preferences.quoteStyle": "double",
+  "javascript.preferences.importModuleSpecifier": "shortest",
+  "typescript.preferences.importModuleSpecifier": "shortest",
+  "javascript.updateImportsOnFileMove.enabled": "always",
+  "typescript.updateImportsOnFileMove.enabled": "always",
+  "editor.detectIndentation": true,
+  "eslint.format.enable": true,
+  "eslint.run": "onType",
+  "[javascript]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": false
+    }
+  },
+  "[typescript]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": false
+    }
+  },
+  "[typescriptreact]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": false
+    }
+  },
+  "[json]": {
+    "editor.formatOnSave": true,
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
+}

airbyte-api/src/main/openapi/config.yaml

@@ -3862,6 +3862,7 @@ components:
         - persistence
         - normalization
         - dbt
+        - airbyte_platform
     AttemptFailureType:
       description: Categorizes well known errors into types for programmatic handling. If not set, the type of error is not well known.
       type: string

airbyte-bootloader/Dockerfile

@@ -1,7 +1,8 @@
 ARG JDK_VERSION=17.0.1
-FROM openjdk:${JDK_VERSION}-slim
+ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
+FROM ${JDK_IMAGE}
 
-ARG VERSION=0.37.0-alpha
+ARG VERSION=0.38.3-alpha
 
 ENV APPLICATION airbyte-bootloader
 ENV VERSION ${VERSION}

airbyte-bootloader/build.gradle

@@ -14,9 +14,9 @@ dependencies {
     implementation project(':airbyte-scheduler:persistence')
 
     implementation 'io.temporal:temporal-sdk:1.8.1'
-    implementation "org.flywaydb:flyway-core:7.14.0"
+    implementation libs.flyway.core
 
-    testImplementation "org.testcontainers:postgresql:1.15.3"
+    testImplementation libs.testcontainers.postgresql
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:1.2.0'
 }