[S3-Data-Lake] Make the Namespace/Database a required field (airbyteh…

…q#52639)
karolur · Feb 3, 2025 · d7188e7 · d7188e7
1 parent 0d92d72
commit d7188e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 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
@@ -188,7 +188,7 @@ class NessieCatalogSpecification(
            `Destination-defined` or `Source-defined`"""
     )
     @get:JsonProperty("namespace")
-    val namespace: String?
+    val namespace: String
 ) : CatalogType(catalogType)
 
 /**
@@ -231,7 +231,7 @@ class GlueCatalogSpecification(
         """The Glue database name. This will ONLY be used if the `Destination Namespace` setting for the connection is set to `Destination-defined` or `Source-defined`"""
     )
     @get:JsonProperty("database_name")
-    val databaseName: String?
+    val databaseName: String
 ) : CatalogType(catalogType), AWSArnRoleSpecification
 
 /**
@@ -266,7 +266,7 @@ class RestCatalogSpecification(
            This will ONLY be used if the `Destination Namespace` setting for the connection is set to
            `Destination-defined` or `Source-defined`"""
     )
-    val namespace: String?
+    val namespace: String
 ) : CatalogType(catalogType)
 
 /**
@@ -317,7 +317,7 @@ data class GlueCatalogConfiguration(
     @get:JsonPropertyDescription(
         """The Glue database name. This will ONLY be used if the `Destination Namespace` setting for the connection is set to `Destination-defined` or `Source-defined`"""
     )
-    val databaseName: String?
+    val databaseName: String
 ) : CatalogConfiguration, AWSArnRoleConfigurationProvider
 
 /**
@@ -340,7 +340,7 @@ data class NessieCatalogConfiguration(
            This will ONLY be used if the `Destination Namespace` setting for the connection is set to
            `Destination-defined` or `Source-defined`"""
     )
-    val namespace: String?
+    val namespace: String
 ) : CatalogConfiguration
 
 /**
@@ -360,7 +360,7 @@ data class RestCatalogConfiguration(
            This will ONLY be used if the `Destination Namespace` setting for the connection is set to
            `Destination-defined` or `Source-defined`"""
     )
-    val namespace: String?
+    val namespace: String
 ) : CatalogConfiguration
 
 /**

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.23
+  dockerImageTag: 0.3.0
   dockerRepository: airbyte/destination-s3-data-lake
   documentationUrl: https://docs.airbyte.com/integrations/destinations/s3-data-lake
   githubIssueLabel: destination-s3-data-lake

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
@@ -93,7 +93,7 @@
               "title" : "Namespace"
             }
           },
-          "required" : [ "catalog_type", "server_uri" ]
+          "required" : [ "catalog_type", "server_uri", "namespace" ]
         }, {
           "title" : "Glue Catalog",
           "type" : "object",
@@ -122,7 +122,7 @@
               "title" : "Database Name"
             }
           },
-          "required" : [ "catalog_type", "glue_id" ]
+          "required" : [ "catalog_type", "glue_id", "database_name" ]
         }, {
           "title" : "Rest Catalog",
           "type" : "object",
@@ -146,7 +146,7 @@
               "title" : "Namespace"
             }
           },
-          "required" : [ "catalog_type", "server_uri" ]
+          "required" : [ "catalog_type", "server_uri", "namespace" ]
         } ],
         "description" : "Specifies the type of Iceberg catalog (e.g., NESSIE, GLUE, REST) and its associated configuration.",
         "title" : "Catalog Type",

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
@@ -93,7 +93,7 @@
               "title" : "Namespace"
             }
           },
-          "required" : [ "catalog_type", "server_uri" ]
+          "required" : [ "catalog_type", "server_uri", "namespace" ]
         }, {
           "title" : "Glue Catalog",
           "type" : "object",
@@ -122,7 +122,7 @@
               "title" : "Database Name"
             }
           },
-          "required" : [ "catalog_type", "glue_id" ]
+          "required" : [ "catalog_type", "glue_id", "database_name" ]
         }, {
           "title" : "Rest Catalog",
           "type" : "object",
@@ -146,7 +146,7 @@
               "title" : "Namespace"
             }
           },
-          "required" : [ "catalog_type", "server_uri" ]
+          "required" : [ "catalog_type", "server_uri", "namespace" ]
         } ],
         "description" : "Specifies the type of Iceberg catalog (e.g., NESSIE, GLUE, REST) and its associated configuration.",
         "title" : "Catalog Type",

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.3.0   | 2025-01-31 | [\#52639](https://github.com/airbytehq/airbyte/pull/52639) | Make the database/namespace a required field                                 |
 | 0.2.23  | 2025-01-27 | [\#51600](https://github.com/airbytehq/airbyte/pull/51600) | Internal refactor                                                            |
 | 0.2.22  | 2025-01-22 | [\#52081](https://github.com/airbytehq/airbyte/pull/52081) | Implement support for REST catalog                                           |
 | 0.2.21  | 2025-01-27 | [\#52564](https://github.com/airbytehq/airbyte/pull/52564) | Fix crash on stream with 0 records                                           |