From d17c024bbd2e7c42b6185deb382c9cdaf0ed53c9 Mon Sep 17 00:00:00 2001 From: lmossman Date: Wed, 16 Jul 2025 16:10:09 -0700 Subject: [PATCH 1/4] add interpolation_context to auth fields --- .../declarative/declarative_component_schema.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/airbyte_cdk/sources/declarative/declarative_component_schema.yaml b/airbyte_cdk/sources/declarative/declarative_component_schema.yaml index 3e2622ae6..2268a3d67 100644 --- a/airbyte_cdk/sources/declarative/declarative_component_schema.yaml +++ b/airbyte_cdk/sources/declarative/declarative_component_schema.yaml @@ -1095,6 +1095,8 @@ definitions: title: Secret Key type: string description: Secret used to sign the JSON web token. + interpolation_context: + - config examples: - "{{ config['secret_key'] }}" base64_encode_secret_key: @@ -1224,6 +1226,8 @@ definitions: title: Client ID description: The OAuth client ID. Fill it in the user inputs. type: string + interpolation_context: + - config examples: - "{{ config['client_id }}" - "{{ config['credentials']['client_id }}" @@ -1238,6 +1242,8 @@ definitions: title: Client Secret description: The OAuth client secret. Fill it in the user inputs. type: string + interpolation_context: + - config examples: - "{{ config['client_secret }}" - "{{ config['credentials']['client_secret }}" @@ -1252,6 +1258,8 @@ definitions: title: Refresh Token description: Credential artifact used to get a new access token. type: string + interpolation_context: + - config examples: - "{{ config['refresh_token'] }}" - "{{ config['credentials]['refresh_token'] }}" @@ -1272,6 +1280,8 @@ definitions: title: Access Token Value description: The value of the access_token to bypass the token refreshing using `refresh_token`. type: string + interpolation_context: + - config examples: - secret_access_token_value expires_in_name: From 3acc2420c5760832f20c45c1ed893cf6b5df26be Mon Sep 17 00:00:00 2001 From: Lake Mossman Date: Wed, 16 Jul 2025 16:16:50 -0700 Subject: [PATCH 2/4] Update airbyte_cdk/sources/declarative/declarative_component_schema.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../sources/declarative/declarative_component_schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte_cdk/sources/declarative/declarative_component_schema.yaml b/airbyte_cdk/sources/declarative/declarative_component_schema.yaml index 2268a3d67..2711ec28f 100644 --- a/airbyte_cdk/sources/declarative/declarative_component_schema.yaml +++ b/airbyte_cdk/sources/declarative/declarative_component_schema.yaml @@ -1229,7 +1229,7 @@ definitions: interpolation_context: - config examples: - - "{{ config['client_id }}" + - "{{ config['client_id'] }}" - "{{ config['credentials']['client_id }}" client_secret_name: title: Client Secret Property Name From 72aa20e31d36a5e8c566f7e7a9a7085669004cb6 Mon Sep 17 00:00:00 2001 From: Lake Mossman Date: Wed, 16 Jul 2025 16:16:59 -0700 Subject: [PATCH 3/4] Update airbyte_cdk/sources/declarative/declarative_component_schema.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../sources/declarative/declarative_component_schema.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte_cdk/sources/declarative/declarative_component_schema.yaml b/airbyte_cdk/sources/declarative/declarative_component_schema.yaml index 2711ec28f..538fd04a1 100644 --- a/airbyte_cdk/sources/declarative/declarative_component_schema.yaml +++ b/airbyte_cdk/sources/declarative/declarative_component_schema.yaml @@ -1245,7 +1245,7 @@ definitions: interpolation_context: - config examples: - - "{{ config['client_secret }}" + - "{{ config['client_secret'] }}" - "{{ config['credentials']['client_secret }}" refresh_token_name: title: Refresh Token Property Name From e2648084b0e7b6eb9401d0aa87eb0544c3a62b86 Mon Sep 17 00:00:00 2001 From: lmossman Date: Wed, 16 Jul 2025 16:17:39 -0700 Subject: [PATCH 4/4] update models --- .../declarative/models/declarative_component_schema.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/airbyte_cdk/sources/declarative/models/declarative_component_schema.py b/airbyte_cdk/sources/declarative/models/declarative_component_schema.py index cca08224b..8c6b27595 100644 --- a/airbyte_cdk/sources/declarative/models/declarative_component_schema.py +++ b/airbyte_cdk/sources/declarative/models/declarative_component_schema.py @@ -523,7 +523,10 @@ class OAuthAuthenticator(BaseModel): client_id: Optional[str] = Field( None, description="The OAuth client ID. Fill it in the user inputs.", - examples=["{{ config['client_id }}", "{{ config['credentials']['client_id }}"], + examples=[ + "{{ config['client_id'] }}", + "{{ config['credentials']['client_id }}", + ], title="Client ID", ) client_secret_name: Optional[str] = Field( @@ -536,7 +539,7 @@ class OAuthAuthenticator(BaseModel): None, description="The OAuth client secret. Fill it in the user inputs.", examples=[ - "{{ config['client_secret }}", + "{{ config['client_secret'] }}", "{{ config['credentials']['client_secret }}", ], title="Client Secret",