Merge branch 'master' into harshith/test-pr-10529

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.35.43-alpha
+current_version = 0.35.45-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.35.43-alpha
+VERSION=0.35.45-alpha
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data

.github/CODEOWNERS

@@ -1,3 +1,6 @@
 # Frontend code
-/airbyte-webapp/  @airbytehq/frontend
 /airbyte-webapp-e2e-tests/  @airbytehq/frontend
+/airbyte-webapp/  @airbytehq/frontend
+## Exclude the package(-lock).json from code ownership to prevent version bump PRs from triggering codeowners review
+/airbyte-webapp/package.json
+/airbyte-webapp/package-lock.json

airbyte-bootloader/Dockerfile

@@ -5,6 +5,6 @@ ENV APPLICATION airbyte-bootloader
 
 WORKDIR /app
 
-ADD bin/${APPLICATION}-0.35.43-alpha.tar /app
+ADD bin/${APPLICATION}-0.35.45-alpha.tar /app
 
-ENTRYPOINT ["/bin/bash", "-c", "${APPLICATION}-0.35.43-alpha/bin/${APPLICATION}"]
+ENTRYPOINT ["/bin/bash", "-c", "${APPLICATION}-0.35.45-alpha/bin/${APPLICATION}"]

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -112,14 +112,14 @@
 - name: Chargebee
   sourceDefinitionId: 686473f1-76d9-4994-9cc7-9b13da46147c
   dockerRepository: airbyte/source-chargebee
-  dockerImageTag: 0.1.9
+  dockerImageTag: 0.1.10
   documentationUrl: https://docs.airbyte.io/integrations/sources/chargebee
   icon: chargebee.svg
   sourceType: api
 - name: Chartmogul
   sourceDefinitionId: b6604cbd-1b12-4c08-8767-e140d0fb0877
   dockerRepository: airbyte/source-chartmogul
-  dockerImageTag: 0.1.0
+  dockerImageTag: 0.1.1
   documentationUrl: https://docs.airbyte.io/integrations/sources/chartmogul
   icon: chartmogul.svg
   sourceType: api

airbyte-config/init/src/main/resources/seed/source_specs.yaml

@@ -952,7 +952,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-chargebee:0.1.9"
+- dockerImage: "airbyte/source-chargebee:0.1.10"
   spec:
     documentationUrl: "https://apidocs.chargebee.com/docs/api"
     connectionSpecification:
@@ -1000,7 +1000,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-chartmogul:0.1.0"
+- dockerImage: "airbyte/source-chartmogul:0.1.1"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/chartmogul"
     connectionSpecification:
@@ -1009,6 +1009,8 @@
       type: "object"
       required:
       - "api_key"
+      - "start_date"
+      - "interval"
       additionalProperties: false
       properties:
         api_key:
@@ -1024,6 +1026,17 @@
           examples:
           - "2017-01-25T00:00:00Z"
           order: 1
+        interval:
+          type: "string"
+          description: "Some APIs such as <a href=\"https://dev.chartmogul.com/reference/endpoint-overview-metrics-api\"\
+            >Metrics</a> require intervals to cluster data."
+          enum:
+          - "day"
+          - "week"
+          - "month"
+          - "quarter"
+          default: "month"
+          order: 2
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []

airbyte-config/models/src/main/java/io/airbyte/config/Configs.java

