From ab411b4f30ea4517da1ce152032eabb2f556436c Mon Sep 17 00:00:00 2001 From: travis-architect <72377796+travis-architect@users.noreply.github.com> Date: Tue, 11 Jan 2022 09:58:53 +0500 Subject: [PATCH] Revert "Fixing Python installation, Google Cloud SDK" --- lib/dpl/providers/gcs.rb | 2 +- spec/dpl/providers/gcs_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dpl/providers/gcs.rb b/lib/dpl/providers/gcs.rb index 79337dab3..45764c558 100644 --- a/lib/dpl/providers/gcs.rb +++ b/lib/dpl/providers/gcs.rb @@ -33,7 +33,7 @@ class Gcs < Provider opt '--cache_control HEADER', 'HTTP header Cache-Control to suggest that the browser cache the file.', see: 'https://cloud.google.com/storage/docs/xml-api/reference-headers#cachecontrol' opt '--glob GLOB', default: '**/*' - cmds install: 'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false', + cmds install: 'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false', login_key: 'gcloud auth activate-service-account --key-file=%{key_file}', rsync: 'gsutil %{gs_opts} rsync %{rsync_opts} %{glob} %{target}', copy: 'gsutil %{gs_opts} cp %{copy_opts} -r %{source} %{target}' diff --git a/spec/dpl/providers/gcs_spec.rb b/spec/dpl/providers/gcs_spec.rb index eeb5470e4..c29084506 100644 --- a/spec/dpl/providers/gcs_spec.rb +++ b/spec/dpl/providers/gcs_spec.rb @@ -12,8 +12,8 @@ describe 'by default', record: true do it { should have_run 'mv /etc/boto.cfg /tmp/boto.cfg' } it { should have_run '[validate:runtime] python (>= 2.7.9)' } - it { should have_run '[info] $ curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false' } - it { should have_run 'curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false' } + it { should have_run '[info] $ curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false' } + it { should have_run 'curl -L https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false' } it { should have_run '[info] Authenticating with service account key file key.json' } it { should have_run '[info] $ gcloud auth activate-service-account --key-file=key.json' } it { should have_run 'gsutil cp -a "private" -r one gs://bucket/one' }