Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 115 additions & 15 deletions providers/google/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1131,63 +1131,62 @@ connection-types:
project:
label: "Project Id"
schema:
type: string
type: ["string", "null"]
key_path:
label: "Keyfile Path"
schema:
type: string
type: ["string", "null"]
keyfile_dict:
label: "Keyfile JSON"
schema:
type: string
type: ["string", "null"]
format: password
credential_config_file:
label: "Credential Configuration File"
schema:
type: string
type: ["string", "null"]
scope:
label: "Scopes (comma separated)"
schema:
type: string
type: ["string", "null"]
key_secret_name:
label: "Keyfile Secret Name (in GCP Secret Manager)"
schema:
type: string
type: ["string", "null"]
key_secret_project_id:
label: "Keyfile Secret Project Id (in GCP Secret Manager)"
schema:
type: string
type: ["string", "null"]
num_retries:
label: "Number of Retries"
schema:
type: integer
minimum: 0
type: ["integer", "null"]
default: 5
impersonation_chain:
label: "Impersonation Chain"
schema:
type: string
type: ["string", "null"]
idp_issuer_url:
label: "IdP Token Issue URL (Client Credentials Grant Flow)"
schema:
type: string
type: ["string", "null"]
client_id:
label: "Client ID (Client Credentials Grant Flow)"
schema:
type: string
type: ["string", "null"]
client_secret:
label: "Client Secret (Client Credentials Grant Flow)"
schema:
type: string
type: ["string", "null"]
format: password
idp_extra_parameters:
label: "IdP Extra Request Parameters"
schema:
type: string
type: ["string", "null"]
is_anonymous:
label: "Anonymous credentials (ignores all other settings)"
schema:
type: boolean
type: ["boolean", "null"]
default: false
- hook-class-name: airflow.providers.google.cloud.hooks.dataprep.GoogleDataprepHook
connection-type: dataprep
Expand All @@ -1201,6 +1200,88 @@ connection-types:
hidden-fields: ["host", "schema", "login", "password", "port", "extra"]
relabeling: {}
placeholders: {}
conn-fields:
project:
label: "Project Id"
schema:
type: ["string", "null"]
key_path:
label: "Keyfile Path"
schema:
type: ["string", "null"]
keyfile_dict:
label: "Keyfile JSON"
schema:
type: ["string", "null"]
format: password
credential_config_file:
label: "Credential Configuration File"
schema:
type: ["string", "null"]
scope:
label: "Scopes (comma separated)"
schema:
type: ["string", "null"]
key_secret_name:
label: "Keyfile Secret Name (in GCP Secret Manager)"
schema:
type: ["string", "null"]
key_secret_project_id:
label: "Keyfile Secret Project Id (in GCP Secret Manager)"
schema:
type: ["string", "null"]
num_retries:
label: "Number of Retries"
schema:
type: ["integer", "null"]
default: 5
impersonation_chain:
label: "Impersonation Chain"
schema:
type: ["string", "null"]
idp_issuer_url:
label: "IdP Token Issue URL (Client Credentials Grant Flow)"
schema:
type: ["string", "null"]
client_id:
label: "Client ID (Client Credentials Grant Flow)"
schema:
type: ["string", "null"]
client_secret:
label: "Client Secret (Client Credentials Grant Flow)"
schema:
type: ["string", "null"]
format: password
idp_extra_parameters:
label: "IdP Extra Request Parameters"
schema:
type: ["string", "null"]
is_anonymous:
label: "Anonymous credentials (ignores all other settings)"
schema:
type: ["boolean", "null"]
default: false
use_legacy_sql:
label: "Use Legacy SQL"
schema:
type: ["boolean", "null"]
location:
label: "Location"
schema:
type: ["string", "null"]
priority:
label: "Priority"
schema:
type: ["string", "null"]
default: INTERACTIVE
api_resource_configs:
label: "API Resource Configs"
schema:
type: ["string", "null"]
labels:
label: "Labels"
schema:
type: ["string", "null"]
- hook-class-name: airflow.providers.google.cloud.hooks.compute_ssh.ComputeEngineSSHHook
connection-type: gcpssh
ui-field-behaviour:
Expand All @@ -1216,6 +1297,25 @@ connection-types:
relabeling: {}
placeholders:
password: "Leave blank (optional)"
conn-fields:
developer_token:
label: "Developer token"
schema:
type: ["string", "null"]
client_id:
label: "OAuth2 Client ID"
schema:
type: ["string", "null"]
client_secret:
label: "OAuth2 Client Secret"
schema:
type: ["string", "null"]
format: password
refresh_token:
label: "OAuth2 Refresh Token"
schema:
type: ["string", "null"]
format: password
- hook-class-name: airflow.providers.google.cloud.hooks.looker.LookerHook
connection-type: gcp_looker

