Add margin to bottom and sides for cloud pages

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.39.7-alpha
+current_version = 0.39.13-alpha
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
@@ -16,8 +16,6 @@ serialize =
 
 [bumpversion:file:airbyte-metrics/reporter/Dockerfile]
 
-[bumpversion:file:airbyte-scheduler/app/Dockerfile]
-
 [bumpversion:file:airbyte-server/Dockerfile]
 
 [bumpversion:file:airbyte-webapp/package.json]

.env

@@ -10,7 +10,7 @@
 
 
 ### SHARED ###
-VERSION=0.39.7-alpha
+VERSION=0.39.13-alpha
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data
@@ -77,10 +77,6 @@ SENTRY_DSN="https://[email protected]/6
 
 
 ### APPLICATIONS ###
-# Scheduler #
-# Relevant to scaling.
-SUBMITTER_NUM_THREADS=10
-
 # Worker #
 # Relevant to scaling.
 MAX_SYNC_WORKERS=5

.github/pull_request_template.md

@@ -26,7 +26,6 @@ Expand the relevant checklist and delete the others.
 - [ ] Documentation updated
     - [ ] Connector's `README.md`
     - [ ] Connector's `bootstrap.md`. See [description and examples](https://docs.google.com/document/d/1ypdgmwmEHWv-TrO4_YOQ7pAJGVrMp5BOkEVh831N260/edit?usp=sharing)
-    - [ ] `docs/SUMMARY.md`
     - [ ] `docs/integrations/<source or destination>/<name>.md` including changelog. See changelog [example](https://docs.airbyte.io/integrations/sources/stripe#changelog)
     - [ ] `docs/integrations/README.md`
     - [ ] `airbyte-integrations/builds.md`

.github/workflows/gradle.yml

@@ -521,11 +521,11 @@ jobs:
           label: ${{ needs.start-platform-build-runner.outputs.label }}
           ec2-instance-id: ${{ needs.start-platform-build-runner.outputs.ec2-instance-id }}
 
-  ## Kube Acceptance Tests (with scheduler v2 - both temporal changes and container orchestrator)
+  ## Kube Acceptance Tests
   # Docker acceptance tests run as part of the build job.
   # In case of self-hosted EC2 errors, remove this block.
-  start-kube-acceptance-test-runner-v2:
-    name: "Platform: Start Scheduler V2 Kube Acceptance Test Runner"
+  start-kube-acceptance-test-runner:
+    name: "Platform: Start Kube Acceptance Test Runner"
     needs:
       - changes
       - find_valid_pat
@@ -548,11 +548,11 @@ jobs:
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           github-token: ${{ needs.find_valid_pat.outputs.pat }}
-  kube-acceptance-test-v2:
-    name: "Platform: Acceptance Tests (Kube v2)"
+  kube-acceptance-test:
+    name: "Platform: Acceptance Tests (Kube)"
     # In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest.
-    needs: start-kube-acceptance-test-runner-v2 # required to start the main job when the runner is ready
-    runs-on: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.label }} # run the job on the newly created runner
+    needs: start-kube-acceptance-test-runner # required to start the main job when the runner is ready
+    runs-on: ${{ needs.start-kube-acceptance-test-runner.outputs.label }} # run the job on the newly created runner
     environment: more-secrets
     timeout-minutes: 90
     steps:
