add gcr/gcp docker helper (#646)

* add gcr/gcp docker helper

* Update environment/setup.sh

Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com>

* Update golden files, cleanup whitespace.

Co-authored-by: Helio Machado <0x2b3bfa0+git@googlemail.com>
Co-authored-by: Domas Monkus <domas@monkus.lt>

Author: 3 people

environment/setup.sh

@@ -7,7 +7,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume
 
 sudo apt remove unattended-upgrades
 systemctl disable apt-daily-upgrade.service
-  
+
 FILE=/var/log/cml_stack.log
 if [ ! -f "$FILE" ]; then
   sudo add-apt-repository universe -y
@@ -21,6 +21,9 @@ if [ ! -f "$FILE" ]; then
   sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login
   sudo chmod a+x /usr/bin/docker-credential-ecr-login
 
+  curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr
+  sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr
+
   curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
   sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
   sudo apt update && sudo apt-get install -y terraform

iterative/testdata/script_template_cloud_aws.golden

@@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume
 
 sudo apt remove unattended-upgrades
 systemctl disable apt-daily-upgrade.service
-  
+
 FILE=/var/log/cml_stack.log
 if [ ! -f "$FILE" ]; then
   sudo add-apt-repository universe -y
@@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then
   sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login
   sudo chmod a+x /usr/bin/docker-credential-ecr-login
 
+  curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr
+  sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr
+
   curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
   sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
   sudo apt update && sudo apt-get install -y terraform

iterative/testdata/script_template_cloud_azure.golden

@@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume
 
 sudo apt remove unattended-upgrades
 systemctl disable apt-daily-upgrade.service
-  
+
 FILE=/var/log/cml_stack.log
 if [ ! -f "$FILE" ]; then
   sudo add-apt-repository universe -y
@@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then
   sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login
   sudo chmod a+x /usr/bin/docker-credential-ecr-login
 
+  curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr
+  sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr
+
   curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
   sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
   sudo apt update && sudo apt-get install -y terraform

iterative/testdata/script_template_cloud_gcp.golden

@@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume
 
 sudo apt remove unattended-upgrades
 systemctl disable apt-daily-upgrade.service
-  
+
 FILE=/var/log/cml_stack.log
 if [ ! -f "$FILE" ]; then
   sudo add-apt-repository universe -y
@@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then
   sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login
   sudo chmod a+x /usr/bin/docker-credential-ecr-login
 
+  curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr
+  sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr
+
   curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
   sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
   sudo apt update && sudo apt-get install -y terraform

iterative/testdata/script_template_cloud_invalid.golden

@@ -8,7 +8,7 @@ echo "APT::Get::Assume-Yes \"true\";" | sudo tee -a /etc/apt/apt.conf.d/90assume
 
 sudo apt remove unattended-upgrades
 systemctl disable apt-daily-upgrade.service
-  
+
 FILE=/var/log/cml_stack.log
 if [ ! -f "$FILE" ]; then
   sudo add-apt-repository universe -y
@@ -22,6 +22,9 @@ if [ ! -f "$FILE" ]; then
   sudo curl --max-time 10 --output /usr/bin/docker-credential-ecr-login https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.5.0/linux-amd64/docker-credential-ecr-login
   sudo chmod a+x /usr/bin/docker-credential-ecr-login
 
+  curl --max-time 10 --location https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.1.5/docker-credential-gcr_linux_amd64-2.1.5.tar.gz | sudo tar xz docker-credential-gcr
+  sudo mv docker-credential-gcr /usr/bin/docker-credential-gcr
+
   curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
   sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
   sudo apt update && sudo apt-get install -y terraform