Merge branch 'master' into ddavydov/#1010-zendesk-support-do-not-use-…

…nonpublic-api

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.40.18
+current_version = 0.40.21
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
@@ -62,10 +62,6 @@ serialize =
 
 [bumpversion:file:octavia-cli/setup.py]
 
-[bumpversion:file:connector-builder-server/Dockerfile]
+[bumpversion:file:airbyte-connector-builder-server/Dockerfile]
 
-[bumpversion:file:connector-builder-server/README.md]
-
-[bumpversion:file:connector-builder-server/install.sh]
-
-[bumpversion:file:connector-builder-server/setup.py]
+[bumpversion:file:airbyte-connector-builder-server/setup.py]

.env

@@ -10,7 +10,7 @@
 
 
 ### SHARED ###
-VERSION=0.40.18
+VERSION=0.40.21
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data
@@ -57,7 +57,7 @@ CONFIGS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION=0.35.15.001
 ### AIRBYTE SERVICES ###
 TEMPORAL_HOST=airbyte-temporal:7233
 INTERNAL_API_HOST=airbyte-server:8001
-#CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80 #FIXME: Uncomment this when enabling the connector-builder
+CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
 WEBAPP_URL=http://localhost:8000/
 # Although not present as an env var, required for webapp configuration.
 API_URL=/api/v1/

.env.dev

@@ -23,7 +23,7 @@ HACK_LOCAL_ROOT_PARENT=/tmp
 WEBAPP_URL=http://localhost:8000/
 API_URL=/api/v1/
 INTERNAL_API_HOST=airbyte-server:8001
-#CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:8003 #FIXME: Uncomment this when enabling the connector-builder
+CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
 SYNC_JOB_MAX_ATTEMPTS=3
 SYNC_JOB_MAX_TIMEOUT_DAYS=3
 WORKERS_MICRONAUT_ENVIRONMENTS=control-plane

.github/comment_templates/connector_dependency_template.md

@@ -4,7 +4,7 @@
 
 NOTE ⚠️ Changes in this PR affect the following connectors. Make sure to do the following as needed:
 - Run integration tests
-- Bump connector version
+- Bump connector or module version
 - Add changelog
 - Publish the new version
 
@@ -38,7 +38,16 @@ NOTE ⚠️ Changes in this PR affect the following connectors. Make sure to do
 
 </details>
 
-{others}
+<details open>
+<summary>
+
+### {other_status_summary} Other Modules ({num_others})
+
+</summary>
+
+{others_rows}
+
+</details>
 
 <details>
 

.github/workflows/commands-for-testing-tool.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Pull Testing Tool docker image
-        run: docker pull airbyte/airbyte-e2e-testing-tool:latest
+        run: ./tools/bin/pull_image.sh -i airbyte/airbyte-e2e-testing-tool:latest
       - name: Create input and output folders
         run: |
           mkdir secrets
@@ -104,7 +104,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Pull Testing Tool docker image
-        run: docker pull airbyte/airbyte-e2e-testing-tool:latest
+        run: ./tools/bin/pull_image.sh -i airbyte/airbyte-e2e-testing-tool:latest
       - name: Change wrapper permissions
         run: |
           mkdir secrets