Skip to content

Commit 8209c28

Browse files
authored
feat: Add support for dbt_integration_id also (#53)
1 parent 249d093 commit 8209c28

File tree

1 file changed

+19
-13
lines changed
  • src/datapilot/core/platforms/dbt/cli

1 file changed

+19
-13
lines changed

src/datapilot/core/platforms/dbt/cli/cli.py

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,18 +132,29 @@ def project_health(
132132

133133
@dbt.command("onboard")
134134
@auth_options
135-
@click.option("--dbt_core_integration_id", prompt="DBT Core Integration ID", help="DBT Core Integration ID")
136135
@click.option(
137-
"--dbt_core_integration_environment", default="PROD", prompt="DBT Core Integration Environment", help="DBT Core Integration Environment"
136+
"--dbt_core_integration_id",
137+
"--dbt_integration_id",
138+
"dbt_integration_id", # This is the parameter name that will be passed to the function
139+
prompt="DBT Integration ID",
140+
help="DBT Core Integration ID or DBT Integration ID",
141+
)
142+
@click.option(
143+
"--dbt_core_integration_environment",
144+
"--dbt_integration_environment",
145+
"dbt_integration_environment", # This is the parameter name that will be passed to the function
146+
default="PROD",
147+
prompt="DBT Integration Environment",
148+
help="DBT Core Integration Environment or DBT Integration Environment",
138149
)
139150
@click.option("--manifest-path", required=True, prompt="Manifest Path", help="Path to the manifest file.")
140151
@click.option("--catalog-path", required=False, prompt=False, help="Path to the catalog file.")
141152
def onboard(
142153
token,
143154
instance_name,
144155
backend_url,
145-
dbt_core_integration_id,
146-
dbt_core_integration_environment,
156+
dbt_integration_id,
157+
dbt_integration_environment,
147158
manifest_path,
148159
catalog_path,
149160
):
@@ -165,16 +176,13 @@ def onboard(
165176
click.echo("Error: You don't have permission to perform this action.")
166177
return
167178

168-
# This will throw error if manifest file is incorrect
169179
try:
170180
load_manifest(manifest_path)
171181
except Exception as e:
172182
click.echo(f"Error: {e}")
173183
return
174184

175-
response = onboard_file(
176-
token, instance_name, dbt_core_integration_id, dbt_core_integration_environment, "manifest", manifest_path, backend_url
177-
)
185+
response = onboard_file(token, instance_name, dbt_integration_id, dbt_integration_environment, "manifest", manifest_path, backend_url)
178186
if response["ok"]:
179187
click.echo("Manifest onboarded successfully!")
180188
else:
@@ -183,21 +191,19 @@ def onboard(
183191
if not catalog_path:
184192
return
185193

186-
response = onboard_file(
187-
token, instance_name, dbt_core_integration_id, dbt_core_integration_environment, "catalog", catalog_path, backend_url
188-
)
194+
response = onboard_file(token, instance_name, dbt_integration_id, dbt_integration_environment, "catalog", catalog_path, backend_url)
189195
if response["ok"]:
190196
click.echo("Catalog onboarded successfully!")
191197
else:
192198
click.echo(f"{response['message']}")
193199

194-
response = start_dbt_ingestion(token, instance_name, dbt_core_integration_id, dbt_core_integration_environment, backend_url)
200+
response = start_dbt_ingestion(token, instance_name, dbt_integration_id, dbt_integration_environment, backend_url)
195201
if response["ok"]:
196202
url = map_url_to_instance(backend_url, instance_name)
197203
if not url:
198204
click.echo("Manifest and catalog ingestion has started.")
199205
else:
200-
url = f"{url}/settings/integrations/{dbt_core_integration_id}/{dbt_core_integration_environment}"
206+
url = f"{url}/settings/integrations/{dbt_integration_id}/{dbt_integration_environment}"
201207
click.echo(f"Manifest and catalog ingestion has started. You can check the status at {url}")
202208
else:
203209
click.echo(f"{response['message']}")

0 commit comments

Comments
 (0)