fix-conflict

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.40.32
+current_version = 0.50.30
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
@@ -8,70 +8,8 @@ serialize =
 
 [bumpversion:file:.bumpversion.cfg]
 
-[bumpversion:file:.env]
-
-[bumpversion:file:airbyte-bootloader/Dockerfile]
-
-[bumpversion:file:airbyte-container-orchestrator/Dockerfile]
-
-[bumpversion:file:airbyte-cron/Dockerfile]
-
-[bumpversion:file:airbyte-metrics/reporter/Dockerfile]
-
-[bumpversion:file:airbyte-proxy/Dockerfile]
-
-[bumpversion:file:airbyte-server/Dockerfile]
-
-[bumpversion:file:airbyte-webapp/package.json]
-search = "version": "{current_version}"
-replace = "version": "{new_version}"
-
-[bumpversion:file:airbyte-workers/Dockerfile]
-
-[bumpversion:file:charts/airbyte-bootloader/Chart.yaml]
-
-[bumpversion:file:charts/airbyte-cron/Chart.yaml]
-
-[bumpversion:file:charts/airbyte-server/Chart.yaml]
-
-[bumpversion:file:charts/airbyte-temporal/Chart.yaml]
-
-[bumpversion:file:charts/airbyte-webapp/Chart.yaml]
-
-[bumpversion:file:charts/airbyte-worker/Chart.yaml]
-
-[bumpversion:file:charts/airbyte/Chart.yaml]
-
-[bumpversion:file:charts/airbyte-connector-builder-server/Chart.yaml]
-
-[bumpversion:file:charts/airbyte/README.md]
+[bumpversion:file:gradle.properties]
 
 [bumpversion:file:docs/operator-guides/upgrading-airbyte.md]
 
-[bumpversion:file:kube/overlays/stable-with-resource-limits/.env]
-search = AIRBYTE_VERSION={current_version}
-replace = AIRBYTE_VERSION={new_version}
-
-[bumpversion:file:kube/overlays/stable-with-resource-limits/kustomization.yaml]
-
-[bumpversion:file:kube/overlays/stable/.env]
-search = AIRBYTE_VERSION={current_version}
-replace = AIRBYTE_VERSION={new_version}
-
-[bumpversion:file:kube/overlays/stable/kustomization.yaml]
-
-[bumpversion:file:octavia-cli/Dockerfile]
-
-[bumpversion:file:octavia-cli/README.md]
-
-[bumpversion:file:octavia-cli/install.sh]
-
-[bumpversion:file:octavia-cli/setup.py]
-search = version="{current_version}"
-replace = version="{new_version}"
-
-[bumpversion:file:airbyte-connector-builder-server/Dockerfile]
-
-[bumpversion:file:airbyte-connector-builder-server/setup.py]
-search = version="{current_version}"
-replace = version="{new_version}"
+[bumpversion:file:run-ab-platform.sh]

.devcontainer/destination-duckdb/devcontainer.json