Expand Down
103 changes: 89 additions & 14 deletions providers/google/src/airflow/providers/google/get_provider_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -1373,49 +1373,52 @@ def get_provider_info():
"placeholders": {},
},
"conn-fields": {
"project": {"label": "Project Id", "schema": {"type": "string"}},
"key_path": {"label": "Keyfile Path", "schema": {"type": "string"}},
"project": {"label": "Project Id", "schema": {"type": ["string", "null"]}},
"key_path": {"label": "Keyfile Path", "schema": {"type": ["string", "null"]}},
"keyfile_dict": {
"label": "Keyfile JSON",
"schema": {"type": "string", "format": "password"},
"schema": {"type": ["string", "null"], "format": "password"},
},
"credential_config_file": {
"label": "Credential Configuration File",
"schema": {"type": "string"},
"schema": {"type": ["string", "null"]},
},
"scope": {"label": "Scopes (comma separated)", "schema": {"type": "string"}},
"scope": {"label": "Scopes (comma separated)", "schema": {"type": ["string", "null"]}},
"key_secret_name": {
"label": "Keyfile Secret Name (in GCP Secret Manager)",
"schema": {"type": "string"},
"schema": {"type": ["string", "null"]},
},
"key_secret_project_id": {
"label": "Keyfile Secret Project Id (in GCP Secret Manager)",
"schema": {"type": "string"},
"schema": {"type": ["string", "null"]},
},
"num_retries": {
"label": "Number of Retries",
"schema": {"type": "integer", "minimum": 0, "default": 5},
"schema": {"type": ["integer", "null"], "default": 5},
},
"impersonation_chain": {
"label": "Impersonation Chain",
"schema": {"type": ["string", "null"]},
},
"impersonation_chain": {"label": "Impersonation Chain", "schema": {"type": "string"}},
"idp_issuer_url": {
"label": "IdP Token Issue URL (Client Credentials Grant Flow)",
"schema": {"type": "string"},
"schema": {"type": ["string", "null"]},
},
"client_id": {
"label": "Client ID (Client Credentials Grant Flow)",
"schema": {"type": "string"},
"schema": {"type": ["string", "null"]},
},
"client_secret": {
"label": "Client Secret (Client Credentials Grant Flow)",
"schema": {"type": "string", "format": "password"},
"schema": {"type": ["string", "null"], "format": "password"},
},
"idp_extra_parameters": {
"label": "IdP Extra Request Parameters",
"schema": {"type": "string"},
"schema": {"type": ["string", "null"]},
},
"is_anonymous": {
"label": "Anonymous credentials (ignores all other settings)",
"schema": {"type": "boolean", "default": False},
"schema": {"type": ["boolean", "null"], "default": False},
},
},
},
Expand All @@ -1439,6 +1442,66 @@ def get_provider_info():
"relabeling": {},
"placeholders": {},
},
"conn-fields": {
"project": {"label": "Project Id", "schema": {"type": ["string", "null"]}},
"key_path": {"label": "Keyfile Path", "schema": {"type": ["string", "null"]}},
"keyfile_dict": {
"label": "Keyfile JSON",
"schema": {"type": ["string", "null"], "format": "password"},
},
"credential_config_file": {
"label": "Credential Configuration File",
"schema": {"type": ["string", "null"]},
},
"scope": {"label": "Scopes (comma separated)", "schema": {"type": ["string", "null"]}},
"key_secret_name": {
"label": "Keyfile Secret Name (in GCP Secret Manager)",
"schema": {"type": ["string", "null"]},
},
"key_secret_project_id": {
"label": "Keyfile Secret Project Id (in GCP Secret Manager)",
"schema": {"type": ["string", "null"]},
},
"num_retries": {
"label": "Number of Retries",
"schema": {"type": ["integer", "null"], "default": 5},
},
"impersonation_chain": {
"label": "Impersonation Chain",
"schema": {"type": ["string", "null"]},
},
"idp_issuer_url": {
"label": "IdP Token Issue URL (Client Credentials Grant Flow)",
"schema": {"type": ["string", "null"]},
},
"client_id": {
"label": "Client ID (Client Credentials Grant Flow)",
"schema": {"type": ["string", "null"]},
},
"client_secret": {
"label": "Client Secret (Client Credentials Grant Flow)",
"schema": {"type": ["string", "null"], "format": "password"},
},
"idp_extra_parameters": {
"label": "IdP Extra Request Parameters",
"schema": {"type": ["string", "null"]},
},
"is_anonymous": {
"label": "Anonymous credentials (ignores all other settings)",
"schema": {"type": ["boolean", "null"], "default": False},
},
"use_legacy_sql": {"label": "Use Legacy SQL", "schema": {"type": ["boolean", "null"]}},
"location": {"label": "Location", "schema": {"type": ["string", "null"]}},
"priority": {
"label": "Priority",
"schema": {"type": ["string", "null"], "default": "INTERACTIVE"},
},
"api_resource_configs": {
"label": "API Resource Configs",
"schema": {"type": ["string", "null"]},
},
"labels": {"label": "Labels", "schema": {"type": ["string", "null"]}},
},
},
{
"hook-class-name": "airflow.providers.google.cloud.hooks.compute_ssh.ComputeEngineSSHHook",
Expand All @@ -1461,6 +1524,18 @@ def get_provider_info():
"relabeling": {},
"placeholders": {"password": "Leave blank (optional)"},
},
"conn-fields": {
"developer_token": {"label": "Developer token", "schema": {"type": ["string", "null"]}},
"client_id": {"label": "OAuth2 Client ID", "schema": {"type": ["string", "null"]}},
"client_secret": {
"label": "OAuth2 Client Secret",
"schema": {"type": ["string", "null"], "format": "password"},
},
"refresh_token": {
"label": "OAuth2 Refresh Token",
"schema": {"type": ["string", "null"], "format": "password"},
},
},
},
{
"hook-class-name": "airflow.providers.google.cloud.hooks.looker.LookerHook",
Expand Down
Loading
Loading