From b3e030e9001f7c4c8d3c4520f21c88f12fde69cf Mon Sep 17 00:00:00 2001 From: Jonathan Lui Date: Thu, 6 Sep 2018 11:02:50 -0700 Subject: [PATCH] run synth.py to fix system-test (#117) * remove unused kwargs from synth.py * run synth.py --- packages/google-cloud-monitoring/.circleci/config.yml | 11 +++++++---- packages/google-cloud-monitoring/synth.py | 11 ++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/google-cloud-monitoring/.circleci/config.yml b/packages/google-cloud-monitoring/.circleci/config.yml index 80dcf7e67d9..8af6a4d0489 100644 --- a/packages/google-cloud-monitoring/.circleci/config.yml +++ b/packages/google-cloud-monitoring/.circleci/config.yml @@ -149,21 +149,24 @@ jobs: name: Decrypt credentials. command: | if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - openssl aes-256-cbc -d -in .circleci/key.json.enc \ - -out .circleci/key.json \ - -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + for encrypted_key in .circleci/*.json.enc; do + openssl aes-256-cbc -d -in $encrypted_key \ + -out $(echo $encrypted_key | sed 's/\.enc//') \ + -k "${SYSTEM_TESTS_ENCRYPTION_KEY}" + done fi - run: *npm_install_and_link - run: name: Run system tests. command: npm run system-test environment: + GCLOUD_PROJECT: long-door-651 GOOGLE_APPLICATION_CREDENTIALS: .circleci/key.json - run: name: Remove unencrypted key. command: | if ! [[ -z "${SYSTEM_TESTS_ENCRYPTION_KEY}" ]]; then - rm .circleci/key.json + rm .circleci/*.json fi when: always publish_npm: diff --git a/packages/google-cloud-monitoring/synth.py b/packages/google-cloud-monitoring/synth.py index aedbf40fad6..b0488cf9ad6 100644 --- a/packages/google-cloud-monitoring/synth.py +++ b/packages/google-cloud-monitoring/synth.py @@ -21,20 +21,17 @@ logging.basicConfig(level=logging.DEBUG) -gapic = gcp.GAPICGenerator() common_templates = gcp.CommonTemplates() version = "v3" -library = gapic.node_library("monitoring", version, - config_path="/google/monitoring/artman_monitoring.yaml") +library = gapic.node_library( + "monitoring", version, config_path="/google/monitoring/artman_monitoring.yaml" +) s.copy(library, excludes=["src/index.js", "README.md", "package.json"]) -templates = common_templates.node_library( - package_name="@google-cloud/monitoring", - repo_name="googleapis/nodejs-monitoring") - +templates = common_templates.node_library() s.copy(templates) """