From 74cb28e0f6aa037c48cb520911e3780107fb18dd Mon Sep 17 00:00:00 2001 From: Iryna Grankova <87977540+igrankova@users.noreply.github.com> Date: Wed, 5 Jan 2022 15:47:41 +0200 Subject: [PATCH] Update fields in source-connectors specifications: mssql, mssql-strict-encrypt (#9206) --- .../b5ea17b1-f170-46dc-bc31-cc744ca984c1.json | 2 +- .../resources/seed/source_definitions.yaml | 2 +- .../src/main/resources/seed/source_specs.yaml | 28 +++++++++++-------- .../source-mssql-strict-encrypt/Dockerfile | 2 +- .../src/test/resources/expected_spec.json | 23 +++++++++------ .../connectors/source-mssql/Dockerfile | 2 +- .../source-mssql/src/main/resources/spec.json | 23 +++++++++------ docs/integrations/sources/mssql.md | 1 + 8 files changed, 50 insertions(+), 33 deletions(-) diff --git a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/b5ea17b1-f170-46dc-bc31-cc744ca984c1.json b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/b5ea17b1-f170-46dc-bc31-cc744ca984c1.json index 3c3036096d35e..0e8eaa23e5237 100644 --- a/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/b5ea17b1-f170-46dc-bc31-cc744ca984c1.json +++ b/airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/b5ea17b1-f170-46dc-bc31-cc744ca984c1.json @@ -2,7 +2,7 @@ "sourceDefinitionId": "b5ea17b1-f170-46dc-bc31-cc744ca984c1", "name": "Microsoft SQL Server (MSSQL)", "dockerRepository": "airbyte/source-mssql", - "dockerImageTag": "0.3.11", + "dockerImageTag": "0.3.12", "documentationUrl": "https://docs.airbyte.io/integrations/sources/mssql", "icon": "mssql.svg" } diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index 7a288e95b2d9a..baceb95dab680 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -398,7 +398,7 @@ - name: Microsoft SQL Server (MSSQL) sourceDefinitionId: b5ea17b1-f170-46dc-bc31-cc744ca984c1 dockerRepository: airbyte/source-mssql - dockerImageTag: 0.3.11 + dockerImageTag: 0.3.12 documentationUrl: https://docs.airbyte.io/integrations/sources/mssql icon: mssql.svg sourceType: database diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index 696cdec25608f..34760856f74b4 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -3841,7 +3841,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-mssql:0.3.11" +- dockerImage: "airbyte/source-mssql:0.3.12" spec: documentationUrl: "https://docs.airbyte.io/integrations/destinations/mssql" connectionSpecification: @@ -3856,31 +3856,37 @@ additionalProperties: false properties: host: - description: "Hostname of the database." + description: "The hostname of the database." + title: "Host" type: "string" port: - description: "Port of the database." + description: "The port of the database." + title: "Port" type: "integer" minimum: 0 maximum: 65536 examples: - "1433" database: - description: "Name of the database." + description: "The name of the database." + title: "Database" type: "string" examples: - "master" username: - description: "Username to use to access the database." + description: "The username which is used to access the database." + title: "Username" type: "string" password: - description: "Password associated with the username." + description: "The password associated with the username." + title: "Password" type: "string" airbyte_secret: true ssl_method: title: "SSL Method" type: "object" - description: "Encryption method to use when communicating with the database" + description: "The encryption method which is used when communicating with\ + \ the database." order: 6 oneOf: - title: "Unencrypted" @@ -3897,8 +3903,8 @@ default: "unencrypted" - title: "Encrypted (trust server certificate)" additionalProperties: false - description: "Use the cert provided by the server without verification.\ - \ (For testing purposes only!)" + description: "Use the certificate provided by the server without verification.\ + \ (For testing purposes only!)" required: - "ssl_method" properties: @@ -3910,7 +3916,7 @@ default: "encrypted_trust_server_certificate" - title: "Encrypted (verify certificate)" additionalProperties: false - description: "Verify and use the cert provided by the server." + description: "Verify and use the certificate provided by the server." required: - "ssl_method" - "trustStoreName" @@ -3931,7 +3937,7 @@ replication_method: type: "string" title: "Replication Method" - description: "Replication method to use for extracting data from the database.\ + description: "The replication method used for extracting data from the database.\ \ STANDARD replication requires no setup on the DB side but will not be\ \ able to represent deletions incrementally. CDC uses {TBC} to detect\ \ inserts, updates, and deletes. This needs to be configured on the source\ diff --git a/airbyte-integrations/connectors/source-mssql-strict-encrypt/Dockerfile b/airbyte-integrations/connectors/source-mssql-strict-encrypt/Dockerfile index f1a9b336fb554..daaf6dd152332 100644 --- a/airbyte-integrations/connectors/source-mssql-strict-encrypt/Dockerfile +++ b/airbyte-integrations/connectors/source-mssql-strict-encrypt/Dockerfile @@ -16,5 +16,5 @@ ENV APPLICATION source-mssql-strict-encrypt COPY --from=build /airbyte /airbyte -LABEL io.airbyte.version=0.1.4 +LABEL io.airbyte.version=0.1.5 LABEL io.airbyte.name=airbyte/source-mssql-strict-encrypt diff --git a/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/resources/expected_spec.json b/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/resources/expected_spec.json index 87fff41abf97d..46ae43cf7426d 100644 --- a/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/resources/expected_spec.json +++ b/airbyte-integrations/connectors/source-mssql-strict-encrypt/src/test/resources/expected_spec.json @@ -8,40 +8,45 @@ "additionalProperties": false, "properties": { "host": { - "description": "Hostname of the database.", + "description": "The hostname of the database.", + "title": "Host", "type": "string" }, "port": { - "description": "Port of the database.", + "description": "The port of the database.", + "title": "Port", "type": "integer", "minimum": 0, "maximum": 65536, "examples": ["1433"] }, "database": { - "description": "Name of the database.", + "description": "The name of the database.", + "title": "Database", "type": "string", "examples": ["master"] }, "username": { - "description": "Username to use to access the database.", + "description": "The username which is used to access the database.", + "title": "Username", "type": "string" }, "password": { - "description": "Password associated with the username.", + "description": "The password associated with the username.", + "title": "Password", "type": "string", "airbyte_secret": true }, "ssl_method": { "title": "SSL Method", "type": "object", - "description": "Encryption method to use when communicating with the database", + "description": "The encryption method which is used when communicating with the database.", "order": 6, "oneOf": [ { "title": "Encrypted (trust server certificate)", "additionalProperties": false, - "description": "Use the cert provided by the server without verification. (For testing purposes only!)", + "description": "Use the certificate provided by the server without verification. (For testing purposes only!)", "required": ["ssl_method"], "properties": { "ssl_method": { @@ -55,7 +60,7 @@ { "title": "Encrypted (verify certificate)", "additionalProperties": false, - "description": "Verify and use the cert provided by the server.", + "description": "Verify and use the certificate provided by the server.", "required": ["ssl_method", "trustStoreName", "trustStorePassword"], "properties": { "ssl_method": { @@ -77,7 +82,7 @@ "replication_method": { "type": "string", "title": "Replication Method", - "description": "Replication method to use for extracting data from the database. STANDARD replication requires no setup on the DB side but will not be able to represent deletions incrementally. CDC uses {TBC} to detect inserts, updates, and deletes. This needs to be configured on the source database itself.", + "description": "The replication method used for extracting data from the database. STANDARD replication requires no setup on the DB side but will not be able to represent deletions incrementally. CDC uses {TBC} to detect inserts, updates, and deletes. This needs to be configured on the source database itself.", "default": "STANDARD", "enum": ["STANDARD", "CDC"] } diff --git a/airbyte-integrations/connectors/source-mssql/Dockerfile b/airbyte-integrations/connectors/source-mssql/Dockerfile index 344279f0d5e49..8b6be50732f10 100644 --- a/airbyte-integrations/connectors/source-mssql/Dockerfile +++ b/airbyte-integrations/connectors/source-mssql/Dockerfile @@ -16,5 +16,5 @@ ENV APPLICATION source-mssql COPY --from=build /airbyte /airbyte -LABEL io.airbyte.version=0.3.11 +LABEL io.airbyte.version=0.3.12 LABEL io.airbyte.name=airbyte/source-mssql diff --git a/airbyte-integrations/connectors/source-mssql/src/main/resources/spec.json b/airbyte-integrations/connectors/source-mssql/src/main/resources/spec.json index 26318a1beb39a..bfbd1d5276875 100644 --- a/airbyte-integrations/connectors/source-mssql/src/main/resources/spec.json +++ b/airbyte-integrations/connectors/source-mssql/src/main/resources/spec.json @@ -8,34 +8,39 @@ "additionalProperties": false, "properties": { "host": { - "description": "Hostname of the database.", + "description": "The hostname of the database.", + "title": "Host", "type": "string" }, "port": { - "description": "Port of the database.", + "description": "The port of the database.", + "title": "Port", "type": "integer", "minimum": 0, "maximum": 65536, "examples": ["1433"] }, "database": { - "description": "Name of the database.", + "description": "The name of the database.", + "title": "Database", "type": "string", "examples": ["master"] }, "username": { - "description": "Username to use to access the database.", + "description": "The username which is used to access the database.", + "title": "Username", "type": "string" }, "password": { - "description": "Password associated with the username.", + "description": "The password associated with the username.", + "title": "Password", "type": "string", "airbyte_secret": true }, "ssl_method": { "title": "SSL Method", "type": "object", - "description": "Encryption method to use when communicating with the database", + "description": "The encryption method which is used when communicating with the database.", "order": 6, "oneOf": [ { @@ -55,7 +60,7 @@ { "title": "Encrypted (trust server certificate)", "additionalProperties": false, - "description": "Use the cert provided by the server without verification. (For testing purposes only!)", + "description": "Use the certificate provided by the server without verification. (For testing purposes only!)", "required": ["ssl_method"], "properties": { "ssl_method": { @@ -69,7 +74,7 @@ { "title": "Encrypted (verify certificate)", "additionalProperties": false, - "description": "Verify and use the cert provided by the server.", + "description": "Verify and use the certificate provided by the server.", "required": ["ssl_method", "trustStoreName", "trustStorePassword"], "properties": { "ssl_method": { @@ -91,7 +96,7 @@ "replication_method": { "type": "string", "title": "Replication Method", - "description": "Replication method to use for extracting data from the database. STANDARD replication requires no setup on the DB side but will not be able to represent deletions incrementally. CDC uses {TBC} to detect inserts, updates, and deletes. This needs to be configured on the source database itself.", + "description": "The replication method used for extracting data from the database. STANDARD replication requires no setup on the DB side but will not be able to represent deletions incrementally. CDC uses {TBC} to detect inserts, updates, and deletes. This needs to be configured on the source database itself.", "default": "STANDARD", "enum": ["STANDARD", "CDC"] } diff --git a/docs/integrations/sources/mssql.md b/docs/integrations/sources/mssql.md index 4a38f515c1d85..fc7236880cae0 100644 --- a/docs/integrations/sources/mssql.md +++ b/docs/integrations/sources/mssql.md @@ -294,6 +294,7 @@ If you do not see a type in this list, assume that it is coerced into a string. | Version | Date | Pull Request | Subject | | |:--------| :--- | :--- | :--- | :-- | +| 0.3.12 | 2021-12-30 | [9206](https://github.com/airbytehq/airbyte/pull/9206) | Update connector fields title/description | | 0.3.11 | 2021-12-24 | [8958](https://github.com/airbytehq/airbyte/pull/8958) | Add support for JdbcType.ARRAY | | 0.3.10 | 2021-12-01 | [8371](https://github.com/airbytehq/airbyte/pull/8371) | Fixed incorrect handling "\n" in ssh key | | | 0.3.9 | 2021-11-09 | [7386](https://github.com/airbytehq/airbyte/pull/7386) | Improve support for binary and varbinary data types | |