Skip to content

Commit

Permalink
[email protected]: added output_path option for data.json
Browse files Browse the repository at this point in the history
gaarf-wf: gaarf CF does not initialize `output_path` option for BigQueryWriter by default if it wasn't passed (i.e. it will use /tmp for storing data)
gaarf-wf: CF's runtime updated to node v20 (formerly v18)

Change-Id: I5ded1a10abd0893a21348cae407c801c5c1d9862
  • Loading branch information
evil-shrike committed Aug 14, 2024
1 parent f84eeb0 commit a70f32e
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 12 deletions.
1 change: 1 addition & 0 deletions gcp/create-gaarf-wf/build/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gcp/create-gaarf-wf/build/index.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions gcp/create-gaarf-wf/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gcp/create-gaarf-wf/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-gaarf-wf",
"version": "1.11.2",
"version": "1.11.3",
"description": "Interactive generator for Gaarf (Google Ads API Report Fetcher) Workflow",
"type": "module",
"bin": {
Expand Down
1 change: 1 addition & 0 deletions gcp/create-gaarf-wf/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,7 @@ cd ..
dataset: output_dataset,
cid: customer_id,
ads_config_path: `${gcs_base_path}/google-ads.yaml`,
output_path: `${gcs_base_path}/tmp`,
customer_ids_query: custom_query_gcs_path,
bq_dataset_location: bq_location,
writer_options: writer_options,
Expand Down
2 changes: 1 addition & 1 deletion gcp/functions/build/src/gaarf.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gcp/functions/build/src/gaarf.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions gcp/functions/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function execute_deploy() {
gcloud functions deploy $deployable_function \
--trigger-http \
--entry-point=$entry_point \
--runtime=nodejs18 \
--runtime=nodejs20 \
--timeout=3600s \
--memory=$memory \
$REGION \
Expand Down Expand Up @@ -141,10 +141,6 @@ function redeploy_cf() {
fi
}

# NOTE:
#For GCF 1st gen functions, cannot be more than 540s.
#For GCF 2nd gen functions, cannot be more than 3600s.

redeploy_cf $FUNCTION_NAME main $MEMORY

redeploy_cf $FUNCTION_NAME-getcids main_getcids $MEMORY_GETCIDS
Expand Down
2 changes: 1 addition & 1 deletion gcp/functions/src/gaarf.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function getQueryWriter(req: express.Request, projectId: string) {
datasetLocation: <string>req.query.bq_dataset_location,
arrayHandling: body.writer_options?.array_handling,
arraySeparator: body.writer_options?.array_separator,
outputPath: <string>req.query.output_path || `gs://${projectId}/tmp`,
outputPath: <string>req.query.output_path,
noUnionView: true,
};
if (req.query.expand_mcc) {
Expand Down

0 comments on commit a70f32e

Please sign in to comment.