@@ -0,0 +1,80 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+  "name": "DuckDB Destination Connector DevContainer (Python)",
+
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/python:0-3.9",
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  "features": {
+    "ghcr.io/devcontainers-contrib/features/poetry:2": {},
+    "ghcr.io/devcontainers/features/docker-in-docker": {}
+  },
+  "overrideFeatureInstallOrder": [
+    // Deterministic order maximizes cache reuse
+    "ghcr.io/devcontainers-contrib/features/poetry",
+    "ghcr.io/devcontainers/features/docker-in-docker"
+  ],
+
+  "workspaceFolder": "/workspaces/airbyte/airbyte-integrations/connectors/destination-duckdb",
+
+  // Configure tool-specific properties.
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        // Python extensions:
+        "charliermarsh.ruff",
+        "matangover.mypy",
+        "ms-python.black-formatter",
+        "ms-python.python",
+        "ms-python.vscode-pylance",
+
+        // Toml support
+        "tamasfe.even-better-toml",
+
+        // Yaml and JSON Schema support:
+        "redhat.vscode-yaml",
+
+        // Contributing:
+        "GitHub.vscode-pull-request-github"
+      ],
+      "settings": {
+        "extensions.ignoreRecommendations": true,
+        "git.autofetch": true,
+        "git.openRepositoryInParentFolders": "always",
+        "python.defaultInterpreterPath": ".venv/bin/python",
+        "python.interpreter.infoVisibility": "always",
+        "python.terminal.activateEnvironment": true,
+        "python.testing.pytestEnabled": true,
+        "python.testing.cwd": "/workspaces/airbyte/airbyte-integrations/connectors/destination-duckdb",
+        "python.testing.pytestArgs": [
+          "--rootdir=/workspaces/airbyte/airbyte-integrations/connectors/destination-duckdb",
+          "."
+        ],
+        "[python]": {
+          "editor.defaultFormatter": "ms-python.black-formatter"
+        }
+      }
+    }
+  },
+  "containerEnv": {
+    "POETRY_VIRTUALENVS_IN_PROJECT": "true"
+  },
+
+  // Mark the root directory as 'safe' for git.
+  "initializeCommand": "git config --add safe.directory /workspaces/airbyte",
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // Post-create tasks:
+  // 1. Create a symlink directory.
+  // 2. Create symlinks for the devcontainer.json and docs markdown file.
+  // 3. Install the Python/Poetry dependencies.
+  "postCreateCommand": "mkdir -p ./.symlinks && echo '*' > ./.symlinks/.gitignore && ln -sf /workspaces/airbyte/.devcontainer/destination-duckdb/devcontainer.json ./.symlinks/devcontainer.json && ln -sf /workspaces/airbyte/docs/integrations/destinations/duckdb.md ./.symlinks/duckdb-docs.md && poetry install"
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.devcontainer/java-connectors-generic/devcontainer.json

@@ -0,0 +1,58 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+{
+  "name": "Connector Development DevContainer (Generic)",
+
+  "image": "mcr.microsoft.com/devcontainers/java:0-17",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker": {},
+    "ghcr.io/devcontainers/features/java:1": {
+      "installGradle": true,
+      "version": "latest",
+      "jdkDistro": "open",
+      "gradleVersion": "7.5.1"
+    },
+    // Python needed for `airbyte-ci` CLI
+    "ghcr.io/devcontainers/features/python:1": {
+      "installGradle": true,
+      "version": "3.10",
+      "installTools": true
+    },
+    "ghcr.io/devcontainers-contrib/features/poetry:2": {}
+  },
+
+  // Deterministic order reduces cache busting
+  "overrideFeatureInstallOrder": [
+    "ghcr.io/devcontainers/features/docker-in-docker",
+    "ghcr.io/devcontainers/features/java",
+    "ghcr.io/devcontainers/features/python",
+    "ghcr.io/devcontainers-contrib/features/poetry"
+  ],
+
+  // Configure tool-specific properties.
+  "customizations": {
+    "vscode": {
+      "extensions": ["vscjava.vscode-gradle", "tamasfe.even-better-toml"],
+      "settings": {
+        "extensions.ignoreRecommendations": true,
+        "git.openRepositoryInParentFolders": "always"
+      }
+    }
+  },
+
+  // Mark the root directory as 'safe' for git.
+  "initializeCommand": "git config --add safe.directory /workspaces/airbyte",
+
+  // Install Gradle, `airbyte-ci` CLI, and Dagger (installed via airbyte-ci --help)
+  "postCreateCommand": "./gradlew --version && pipx install --editable ./airbyte-ci/connectors/pipelines/ || airbyte-ci --help || true",
+
+  "containerEnv": {
+    // Deterministic Poetry virtual env location: `./.venv`
+    "POETRY_VIRTUALENVS_IN_PROJECT": "true"
+  }
+
+  // Override to change the directory that the IDE opens by default:
+  // "workspaceFolder": "/workspaces/airbyte"
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.editorconfig

@@ -137,13 +137,3 @@ ij_yaml_sequence_on_new_line = false
 ij_yaml_space_before_colon = false
 ij_yaml_spaces_within_braces = true
 ij_yaml_spaces_within_brackets = true
-
-# don't interfere with prettier default formatting for webapp
-# see https://prettier.io/docs/en/api.html#prettierresolveconfigfilepath--options
-# for options that we're disabling
-[/airbyte-webapp/**]
-end_of_line = unset
-indent_style = unset
-indent_size = unset
-tab_width = unset
-max_line_length = unset