Skip to content

Commit

Permalink
Update db model
Browse files Browse the repository at this point in the history
  • Loading branch information
rodireich committed Jan 31, 2024
1 parent 3ced5d9 commit ba38c44
Show file tree
Hide file tree
Showing 7 changed files with 283 additions and 4 deletions.
1 change: 1 addition & 0 deletions airbyte-cdk/java/airbyte-cdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ MavenLocal debugging steps:

| Version | Date | Pull Request | Subject |
|:--------|:-----------|:-----------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
| 0.17.0 | 2023-12-21 | [\#33606](https://github.com/airbytehq/airbyte/pull/33606) | Add updated Initial and Incremental Stream State definitions for DB Sources |
| 0.16.3 | 2024-01-30 | [\#34669](https://github.com/airbytehq/airbyte/pull/34669) | Fix org.apache.logging.log4j:log4j-slf4j-impl version conflicts. |
| 0.16.2 | 2024-01-29 | [\#34630](https://github.com/airbytehq/airbyte/pull/34630) | expose NamingTransformer to sub-classes in destinations JdbcSqlGenerator. |
| 0.16.1 | 2024-01-29 | [\#34533](https://github.com/airbytehq/airbyte/pull/34533) | Add a safe method to execute DatabaseMetadata's Resultset returning queries. |
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
properties:
- client_secret
- auth_token
- cohere_key
- access_key
- private_key
- app_secret_token
- jwt_token
- token_uri
- realm_id
- org_id
- password
- ssh_key
- session_token
- consumer_key
- application_key
- token_secret
- tunnel_user_password
- access_key_id
- user_secret
- ca_certificate
- key_store_password
- api_password
- lwa_app_id
- public_key
- service_account_json
- auth_user_password
- google_application_credentials
- api_key
- credentials_json
- certificate
- azure_blob_storage_sas_token
- appid
- X-Postmark-Server-Token
- user_auth_key
- personal_access_token
- app_id
- privateKey
- databricks_personal_access_token
- aws_key_id
- astra_db_app_token
- hmac_key_access_id
- service_account
- refresh_token
- aws_access_key_id
- sasl_jaas_config
- access_key_secret
- user_token
- sas_token
- account_sid
- realm
- api_token
- client_key
- account_id
- ssl_ca_certificate
- tenant_id
- access_token
- token_key
- auth_hash
- accessKey
- azure_blob_storage_account_key
- s3_access_key_id
- agreement_grant_token
- hmac_key_secret
- apiKeySecret
- app_api_key
- site_id
- reserved_attribute_names
- account_token
- private_key_password
- uid
- rest_token
- api_secret
- ssl_certificate
- motherduck_api_key
- pinecone_key
- client_key_password
- key
- survey_group_id
- site_api_key
- domain_url
- restid
- rest_credential
- aws_secret_key
- api_key_secret
- aws_key_secret
- value
- survey_id
- service_account_info
- shared_key
- key_encrypting_key
- token
- s3_secret_access_key
- secret_access_key
- application_secret
- developer_token
- user_principal_name
- extension_id
- lwa_client_secret
- client_certificate
- user_name
- client_secret_value
- aws_secret_access_key
- client_id
- openai_key
- consumer_secret
- apikey
- auth_ssh_key
- api_id
- apiId
- secret
- X-Postmark-Account-Token
- secret_key
- apiKey
- storage_access_key
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=0.16.3
version=0.17
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
"$schema": http://json-schema.org/draft-07/schema#
title: DbSource Models
type: object
description: DbSource Models
properties:
state_type:
"$ref": "#/definitions/StateType"
ordered_column_state:
"$ref": "#/definitions/OrderedColumnLoadStatus"
cursor_based_state:
"$ref": "#/definitions/CursorBasedStatus"
definitions:
StateType:
description: Enum to define the sync mode of stream state.
type: string
enum:
- cursor_based
- ordered_column
- cdc
CursorBasedStatus:
type: object
extends:
type: object
existingJavaType: "io.airbyte.cdk.integrations.source.relationaldb.models.DbStreamState"
properties:
state_type:
"$ref": "#/definitions/StateType"
version:
description: Version of state.
type: integer
OrderedColumnLoadStatus:
type: object
properties:
version:
description: Version of state.
type: integer
state_type:
"$ref": "#/definitions/StateType"
ordered_col:
description: ordered column name
type: string
ordered_col_val:
description: ordered column high watermark
type: string
incremental_state:
description: State to switch to after completion of the ordered column initial sync
type: object
existingJavaType: com.fasterxml.jackson.databind.JsonNode

Large diffs are not rendered by default.

114 changes: 114 additions & 0 deletions airbyte-commons/src/main/resources/seed/specs_secrets_mask.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
properties:
- aws_access_key_id
- access_key_secret
- rest_token
- apiKey
- google_application_credentials
- api_token
- realm
- value
- site_api_key
- api_secret
- org_id
- jwt_token
- ssh_key
- developer_token
- uid
- app_api_key
- user_secret
- api_key_secret
- secret
- rest_credential
- domain_url
- service_account
- storage_access_key
- aws_secret_key
- key
- access_key_id
- access_token
- cohere_key
- restid
- azure_blob_storage_sas_token
- client_secret
- site_id
- key_store_password
- application_key
- lwa_client_secret
- databricks_personal_access_token
- application_secret
- client_certificate
- ca_certificate
- X-Postmark-Server-Token
- auth_hash
- shared_key
- apikey
- X-Postmark-Account-Token
- apiKeySecret
- survey_id
- token_key
- service_account_info
- secret_key
- personal_access_token
- app_secret_token
- auth_user_password
- account_sid
- secret_access_key
- s3_secret_access_key
- token_secret
- api_password
- accessKey
- motherduck_api_key
- tunnel_user_password
- sas_token
- lwa_app_id
- api_key
- hmac_key_access_id
- aws_access_key
- client_key
- api_id
- openai_key
- aws_key_id
- account_id
- aws_key_secret
- survey_group_id
- role_arn
- pinecone_key
- client_secret_value
- client_id
- client_key_password
- sasl_jaas_config
- apiId
- ssl_certificate
- session_token
- app_id
- ssl_ca_certificate
- auth_ssh_key
- extension_id
- privateKey
- private_key
- user_name
- user_token
- azure_blob_storage_account_key
- consumer_key
- token
- public_key
- password
- account_token
- aws_secret_access_key
- consumer_secret
- user_auth_key
- refresh_token
- tenant_id
- hmac_key_secret
- s3_access_key_id
- appid
- key_encrypting_key
- reserved_attribute_names
- credentials_json
- service_account_json
- token_uri
- auth_token
- private_key_password
- access_key
- agreement_grant_token
- realm_id
5 changes: 2 additions & 3 deletions airbyte-integrations/connectors/source-mssql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {
}

airbyteJavaConnector {
cdkVersionRequired = '0.16.0'
cdkVersionRequired = '0.17.0'
features = ['db-sources']
useLocalCdk = false
useLocalCdk = true
}

configurations.all {
Expand All @@ -16,7 +16,6 @@ configurations.all {
}



application {
mainClass = 'io.airbyte.integrations.source.mssql.MssqlSource'
applicationDefaultJvmArgs = ['-XX:+ExitOnOutOfMemoryError', '-XX:MaxRAMPercentage=75.0']
Expand Down

0 comments on commit ba38c44

Please sign in to comment.