Merge branch 'master' of https://github.com/airbytehq/airbyte into to…

…pe/klaviyo/upgrade-2024-10-15
airbytehq · Jan 21, 2025 · eadb0b7 · eadb0b7
2 parents 355cb98 + fc0c025
commit eadb0b7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 10 deletions.
diff --git a/...c/main/kotlin/io/airbyte/cdk/load/command/iceberg/parquet/IcebergCatalogSpecifications.kt b/...c/main/kotlin/io/airbyte/cdk/load/command/iceberg/parquet/IcebergCatalogSpecifications.kt
@@ -36,8 +36,8 @@ interface IcebergCatalogSpecifications {
      * uses. For example: `s3://my-bucket/warehouse/`
      */
     @get:JsonSchemaTitle("Warehouse Location")
-    @get:JsonPropertyDescription(
-        "The root location of the data warehouse used by the Iceberg catalog."
+    @get:JsonSchemaDescription(
+        """The root location of the data warehouse used by the Iceberg catalog. Typically includes a bucket name and path within that bucket. Must include the storage protocol (such as "s3://" for Amazon S3)."""
     )
     @get:JsonProperty("warehouse_location")
     val warehouseLocation: String
@@ -49,8 +49,10 @@ interface IcebergCatalogSpecifications {
      * Specifies the default or primary branch name in the catalog repository. For example: `main`
      */
     @get:JsonSchemaTitle("Main Branch Name")
-    @get:JsonPropertyDescription("The primary or default branch name in the catalog repository.")
-    @get:JsonProperty("main_branch_name")
+    @get:JsonPropertyDescription(
+        """The primary or default branch name in the catalog. Most query engines will use "main" by default. See <a href="https://iceberg.apache.org/docs/latest/branching/">Iceberg documentation</a> for more information."""
+    )
+    @get:JsonProperty("main_branch_name", defaultValue = "main")
     val mainBranchName: String
 
     /**

diff --git a/airbyte-integrations/connectors/destination-s3-data-lake/metadata.yaml b/airbyte-integrations/connectors/destination-s3-data-lake/metadata.yaml
@@ -26,7 +26,7 @@ data:
             alias: airbyte-connector-testing-secret-store
   connectorType: destination
   definitionId: 716ca874-520b-4902-9f80-9fad66754b89
-  dockerImageTag: 0.2.18
+  dockerImageTag: 0.2.19
   dockerRepository: airbyte/destination-s3-data-lake
   documentationUrl: https://docs.airbyte.com/integrations/destinations/s3-data-lake
   githubIssueLabel: destination-s3-data-lake

diff --git a/...c/main/kotlin/io/airbyte/integrations/destination/s3_data_lake/S3DataLakeSpecification.kt b/...c/main/kotlin/io/airbyte/integrations/destination/s3_data_lake/S3DataLakeSpecification.kt
@@ -50,7 +50,16 @@ class S3DataLakeSpecification :
 
     @get:JsonSchemaInject(json = """{"order":4}""") override val s3Endpoint: String? = null
 
-    @get:JsonSchemaInject(json = """{"always_show": true,"order":5}""")
+    @get:JsonSchemaInject(
+        json =
+            """
+                {
+                    "examples": ["s3://your-bucket/path/to/store/files/in"],
+                    "always_show": true,
+                    "order":5
+                }
+            """
+    )
     override val warehouseLocation: String = ""
 
     @get:JsonSchemaInject(json = """{"always_show": true,"order":6}""")

diff --git a/...nnectors/destination-s3-data-lake/src/test-integration/resources/expected-spec-cloud.json b/...nnectors/destination-s3-data-lake/src/test-integration/resources/expected-spec-cloud.json
@@ -47,14 +47,16 @@
       },
       "warehouse_location" : {
         "type" : "string",
-        "description" : "The root location of the data warehouse used by the Iceberg catalog.",
+        "description" : "The root location of the data warehouse used by the Iceberg catalog. Typically includes a bucket name and path within that bucket. Must include the storage protocol (such as \"s3://\" for Amazon S3).",
         "title" : "Warehouse Location",
+        "examples" : [ "s3://your-bucket/path/to/store/files/in" ],
         "always_show" : true,
         "order" : 5
       },
       "main_branch_name" : {
         "type" : "string",
-        "description" : "The primary or default branch name in the catalog repository.",
+        "default" : "main",
+        "description" : "The primary or default branch name in the catalog. Most query engines will use \"main\" by default. See <a href=\"https://iceberg.apache.org/docs/latest/branching/\">Iceberg documentation</a> for more information.",
         "title" : "Main Branch Name",
         "always_show" : true,
         "order" : 6

diff --git a/...connectors/destination-s3-data-lake/src/test-integration/resources/expected-spec-oss.json b/...connectors/destination-s3-data-lake/src/test-integration/resources/expected-spec-oss.json
@@ -47,14 +47,16 @@
       },
       "warehouse_location" : {
         "type" : "string",
-        "description" : "The root location of the data warehouse used by the Iceberg catalog.",
+        "description" : "The root location of the data warehouse used by the Iceberg catalog. Typically includes a bucket name and path within that bucket. Must include the storage protocol (such as \"s3://\" for Amazon S3).",
         "title" : "Warehouse Location",
+        "examples" : [ "s3://your-bucket/path/to/store/files/in" ],
         "always_show" : true,
         "order" : 5
       },
       "main_branch_name" : {
         "type" : "string",
-        "description" : "The primary or default branch name in the catalog repository.",
+        "default" : "main",
+        "description" : "The primary or default branch name in the catalog. Most query engines will use \"main\" by default. See <a href=\"https://iceberg.apache.org/docs/latest/branching/\">Iceberg documentation</a> for more information.",
         "title" : "Main Branch Name",
         "always_show" : true,
         "order" : 6

diff --git a/docs/integrations/destinations/s3-data-lake.md b/docs/integrations/destinations/s3-data-lake.md
@@ -17,6 +17,7 @@ for more information.
 
 | Version | Date       | Pull Request                                               | Subject                                                                      |
 |:--------|:-----------|:-----------------------------------------------------------|:-----------------------------------------------------------------------------|
+| 0.2.19  | 2025-01-16 | [\#51595](https://github.com/airbytehq/airbyte/pull/51595) | Clarifications in connector config options                                   |
 | 0.2.18  | 2025-01-15 | [\#51042](https://github.com/airbytehq/airbyte/pull/51042) | Write structs as JSON strings instead of Iceberg structs.                    |
 | 0.2.17  | 2025-01-14 | [\#51542](https://github.com/airbytehq/airbyte/pull/51542) | New identifier fields should be marked as required.                          |
 | 0.2.16  | 2025-01-14 | [\#51538](https://github.com/airbytehq/airbyte/pull/51538) | Update identifier fields if incoming fields are different than existing ones |