Merge branch 'master' into anne/connection-update-schema-options

airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/scheduling/ConnectionManagerWorkflow.java

@@ -62,13 +62,6 @@ public interface ConnectionManagerWorkflow {
   @SignalMethod
   void resetConnectionAndSkipNextScheduling();
 
-  /**
-   * If an activity fails the workflow will be stuck. This signal activity can be used to retry the
-   * activity.
-   */
-  @SignalMethod
-  void retryFailedActivity();
-
   /**
    * Return the current state of the workflow.
    */

airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/scheduling/state/WorkflowState.java

@@ -32,7 +32,6 @@ public WorkflowState(final UUID id, final WorkflowStateChangedListener stateChan
   private final boolean resetConnection = false;
   @Deprecated
   private final boolean continueAsReset = false;
-  private boolean retryFailedActivity = false;
   private boolean quarantined = false;
   private boolean success = true;
   private boolean cancelledForReset = false;
@@ -89,14 +88,6 @@ public void setFailed(final boolean failed) {
     this.failed = failed;
   }
 
-  public void setRetryFailedActivity(final boolean retryFailedActivity) {
-    final ChangedStateEvent event = new ChangedStateEvent(
-        StateField.RETRY_FAILED_ACTIVITY,
-        retryFailedActivity);
-    stateChangedListener.addEvent(id, event);
-    this.retryFailedActivity = retryFailedActivity;
-  }
-
   public void setQuarantined(final boolean quarantined) {
     final ChangedStateEvent event = new ChangedStateEvent(
         StateField.QUARANTINED,
@@ -146,7 +137,6 @@ public void reset() {
     this.setUpdated(false);
     this.setCancelled(false);
     this.setFailed(false);
-    this.setRetryFailedActivity(false);
     this.setSuccess(false);
     this.setQuarantined(false);
     this.setDoneWaiting(false);

airbyte-commons-temporal/src/main/java/io/airbyte/commons/temporal/scheduling/state/listener/WorkflowStateChangedListener.java

@@ -31,7 +31,6 @@ enum StateField {
     FAILED,
     RESET,
     CONTINUE_AS_RESET,
-    RETRY_FAILED_ACTIVITY,
     QUARANTINED,
     SUCCESS,
     CANCELLED_FOR_RESET,

airbyte-commons-worker/src/main/java/io/airbyte/workers/helper/FailureHelper.java

@@ -227,6 +227,12 @@ public static FailureReason failureReasonFromWorkflowAndActivity(
     }
   }
 
+  public static FailureReason platformFailure(final Throwable t, final Long jobId, final Integer attemptNumber) {
+    return genericFailure(t, jobId, attemptNumber)
+        .withFailureOrigin(FailureOrigin.AIRBYTE_PLATFORM)
+        .withExternalMessage("Something went wrong within the airbyte platform");
+  }
+
   private static Metadata jobAndAttemptMetadata(final Long jobId, final Integer attemptNumber) {
     return new Metadata()
         .withAdditionalProperty(JOB_ID_METADATA_KEY, jobId)

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

@@ -696,6 +696,13 @@
   documentationUrl: https://docs.airbyte.com/integrations/sources/mailjet-mail
   sourceType: api
   releaseStage: alpha
+- name: Mailjet SMS
+  sourceDefinitionId: 6ec2acea-7fd1-4378-b403-41a666e0c028
+  dockerRepository: airbyte/source-mailjet-sms
+  dockerImageTag: 0.1.0
+  documentationUrl: https://docs.airbyte.com/integrations/sources/mailjet-sms
+  sourceType: api
+  releaseStage: alpha
 - name: MailerLite
   sourceDefinitionId: dc3b9003-2432-4e93-a7f4-4620b0f14674
   dockerRepository: airbyte/source-mailerlite
@@ -1316,6 +1323,14 @@
   icon: zendesk.svg
   sourceType: api
   releaseStage: generally_available
+- name: Zendesk Sell
+  sourceDefinitionId: 982eaa4c-bba1-4cce-a971-06a41f700b8c
+  dockerRepository: airbyte/source-zendesk-sell
+  dockerImageTag: 0.1.0
+  documentationUrl: https://docs.airbyte.com/integrations/sources/zendesk-sell
+  icon: zendesk.svg
+  sourceType: api
+  releaseStage: alpha
 - name: Zendesk Sunshine
   sourceDefinitionId: 325e0640-e7b3-4e24-b823-3361008f603f
   dockerRepository: airbyte/source-zendesk-sunshine

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

@@ -12883,6 +12883,26 @@
               path_in_connector_config:
               - "credentials"
               - "client_secret"
+- dockerImage: "airbyte/source-zendesk-sell:0.1.0"
+  spec:
+    documentationUrl: "https://docs.airbyte.com/integrations/sources/zendesk-sell"
+    connectionSpecification:
+      $schema: "http://json-schema.org/draft-07/schema#"
+      title: "Source Zendesk Sell Spec"
+      type: "object"
+      required:
+      - "api_token"
+      properties:
+        api_token:
+          title: "API token"
+          type: "string"
+          description: "The API token for authenticating to Zendesk Sell"
+          examples:
+          - "f23yhd630otl94y85a8bf384958473pto95847fd006da49382716or937ruw059"
+          airbyte_secret: true
+    supportsNormalization: false
+    supportsDBT: false
+    supported_destination_sync_modes: []
 - dockerImage: "airbyte/source-zendesk-sunshine:0.1.1"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/zendesk_sunshine"

airbyte-integrations/connectors/source-mailjet-sms/.dockerignore

@@ -0,0 +1,6 @@
+*
+!Dockerfile
+!main.py
+!source_mailjet_sms
+!setup.py
+!secrets

airbyte-integrations/connectors/source-mailjet-sms/Dockerfile

@@ -0,0 +1,38 @@
+FROM python:3.9.11-alpine3.15 as base
+
+# build and load all requirements
+FROM base as builder
+WORKDIR /airbyte/integration_code
+
+# upgrade pip to the latest version
+RUN apk --no-cache upgrade \
+    && pip install --upgrade pip \
+    && apk --no-cache add tzdata build-base
+
+
+COPY setup.py ./
+# install necessary packages to a temporary folder
+RUN pip install --prefix=/install .
+
+# build a clean environment
+FROM base
+WORKDIR /airbyte/integration_code
+
+# copy all loaded and built libraries to a pure basic image
+COPY --from=builder /install /usr/local
+# add default timezone settings
+COPY --from=builder /usr/share/zoneinfo/Etc/UTC /etc/localtime
+RUN echo "Etc/UTC" > /etc/timezone
+
+# bash is installed for more convenient debugging.
+RUN apk --no-cache add bash
+
+# copy payload code only
+COPY main.py ./
+COPY source_mailjet_sms ./source_mailjet_sms
+
+ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
+ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
+
+LABEL io.airbyte.version=0.1.0
+LABEL io.airbyte.name=airbyte/source-mailjet-sms

airbyte-integrations/connectors/source-mailjet-sms/README.md

@@ -0,0 +1,79 @@
+# Mailjet Sms Source
+
+This is the repository for the Mailjet Sms configuration based source connector.
+For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/mailjet-sms).
+
+## Local development
+
+#### Building via Gradle
+You can also build the connector in Gradle. This is typically used in CI and not needed for your development workflow.
+
+To build using Gradle, from the Airbyte repository root, run:
+```
+./gradlew :airbyte-integrations:connectors:source-mailjet-sms:build
+```
+
+#### Create credentials
+**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/mailjet-sms)
+to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_mailjet_sms/spec.yaml` file.
+Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
+See `integration_tests/sample_config.json` for a sample config file.
+
+**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source mailjet-sms test creds`
+and place them into `secrets/config.json`.
+
+### Locally running the connector docker image
+
+#### Build
+First, make sure you build the latest Docker image:
+```
+docker build . -t airbyte/source-mailjet-sms:dev
+```
+
+You can also build the connector image via Gradle:
+```
+./gradlew :airbyte-integrations:connectors:source-mailjet-sms:airbyteDocker
+```
+When building via Gradle, the docker image name and tag, respectively, are the values of the `io.airbyte.name` and `io.airbyte.version` `LABEL`s in
+the Dockerfile.
+
+#### Run
+Then run any of the connector commands as follows:
+```
+docker run --rm airbyte/source-mailjet-sms:dev spec
+docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-mailjet-sms:dev check --config /secrets/config.json
+docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-mailjet-sms:dev discover --config /secrets/config.json
+docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-mailjet-sms:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
+```
+## Testing
+
+#### Acceptance Tests
+Customize `acceptance-test-config.yml` file to configure tests. See [Source Acceptance Tests](https://docs.airbyte.io/connector-development/testing-connectors/source-acceptance-tests-reference) for more information.
+If your connector requires to create or destroy resources for use during acceptance tests create fixtures for it and place them inside integration_tests/acceptance.py.
+
+To run your integration tests with docker
+
+### Using gradle to run tests
+All commands should be run from airbyte project root.
+To run unit tests:
+```
+./gradlew :airbyte-integrations:connectors:source-mailjet-sms:unitTest
+```
+To run acceptance and custom integration tests:
+```
+./gradlew :airbyte-integrations:connectors:source-mailjet-sms:integrationTest
+```
+
+## Dependency Management
+All of your dependencies should go in `setup.py`, NOT `requirements.txt`. The requirements file is only used to connect internal Airbyte dependencies in the monorepo for local development.
+We split dependencies between two groups, dependencies that are:
+* required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
+* required for the testing need to go to `TEST_REQUIREMENTS` list
+
+### Publishing a new version of the connector
+You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
+1. Make sure your changes are passing unit and integration tests.
+1. Bump the connector version in `Dockerfile` -- just increment the value of the `LABEL io.airbyte.version` appropriately (we use [SemVer](https://semver.org/)).
+1. Create a Pull Request.
+1. Pat yourself on the back for being an awesome contributor.
+1. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.

airbyte-integrations/connectors/source-mailjet-sms/__init__.py

@@ -0,0 +1,3 @@
+#
+# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+#

airbyte-integrations/connectors/source-mailjet-sms/acceptance-test-config.yml

@@ -0,0 +1,27 @@
+# See [Source Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/source-acceptance-tests-reference)
+# for more information about how to configure these tests
+connector_image: airbyte/source-mailjet-sms:dev
+tests:
+  spec:
+    - spec_path: "source_mailjet_sms/spec.yaml"
+  connection:
+    - config_path: "secrets/config.json"
+      status: "succeed"
+    - config_path: "integration_tests/invalid_config.json"
+      status: "failed"
+  discovery:
+    - config_path: "secrets/config.json"
+  basic_read:
+    - config_path: "secrets/config.json"
+      configured_catalog_path: "integration_tests/configured_catalog.json"
+      timeout_seconds: 30
+  # TODO uncomment this block to specify that the tests should assert the connector outputs the records provided in the input file a file
+  #      expect_records:
+  #        path: "integration_tests/expected_records.txt"
+  #        extra_fields: no
+  #        exact_order: no
+  #        extra_records: yes
+  full_refresh:
+    - config_path: "secrets/config.json"
+      configured_catalog_path: "integration_tests/configured_catalog.json"
+      timeout_seconds: 30

airbyte-integrations/connectors/source-mailjet-sms/acceptance-test-docker.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# Build latest connector image
+docker build . -t $(cat acceptance-test-config.yml | grep "connector_image" | head -n 1 | cut -d: -f2-)
+
+# Pull latest acctest image
+docker pull airbyte/source-acceptance-test:latest
+
+# Run
+docker run --rm -it \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    -v /tmp:/tmp \
+    -v $(pwd):/test_input \
+    airbyte/source-acceptance-test \
+    --acceptance-test-config /test_input
+

airbyte-integrations/connectors/source-mailjet-sms/build.gradle

@@ -0,0 +1,9 @@
+plugins {
+    id 'airbyte-python'
+    id 'airbyte-docker'
+    id 'airbyte-source-acceptance-test'
+}
+
+airbytePython {
+    moduleDirectory 'source_mailjet_sms'
+}

airbyte-integrations/connectors/source-mailjet-sms/integration_tests/__init__.py

@@ -0,0 +1,3 @@
+#
+# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+#

airbyte-integrations/connectors/source-mailjet-sms/integration_tests/abnormal_state.json

@@ -0,0 +1,5 @@
+{
+  "todo-stream-name": {
+    "todo-field-name": "todo-abnormal-value"
+  }
+}

airbyte-integrations/connectors/source-mailjet-sms/integration_tests/acceptance.py

@@ -0,0 +1,16 @@
+#
+# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+#
+
+
+import pytest
+
+pytest_plugins = ("source_acceptance_test.plugin",)
+
+
+@pytest.fixture(scope="session", autouse=True)
+def connector_setup():
+    """This fixture is a placeholder for external resources that acceptance test might require."""
+    # TODO: setup test dependencies if needed. otherwise remove the TODO comments
+    yield
+    # TODO: clean up test dependencies

airbyte-integrations/connectors/source-mailjet-sms/integration_tests/configured_catalog.json

@@ -0,0 +1,13 @@
+{
+  "streams": [
+    {
+      "stream": {
+        "name": "sms",
+        "json_schema": {},
+        "supported_sync_modes": ["full_refresh"]
+      },
+      "sync_mode": "full_refresh",
+      "destination_sync_mode": "overwrite"
+    }
+  ]
+}

airbyte-integrations/connectors/source-mailjet-sms/integration_tests/invalid_config.json

@@ -0,0 +1,5 @@
+{
+  "token": "xxxxxxxxxxx",
+  "start_date": 1666262531,
+  "end_date": 1666953731
+}

airbyte-integrations/connectors/source-mailjet-sms/integration_tests/sample_config.json

@@ -0,0 +1,5 @@
+{
+  "token": "d36cb74ebe137152e09e4e5ca08d1cfd",
+  "start_date": 1666262531,
+  "end_date": 1666953731
+}

airbyte-integrations/connectors/source-mailjet-sms/integration_tests/sample_state.json

@@ -0,0 +1,5 @@
+{
+  "todo-stream-name": {
+    "todo-field-name": "value"
+  }
+}

airbyte-integrations/connectors/source-mailjet-sms/main.py

@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+#
+
+
+import sys
+
+from airbyte_cdk.entrypoint import launch
+from source_mailjet_sms import SourceMailjetSms
+
+if __name__ == "__main__":
+    source = SourceMailjetSms()
+    launch(source, sys.argv[1:])

airbyte-integrations/connectors/source-mailjet-sms/requirements.txt

@@ -0,0 +1,2 @@
+-e ../../bases/source-acceptance-test
+-e .