@@ -631,17 +631,17 @@ jobs:
           name: Kubernetes Logs
           path: /tmp/kubernetes_logs/*
   # In case of self-hosted EC2 errors, remove this block.
-  stop-kube-acceptance-test-runner-v2:
+  stop-kube-acceptance-test-runner:
     name: "Platform: Stop Kube Acceptance Test EC2 Runner"
     timeout-minutes: 10
     needs:
-      - start-kube-acceptance-test-runner-v2 # required to get output from the start-runner job
-      - kube-acceptance-test-v2 # required to wait when the main job is done
+      - start-kube-acceptance-test-runner # required to get output from the start-runner job
+      - kube-acceptance-test # required to wait when the main job is done
       - find_valid_pat
     runs-on: ubuntu-latest
     # Always is required to stop the runner even if the previous job has errors. However always() runs even if the previous step is skipped.
     # Thus, we check for skipped here.
-    if: ${{ always() && needs.start-kube-acceptance-test-runner-v2.result != 'skipped'}}
+    if: ${{ always() && needs.start-kube-acceptance-test-runner.result != 'skipped'}}
     steps:
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -654,8 +654,8 @@ jobs:
         with:
           mode: stop
           github-token: ${{ needs.find_valid_pat.outputs.pat }}
-          label: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.label }}
-          ec2-instance-id: ${{ needs.start-kube-acceptance-test-runner-v2.outputs.ec2-instance-id }}
+          label: ${{ needs.start-kube-acceptance-test-runner.outputs.label }}
+          ec2-instance-id: ${{ needs.start-kube-acceptance-test-runner.outputs.ec2-instance-id }}
 
   notify-failure-slack-channel:
     name: "Notify Slack Channel on Build Failures"
@@ -665,7 +665,7 @@ jobs:
       - frontend-build
       - octavia-cli-build
       - platform-build
-      - kube-acceptance-test-v2
+      - kube-acceptance-test
     if: ${{ failure() && github.ref == 'refs/heads/master' }}
     steps:
       - name: Publish to OSS Build Failure Slack Channel
@@ -689,7 +689,7 @@ jobs:
       - frontend-build
       - octavia-cli-build
       - platform-build
-      - kube-acceptance-test-v2
+      - kube-acceptance-test
     if: success()
     steps:
       - name: Get Previous Workflow Status

.github/workflows/shared-pulls.yml

@@ -1,7 +1,7 @@
 name: "Shared Pull Requests"
 on:
   pull_request_target:
-    types: [opened]
+    types: [opened, labeled, unlabeled, ready_for_review, synchronize, reopened]
 
 jobs:
   shared-pulls:

airbyte-analytics/build.gradle

@@ -2,7 +2,9 @@ dependencies {
     implementation 'com.segment.analytics.java:analytics:2.1.1'
 
 
-    implementation project(':airbyte-config:models')
-    implementation project(':airbyte-config:persistence')
+    implementation project(':airbyte-config:config-models')
+    implementation project(':airbyte-config:config-persistence')
     implementation project(':airbyte-json-validation')
 }
+
+Task publishArtifactsTask = getPublishArtifactsTask("$rootProject.ext.version", project)

airbyte-api/build.gradle

@@ -36,7 +36,15 @@ task generateApiServer(type: GenerateTask) {
     configOptions = [
             dateLibrary  : "java8",
             generatePom  : "false",
-            interfaceOnly: "true"
+            interfaceOnly: "true",
+            /*
+            JAX-RS generator does not respect nullable properties defined in the OpenApi Spec.
+            It means that if a field is not nullable but not set it is still returning a null value for this field in the serialized json.
+            The below Jackson annotation is made to only keep non null values in serialized json.
+            We are not yet using nullable=true properties in our OpenApi so this is a valid workaround at the moment to circumvent the default JAX-RS behavior described above.
+            Feel free to read the conversation on https://github.com/airbytehq/airbyte/pull/13370 for more details.
+            */
+            additionalModelTypeAnnotations: "\[email protected](com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)"
     ]
 }
 compileJava.dependsOn tasks.generateApiServer
@@ -143,3 +151,4 @@ sourceSets {
     }
 }
 
+Task publishArtifactsTask = getPublishArtifactsTask("$rootProject.ext.version", project)

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

@@ -2323,7 +2323,6 @@ components:
           type: string
     CustomerioNotificationConfiguration:
       type: object
-      nullable: true
     NotificationType:
       type: string
       enum:
@@ -3141,7 +3140,6 @@ components:
         sourceCatalogId:
           type: string
           format: uuid
-          nullable: true
     WebBackendConnectionCreate:
       type: object
       required:
@@ -3222,7 +3220,6 @@ components:
         sourceCatalogId:
           type: string
           format: uuid
-          nullable: true
     WebBackendConnectionUpdate:
       type: object
       required:
@@ -3309,7 +3306,6 @@ components:
         sourceCatalogId:
           type: string
           format: uuid
-          nullable: true
     ConnectionSearch:
       type: object
       properties:
@@ -3387,7 +3383,6 @@ components:
     ConnectionSchedule:
       description: if null, then no schedule is set.
       type: object
-      nullable: true
       required:
         - units
         - timeUnit
@@ -3519,7 +3514,6 @@ components:
             #- unnesting
     OperatorDbt:
       type: object
-      nullable: true
       required:
         - gitRepoUrl
       properties:
@@ -3600,7 +3594,6 @@ components:
         sourceDefinedCursor:
           description: If the source defines the cursor field, then any other cursor field inputs will be ignored. If it does not, either the user_provided one is used, or the default one is used as a backup.
           type: boolean
-          nullable: true
         defaultCursorField:
           description: Path to the field that will be used to determine if a record is new or modified since the last sync. If not provided by the source, the end user will have to specify the comparable themselves.
           type: array
@@ -3615,7 +3608,6 @@ components:
               type: string
         namespace:
           type: string
-          nullable: true
           description: Optional Source-defined namespace. Airbyte streams from the same sources should have the same namespace. Currently only used by JDBC destinations to determine what schema to write to.
     StreamJsonSchema:
       type: object
@@ -3796,7 +3788,6 @@ components:
           $ref: "#/components/schemas/AttemptFailureSummary"
     AttemptStats:
       type: object
-      nullable: true
       properties:
         recordsEmitted:
           type: integer
@@ -3822,7 +3813,6 @@ components:
           $ref: "#/components/schemas/AttemptStats"
     AttemptFailureSummary:
       type: object
-      nullable: true
       required:
         - failures
       properties:
@@ -4036,7 +4026,6 @@ components:
     ResourceRequirements:
       description: optional resource requirements to run workers (blank for unbounded allocations)
       type: object
-      nullable: true
       properties:
         cpu_request:
           type: string

airbyte-bootloader/Dockerfile

