Skip to content

Commit

Permalink
Remove additionalProperties from JDBC source connectors (#14574)
Browse files Browse the repository at this point in the history
* Remove additional properties from JDBC specs

* fixed SnowflakeSourceAuthAcceptanceTest

* fixed OracleStrictEncryptJdbcSourceAcceptanceTest

* fixed Oracle Strict encrypt expected spec

* updated Changelog

* fixed CockroachDbSourceTest

* fixed CockroachDb Tests

* fixed CockroachDb Tests for Linux OS

* bump versions

* bump clickhouse-source-strict-encrypt

* auto-bump connector version [ci skip]

* auto-bump connector version [ci skip]

* auto-bump connector version [ci skip]

* auto-bump connector version [ci skip]

* auto-bump connector version [ci skip]

* fixed dependencies for Clickhouse Source

* auto-bump connector version [ci skip]

* auto-bump connector version [ci skip]

* auto-bump connector version [ci skip]

* fixed OracleSourceDatatypeTest

* auto-bump connector version [ci skip]

* rollback ClickHouse Source changelog

Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>
  • Loading branch information
2 people authored and mfsiega-airbyte committed Jul 21, 2022
1 parent 1f122d2 commit cfb2493
Show file tree
Hide file tree
Showing 53 changed files with 185 additions and 206 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
- name: BigQuery
sourceDefinitionId: bfd1ddf8-ae8a-4620-b1d7-55597d2ba08c
dockerRepository: airbyte/source-bigquery
dockerImageTag: 0.1.8
dockerImageTag: 0.1.9
documentationUrl: https://docs.airbyte.io/integrations/sources/bigquery
icon: bigquery.svg
sourceType: database
Expand Down Expand Up @@ -168,7 +168,7 @@
- name: Cockroachdb
sourceDefinitionId: 9fa5862c-da7c-11eb-8d19-0242ac130003
dockerRepository: airbyte/source-cockroachdb
dockerImageTag: 0.1.12
dockerImageTag: 0.1.13
documentationUrl: https://docs.airbyte.io/integrations/sources/cockroachdb
icon: cockroachdb.svg
sourceType: database
Expand Down Expand Up @@ -414,7 +414,7 @@
- name: IBM Db2
sourceDefinitionId: 447e0381-3780-4b46-bb62-00a4e3c8b8e2
dockerRepository: airbyte/source-db2
dockerImageTag: 0.1.11
dockerImageTag: 0.1.12
documentationUrl: https://docs.airbyte.io/integrations/sources/db2
icon: db2.svg
sourceType: database
Expand Down Expand Up @@ -556,7 +556,7 @@
- name: Microsoft SQL Server (MSSQL)
sourceDefinitionId: b5ea17b1-f170-46dc-bc31-cc744ca984c1
dockerRepository: airbyte/source-mssql
dockerImageTag: 0.4.9
dockerImageTag: 0.4.10
documentationUrl: https://docs.airbyte.io/integrations/sources/mssql
icon: mssql.svg
sourceType: database
Expand Down Expand Up @@ -604,7 +604,7 @@
- name: MySQL
sourceDefinitionId: 435bb9a5-7887-4809-aa58-28c27df0d7ad
dockerRepository: airbyte/source-mysql
dockerImageTag: 0.5.15
dockerImageTag: 0.5.16
documentationUrl: https://docs.airbyte.io/integrations/sources/mysql
icon: mysql.svg
sourceType: database
Expand Down Expand Up @@ -643,7 +643,7 @@
- name: Oracle DB
sourceDefinitionId: b39a7370-74c3-45a6-ac3a-380d48520a83
dockerRepository: airbyte/source-oracle
dockerImageTag: 0.3.17
dockerImageTag: 0.3.18
documentationUrl: https://docs.airbyte.io/integrations/sources/oracle
icon: oracle.svg
sourceType: database
Expand Down Expand Up @@ -754,7 +754,7 @@
- name: Postgres
sourceDefinitionId: decd338e-5647-4c0b-adf4-da0e75f5a750
dockerRepository: airbyte/source-postgres
dockerImageTag: 0.4.34
dockerImageTag: 0.4.35
documentationUrl: https://docs.airbyte.io/integrations/sources/postgres
icon: postgresql.svg
sourceType: database
Expand Down Expand Up @@ -802,7 +802,7 @@
- name: Redshift
sourceDefinitionId: e87ffa8e-a3b5-f69c-9076-6011339de1f6
dockerRepository: airbyte/source-redshift
dockerImageTag: 0.3.10
dockerImageTag: 0.3.11
documentationUrl: https://docs.airbyte.io/integrations/sources/redshift
icon: redshift.svg
sourceType: database
Expand Down Expand Up @@ -905,7 +905,7 @@
- name: Snowflake
sourceDefinitionId: e2d65910-8c8b-40a1-ae7d-ee2416b2bfa2
dockerRepository: airbyte/source-snowflake
dockerImageTag: 0.1.12
dockerImageTag: 0.1.13
documentationUrl: https://docs.airbyte.io/integrations/sources/snowflake
icon: snowflake.svg
sourceType: database
Expand Down
44 changes: 9 additions & 35 deletions airbyte-config/init/src/main/resources/seed/source_specs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-bigquery:0.1.8"
- dockerImage: "airbyte/source-bigquery:0.1.9"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/bigquery"
connectionSpecification:
Expand All @@ -840,7 +840,6 @@
required:
- "project_id"
- "credentials_json"
additionalProperties: false
properties:
project_id:
type: "string"
Expand Down Expand Up @@ -1359,7 +1358,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-cockroachdb:0.1.12"
- dockerImage: "airbyte/source-cockroachdb:0.1.13"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/cockroachdb"
connectionSpecification:
Expand All @@ -1371,7 +1370,6 @@
- "port"
- "database"
- "username"
additionalProperties: false
properties:
host:
title: "Host"
Expand Down Expand Up @@ -3808,7 +3806,7 @@
- - "client_secret"
oauthFlowOutputParameters:
- - "refresh_token"
- dockerImage: "airbyte/source-db2:0.1.11"
- dockerImage: "airbyte/source-db2:0.1.12"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/db2"
connectionSpecification:
Expand All @@ -3822,7 +3820,6 @@
- "username"
- "password"
- "encryption"
additionalProperties: false
properties:
host:
description: "Host of the Db2."
Expand Down Expand Up @@ -3859,7 +3856,6 @@
order: 5
oneOf:
- title: "Unencrypted"
additionalProperties: false
description: "Data transfer will not be encrypted."
required:
- "encryption_method"
Expand All @@ -3871,7 +3867,6 @@
- "unencrypted"
default: "unencrypted"
- title: "TLS Encrypted (verify certificate)"
additionalProperties: false
description: "Verify and use the cert provided by the server."
required:
- "encryption_method"
Expand Down Expand Up @@ -4988,7 +4983,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-mssql:0.4.9"
- dockerImage: "airbyte/source-mssql:0.4.10"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/destinations/mssql"
connectionSpecification:
Expand All @@ -5000,7 +4995,6 @@
- "port"
- "database"
- "username"
additionalProperties: true
properties:
host:
description: "The hostname of the database."
Expand Down Expand Up @@ -5049,7 +5043,6 @@
order: 6
oneOf:
- title: "Unencrypted"
additionalProperties: false
description: "Data transfer will not be encrypted."
required:
- "ssl_method"
Expand All @@ -5061,7 +5054,6 @@
- "unencrypted"
default: "unencrypted"
- title: "Encrypted (trust server certificate)"
additionalProperties: false
description: "Use the certificate provided by the server without verification.\
\ (For testing purposes only!)"
required:
Expand All @@ -5074,7 +5066,6 @@
- "encrypted_trust_server_certificate"
default: "encrypted_trust_server_certificate"
- title: "Encrypted (verify certificate)"
additionalProperties: false
description: "Verify and use the certificate provided by the server."
required:
- "ssl_method"
Expand Down Expand Up @@ -5102,11 +5093,9 @@
\ inserts, updates, and deletes. This needs to be configured on the source\
\ database itself."
default: "STANDARD"
additionalProperties: true
order: 8
oneOf:
- title: "Standard"
additionalProperties: false
description: "Standard replication requires no setup on the DB side but\
\ will not be able to represent deletions incrementally."
required:
Expand All @@ -5120,7 +5109,6 @@
default: "STANDARD"
order: 0
- title: "Logical Replication (CDC)"
additionalProperties: false
description: "CDC uses {TBC} to detect inserts, updates, and deletes.\
\ This needs to be configured on the source database itself."
required:
Expand Down Expand Up @@ -5771,7 +5759,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-mysql:0.5.15"
- dockerImage: "airbyte/source-mysql:0.5.16"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/mysql"
connectionSpecification:
Expand All @@ -5784,7 +5772,6 @@
- "database"
- "username"
- "replication_method"
additionalProperties: false
properties:
host:
description: "The host name of the database."
Expand Down Expand Up @@ -6299,7 +6286,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-oracle:0.3.17"
- dockerImage: "airbyte/source-oracle:0.3.18"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/oracle"
connectionSpecification:
Expand All @@ -6311,7 +6298,6 @@
- "port"
- "sid"
- "username"
additionalProperties: false
properties:
host:
title: "Host"
Expand Down Expand Up @@ -6368,7 +6354,6 @@
order: 8
oneOf:
- title: "Unencrypted"
additionalProperties: false
description: "Data transfer will not be encrypted."
required:
- "encryption_method"
Expand All @@ -6380,7 +6365,6 @@
- "unencrypted"
default: "unencrypted"
- title: "Native Network Encryption (NNE)"
additionalProperties: false
description: "The native network encryption gives you the ability to encrypt\
\ database connections, without the configuration overhead of TCP/IP\
\ and SSL/TLS and without the need to open and listen on different ports."
Expand All @@ -6404,7 +6388,6 @@
- "RC4_56"
- "3DES168"
- title: "TLS Encrypted (verify certificate)"
additionalProperties: false
description: "Verify and use the certificate provided by the server."
required:
- "encryption_method"
Expand Down Expand Up @@ -7064,7 +7047,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-postgres:0.4.34"
- dockerImage: "airbyte/source-postgres:0.4.35"
spec:
documentationUrl: "https://docs.airbyte.com/integrations/sources/postgres"
connectionSpecification:
Expand All @@ -7076,7 +7059,6 @@
- "port"
- "database"
- "username"
additionalProperties: false
properties:
host:
title: "Host"
Expand Down Expand Up @@ -7285,7 +7267,6 @@
order: 8
oneOf:
- title: "Standard"
additionalProperties: false
description: "Standard replication requires no setup on the DB side but\
\ will not be able to represent deletions incrementally."
required:
Expand All @@ -7299,7 +7280,6 @@
default: "Standard"
order: 0
- title: "Logical Replication (CDC)"
additionalProperties: false
description: "Logical replication uses the Postgres write-ahead log (WAL)\
\ to detect inserts, updates, and deletes. This needs to be configured\
\ on the source database itself. Only available on Postgres 10 and above.\
Expand Down Expand Up @@ -7656,7 +7636,7 @@
supportsNormalization: false
supportsDBT: false
supported_destination_sync_modes: []
- dockerImage: "airbyte/source-redshift:0.3.10"
- dockerImage: "airbyte/source-redshift:0.3.11"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/destinations/redshift"
connectionSpecification:
Expand All @@ -7669,7 +7649,6 @@
- "database"
- "username"
- "password"
additionalProperties: false
properties:
host:
title: "Host"
Expand Down Expand Up @@ -8788,7 +8767,7 @@
- - "client_secret"
oauthFlowOutputParameters:
- - "refresh_token"
- dockerImage: "airbyte/source-snowflake:0.1.12"
- dockerImage: "airbyte/source-snowflake:0.1.13"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/sources/snowflake"
connectionSpecification:
Expand All @@ -8801,7 +8780,6 @@
- "warehouse"
- "database"
- "schema"
additionalProperties: true
properties:
credentials:
title: "Authorization Method"
Expand Down Expand Up @@ -8927,15 +8905,13 @@
oauth_config_specification:
oauth_user_input_from_connector_config_specification:
type: "object"
additionalProperties: false
properties:
host:
type: "string"
path_in_connector_config:
- "host"
complete_oauth_output_specification:
type: "object"
additionalProperties: false
properties:
access_token:
type: "string"
Expand All @@ -8949,15 +8925,13 @@
- "refresh_token"
complete_oauth_server_input_specification:
type: "object"
additionalProperties: false
properties:
client_id:
type: "string"
client_secret:
type: "string"
complete_oauth_server_output_specification:
type: "object"
additionalProperties: false
properties:
client_id:
type: "string"
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-bigquery/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ ENV APPLICATION source-bigquery
COPY --from=build /airbyte /airbyte

# Airbyte's build system uses these labels to know what to name and tag the docker images produced by this Dockerfile.
LABEL io.airbyte.version=0.1.8
LABEL io.airbyte.version=0.1.9
LABEL io.airbyte.name=airbyte/source-bigquery
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"title": "BigQuery Source Spec",
"type": "object",
"required": ["project_id", "credentials_json"],
"additionalProperties": false,
"properties": {
"project_id": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
implementation project(':airbyte-protocol:protocol-models')
implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)

implementation 'ru.yandex.clickhouse:clickhouse-jdbc:0.3.1'
implementation group: 'com.clickhouse', name: 'clickhouse-jdbc', version: '0.3.2-patch9'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-clickhouse')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"title": "ClickHouse Source Spec",
"type": "object",
"required": ["host", "port", "database", "username"],
"additionalProperties": false,
"properties": {
"host": {
"description": "The host endpoint of the Clickhouse cluster.",
Expand Down
Loading

0 comments on commit cfb2493

Please sign in to comment.