Merge branch 'main' into nexcalmart/nginx-unprivileged

.editorconfig

@@ -23,6 +23,11 @@ ij_json_spaces_within_braces = false
 ij_json_spaces_within_brackets = false
 ij_json_wrap_long_lines = false
 
+[*.{kt,kts}]
+indent_size = 2
+max_line_length = 150
+ij_kotlin_packages_to_use_import_on_demand = unset
+
 [{*.markdown,*.md}]
 ij_markdown_force_one_space_after_blockquote_symbol = true
 ij_markdown_force_one_space_after_header_symbol = true

.env

@@ -26,14 +26,15 @@ WORKSPACE_DOCKER_MOUNT=airbyte_workspace
 # be the same as *_ROOT.
 # Issue: https://github.com/airbytehq/airbyte/issues/578
 LOCAL_ROOT=/tmp/airbyte_local
-LOCAL_DOCKER_MOUNT=/tmp/airbyte_local
+LOCAL_DOCKER_MOUNT=oss_local_root
 # todo (cgardens) - hack to handle behavior change in docker compose. *_PARENT directories MUST
 # already exist on the host filesystem and MUST be parents of *_ROOT.
 # Issue: https://github.com/airbytehq/airbyte/issues/577
 HACK_LOCAL_ROOT_PARENT=/tmp
 
 # Storage type
 STORAGE_TYPE=local
+STORAGE_BUCKET_ACTIVITY_PAYLOAD=payload-storage
 STORAGE_BUCKET_LOG=airbyte-dev-logs
 STORAGE_BUCKET_STATE=state-storage
 STORAGE_BUCKET_WORKLOAD_OUTPUT=state-storage
@@ -65,17 +66,17 @@ CONFIGS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION=0.40.23.002
 TEMPORAL_HOST=airbyte-temporal:7233
 INTERNAL_API_HOST=airbyte-server:8001
 INTERNAL_API_URL=http://airbyte-server:8001
-CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
+CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:8080
 WEBAPP_URL=http://localhost:8000/
 WORKLOAD_API_HOST=workload-api-server:8007
 WORKLOAD_API_URL=http://workload-api-server:8007
 # Although not present as an env var, required for webapp configuration.
 CONNECTOR_BUILDER_API_URL=/connector-builder-api
 AIRBYTE_API_HOST=airbyte-api-server:8006
-CONNECTOR_BUILDER_SERVER_API_HOST=http://airbyte-connector-builder-server:80
+CONNECTOR_BUILDER_SERVER_API_HOST=http://airbyte-connector-builder-server:8080
 # Replace with the commented-out line below to use a locally-run connector-builder-server
 # image, e.g. when developing the CDK's builder server command runner.
-# CONNECTOR_BUILDER_SERVER_API_HOST=http://host.docker.internal:80
+# CONNECTOR_BUILDER_SERVER_API_HOST=http://host.docker.internal:8080
 
 ### JOBS ###
 # Relevant to scaling.

.github/actions/match-github-to-slack-user/action.yml

@@ -0,0 +1,25 @@
+# This action will try to match git commit author (GITHUB_ACTOR) with Slack user
+# and add it to GITHUB_OUTPUT
+# Following env variables should be provided.
+# Provided by Github:
+#   GITHUB_ACTOR: commit author
+#   GITHUB_REPOSITORY: name of the repo we check the commit author, e.g. "airbytehq/airbyte-platform-internal"
+# Required:
+#   AIRBYTE_HQ_BOT_SLACK_TOKEN: ${{ secrets.AIRBYTE_HQ_BOT_SLACK_TOKEN }}
+#   AIRBYTE_TEAM_BOT_SLACK_TOKEN: ${{ secrets.AIRBYTE_TEAM_BOT_SLACK_TOKEN }}
+#   GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+name: 'Match Github user to Slack user'
+description: 'Match Github user to Slack by email or full name in Github profile.'
+outputs:
+  slack_user_ids:
+    description: 'Comma separated slack user IDs that match to GITHUB_ACTOR (Github username)'
+    value: ${{ steps.match-github-to-slack-user.outputs.slack_user_ids }}
+runs:
+  using: 'composite'
+  steps:
+    - name: Match github user to slack user
+      id: match-github-to-slack-user
+      run: |
+        ./tools/bin/match_github_user_to_slack
+      shell: bash

.github/pull_request_template.md

@@ -1,22 +1,23 @@
 ## What
-*Describe what the change is solving*
-*It helps to add screenshots if it affects the frontend.*
+<!--
+* Describe what the change is solving.
+* It helps to add screenshots if it affects the frontend.
+-->
 
 ## How
-*Describe the solution*
+<!--
+* Describe how code changes achieve the solution.
+-->
 
 ## Recommended reading order
-1. `x.java`
-2. `y.java`
+1. `x.kt`
+2. `y.kt`
 
-## Can this PR be safely reverted / rolled back?
-*If you know that your PR is backwards-compatible and can be simply reverted or rolled back, check the YES box.*
-
-*Otherwise if your PR has a breaking change, like a database migration for example, check the NO box.*
-
-*If unsure, leave it blank.*
+## Can this PR be safely reverted and rolled back?
+<!--
+* If you know that your be safely rolled back, check YES.*
+* If that is not the case (e.g. a database migration), check NO.
+* If unsure, leave it blank.*
+-->
 - [ ] YES 💚
 - [ ] NO ❌
-
-## 🚨 User Impact 🚨
-Are there any breaking changes? What is the end result perceived by the user? If yes, please merge this PR with the 🚨🚨 emoji so changelog authors can further highlight this if needed.