@@ -2,7 +2,7 @@ ARG JDK_VERSION=17.0.1
 ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
 FROM ${JDK_IMAGE}
 
-ARG VERSION=0.39.7-alpha
+ARG VERSION=0.39.13-alpha
 
 ENV APPLICATION airbyte-bootloader
 ENV VERSION ${VERSION}

airbyte-bootloader/build.gradle

@@ -1,17 +1,15 @@
 plugins {
     id 'application'
-    id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.1.0'
 }
 
 dependencies {
     implementation project(':airbyte-config:init')
-    implementation project(':airbyte-config:models')
-    implementation project(':airbyte-config:persistence')
-    implementation project(':airbyte-db:lib')
+    implementation project(':airbyte-config:config-models')
+    implementation project(':airbyte-config:config-persistence')
+    implementation project(':airbyte-db:db-lib')
     implementation project(":airbyte-json-validation")
-    implementation project(':airbyte-protocol:models')
-    implementation project(':airbyte-scheduler:persistence')
+    implementation project(':airbyte-protocol:protocol-models')
+    implementation project(':airbyte-scheduler:scheduler-persistence')
 
     implementation 'io.temporal:temporal-sdk:1.8.1'
     implementation libs.flyway.core
@@ -26,50 +24,6 @@ application {
     applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
 }
 
-// Publish this so Airbyte Cloud can consume and extend the classes within this jar.
-// This needs to be a shadow jar as none of the other modules are published.
-shadowJar {
-    preserveFileTimestamps = false
-    reproducibleFileOrder = true
-    zip64 true
-    mergeServiceFiles()
-    exclude 'META-INF/*.RSA'
-    exclude 'META-INF/*.SF'
-    exclude 'META-INF/*.DSA'
-    // Not stubbing this out adds 'all' to the end of the jar's name.
-    classifier = ''
-}
-
-publishing {
-    publications {
-        shadow(MavenPublication) { publication ->
-            project.shadow.component(publication)
-        }
-    }
-
-    repositories {
-        publications {
-            // This block is present so Gradle knows to publish a Maven jar.
-            maven(MavenPublication) {
-                from components.java
-                // Gradle will by default use the subproject path as the group id and the subproject name as the artifact id.
-                // e.g. the subproject :airbyte-scheduler:models is imported at io.airbyte.airbyte-config:persistence:<version-number>.
-            }
-        }
-
-        maven {
-            credentials {
-                name 'cloudrepo'
-                username System.getenv('CLOUDREPO_USER')
-                password System.getenv('CLOUDREPO_PASSWORD')
-            }
-            url 'https://airbyte.mycloudrepo.io/repositories/airbyte-public-jars'
-        }
-
-        mavenLocal()
-    }
-}
-
 task copyGeneratedTar(type: Copy) {
     dependsOn copyDocker
     dependsOn distTar
@@ -90,3 +44,5 @@ tasks.withType(AbstractArchiveTask) {
     preserveFileTimestamps = false
     reproducibleFileOrder = true
 }
+
+Task publishArtifactsTask = getPublishArtifactsTask("$rootProject.ext.version", project)

airbyte-bootloader/src/main/java/io/airbyte/bootloader/BootloaderApp.java

@@ -64,6 +64,7 @@ public class BootloaderApp {
   private final FeatureFlags featureFlags;
   private final SecretMigrator secretMigrator;
   private ConfigPersistence configPersistence;
+  private ConfigPersistence yamlSeedConfigPersistence;
   private Database configDatabase;
   private Database jobDatabase;
   private JobPersistence jobPersistence;
@@ -122,7 +123,7 @@ public BootloaderApp(final Configs configs,
 
     postLoadExecution = () -> {
       try {
-        configPersistence.loadData(YamlSeedConfigPersistence.getDefault());
+        configPersistence.loadData(yamlSeedConfigPersistence);
 
         if (featureFlags.forceSecretMigration() || !jobPersistence.isSecretMigrated()) {
           if (this.secretMigrator != null) {
@@ -190,6 +191,10 @@ private static ConfigPersistence getConfigPersistence(final Database configDatab
     return DatabaseConfigPersistence.createWithValidation(configDatabase, jsonSecretsProcessor);
   }
 
+  private static ConfigPersistence getYamlSeedConfigPersistence() throws IOException {
+    return new YamlSeedConfigPersistence(YamlSeedConfigPersistence.DEFAULT_SEED_DEFINITION_RESOURCE_CLASS);
+  }
+
   private static Database getJobDatabase(final DSLContext dslContext) throws IOException {
     return new Database(dslContext);
   }
@@ -202,6 +207,7 @@ private void initPersistences(final DSLContext configsDslContext, final DSLConte
     try {
       configDatabase = getConfigDatabase(configsDslContext);
       configPersistence = getConfigPersistence(configDatabase);
+      yamlSeedConfigPersistence = getYamlSeedConfigPersistence();
       jobDatabase = getJobDatabase(jobsDslContext);
       jobPersistence = getJobPersistence(jobDatabase);
     } catch (final IOException e) {