@@ -211,6 +211,13 @@ public interface Configs {
    */
   int getSyncJobMaxTimeoutDays();
 
+  /**
+   * Defines whether job creation uses connector-specific resource requirements when spawning jobs.
+   * Works on both Docker and Kubernetes. Defaults to false for ease of use in OSS trials of Airbyte
+   * but recommended for production deployments.
+   */
+  boolean connectorSpecificResourceDefaultsEnabled();
+
   /**
    * Define the job container's minimum CPU usage. Units follow either Docker or Kubernetes, depending
    * on the deployment. Defaults to none.

airbyte-config/models/src/main/java/io/airbyte/config/EnvConfigs.java

@@ -64,6 +64,7 @@ public class EnvConfigs implements Configs {
   public static final String JOB_KUBE_CURL_IMAGE = "JOB_KUBE_CURL_IMAGE";
   public static final String SYNC_JOB_MAX_ATTEMPTS = "SYNC_JOB_MAX_ATTEMPTS";
   public static final String SYNC_JOB_MAX_TIMEOUT_DAYS = "SYNC_JOB_MAX_TIMEOUT_DAYS";
+  private static final String CONNECTOR_SPECIFIC_RESOURCE_DEFAULTS_ENABLED = "CONNECTOR_SPECIFIC_RESOURCE_DEFAULTS_ENABLED";
   private static final String MINIMUM_WORKSPACE_RETENTION_DAYS = "MINIMUM_WORKSPACE_RETENTION_DAYS";
   private static final String MAXIMUM_WORKSPACE_RETENTION_DAYS = "MAXIMUM_WORKSPACE_RETENTION_DAYS";
   private static final String MAXIMUM_WORKSPACE_SIZE_MB = "MAXIMUM_WORKSPACE_SIZE_MB";
@@ -419,6 +420,11 @@ public int getSyncJobMaxTimeoutDays() {
     return Integer.parseInt(getEnvOrDefault(SYNC_JOB_MAX_TIMEOUT_DAYS, "3"));
   }
 
+  @Override
+  public boolean connectorSpecificResourceDefaultsEnabled() {
+    return getEnvOrDefault(CONNECTOR_SPECIFIC_RESOURCE_DEFAULTS_ENABLED, false);
+  }
+
   /**
    * Returns worker pod tolerations parsed from its own environment variable. The value of the env is
    * a string that represents one or more tolerations.

airbyte-config/models/src/test/java/io/airbyte/config/helpers/GcsLogsTest.java

@@ -15,9 +15,11 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+@Slf4j
 @Tag("logger-client")
 public class GcsLogsTest {
 
@@ -34,14 +36,15 @@ private static Storage getClientFactory() {
    */
   @Test
   public void testRetrieveAllLogs() throws IOException {
-    final File data = GcsLogs.getFile(getClientFactory(), (new EnvConfigs()).getLogConfigs(), "paginate", 6);
-
+    final File data;
+    data = GcsLogs.getFile(getClientFactory(), (new EnvConfigs()).getLogConfigs(), "paginate", 6);
     final var retrieved = new ArrayList<String>();
     Files.lines(data.toPath()).forEach(retrieved::add);
 
     final var expected = List.of("Line 0", "Line 1", "Line 2", "Line 3", "Line 4", "Line 5", "Line 6", "Line 7", "Line 8");
 
     assertEquals(expected, retrieved);
+
   }
 
   /**

airbyte-container-orchestrator/Dockerfile

@@ -26,12 +26,12 @@ RUN echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] htt
 RUN apt-get update && apt-get install -y kubectl
 
 ENV APPLICATION airbyte-container-orchestrator
-ENV AIRBYTE_ENTRYPOINT "/app/${APPLICATION}-0.35.43-alpha/bin/${APPLICATION}"
+ENV AIRBYTE_ENTRYPOINT "/app/${APPLICATION}-0.35.45-alpha/bin/${APPLICATION}"
 
 WORKDIR /app
 
 # Move orchestrator app
-ADD bin/${APPLICATION}-0.35.43-alpha.tar /app
+ADD bin/${APPLICATION}-0.35.45-alpha.tar /app
 
 # wait for upstream dependencies to become available before starting server
-ENTRYPOINT ["/bin/bash", "-c", "/app/${APPLICATION}-0.35.43-alpha/bin/${APPLICATION}"]
+ENTRYPOINT ["/bin/bash", "-c", "/app/${APPLICATION}-0.35.45-alpha/bin/${APPLICATION}"]

airbyte-integrations/connectors/source-chargebee/Dockerfile

@@ -13,5 +13,5 @@ RUN pip install .
 
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.1.9
+LABEL io.airbyte.version=0.1.10
 LABEL io.airbyte.name=airbyte/source-chargebee

airbyte-integrations/connectors/source-chargebee/integration_tests/configured_catalog.json

@@ -168,6 +168,19 @@
       "sync_mode": "incremental",
       "destination_sync_mode": "append",
       "cursor_field": ["updated_at"]
+    },
+    {
+      "stream": {
+        "name": "credit_note",
+        "json_schema": {},
+        "supported_sync_modes": ["full_refresh", "incremental"],
+        "source_defined_cursor": true,
+        "default_cursor_field": ["updated_at"],
+        "source_defined_primary_key": [["id"]]
+      },
+      "sync_mode": "incremental",
+      "destination_sync_mode": "append",
+      "cursor_field": ["updated_at"]
     }
   ]
 }