feat!: decouple from gcp cli

.circleci/test-deploy.yml

@@ -1,6 +1,7 @@
 version: 2.1
 orbs:
  gcp-gcr: circleci/gcp-gcr@dev:<<pipeline.git.revision>>
+ gcp-cli: circleci/[email protected]
  orb-tools: circleci/[email protected]
 filters: &filters
  tags:
@@ -11,6 +12,8 @@ jobs:
  steps:
  # test orb commands
  - checkout
+ - gcp-cli/install
+ - gcp-cli/initialize
  - gcp-gcr/gcr-auth
  - gcp-gcr/build-image:
  registry-url: us.gcr.io
@@ -43,6 +46,9 @@ workflows:
  filters: *filters
  requires:
  - integration-test
+ pre-steps:
+ - gcp-cli/install
+ - gcp-cli/initialize
  post-steps:
  - run:
  command: |

src/@orb.yml

@@ -9,4 +9,3 @@ display:
 
 orbs:
  docker: circleci/[email protected]
- gcp-cli: circleci/[email protected]

src/commands/gcr-auth.yml

@@ -2,30 +2,13 @@ description: >
  Configure Docker to use gcloud as a credential helper. Using this command requires the use of a 'machine' executor.
 
 parameters:
- gcloud-service-key:
- type: env_var_name
- default: GCLOUD_SERVICE_KEY
- description: The gcloud service key
-
  google-project-id:
  type: env_var_name
  default: GOOGLE_PROJECT_ID
  description: >
  Environment variable name for the Google project ID to connect with
  via the gcloud CLI
 
- google-compute-zone:
- type: env_var_name
- default: GOOGLE_COMPUTE_ZONE
- description: >
- The Google compute zone to connect with via the gcloud CLI
-
- google-compute-region:
- type: env_var_name
- default: GOOGLE_COMPUTE_REGION
- description: >
- The Google compute region to connect with via the gcloud CLI
-
  registry-url:
  description: >
  The GCR registry URL from ['', us, eu, asia].gcr.io,
@@ -34,14 +17,6 @@ parameters:
  default: gcr.io
 
 steps:
- - gcp-cli/install
-
- - gcp-cli/initialize:
- google-project-id: <<parameters.google-project-id>>
- google-compute-zone: <<parameters.google-compute-zone>>
- google-compute-region: <<parameters.google-compute-region>>
- gcloud-service-key: <<parameters.gcloud-service-key>>
-
  - run:
  name: gcloud auth configure-docker
  environment:

src/examples/build-and-push-digest.yml

@@ -5,13 +5,17 @@ usage:
  version: 2.1
 
  orbs:
+ gcp-cli: circleci/[email protected]
  gcp-gcr: circleci/[email protected]
 
  jobs:
  build-and-push:
  executor: gcp-gcr/default
  steps:
  - checkout
+
+ - gcp-cli/setup
+
  - gcp-gcr/gcr-auth
  - gcp-gcr/build-image:
  image: orb-test

src/examples/optimized-build-and-push.yml

@@ -24,3 +24,5 @@ usage:
  executor: my-executor # choose an image with gcloud already installed
  setup-remote-docker: true # mandatory for custom docker executor
  use-docker-layer-caching: true # optional, improved performance.
+ pre-steps:
+ - gcp-cli/setup

src/jobs/add-image-tag.yml

@@ -1,5 +1,5 @@
 description: >
- Install GCP CLI, if needed, and configure. Adds a tag to an existing image.
+ Adds a tag to an existing image.
 
 executor: <<parameters.executor>>
 
@@ -9,26 +9,11 @@ parameters:
  description: executor to use for this job
  type: executor
 
- gcloud-service-key:
- description: The gcloud service key
- type: env_var_name
- default: GCLOUD_SERVICE_KEY
-
  google-project-id:
  description: The Google project ID to connect with via the gcloud CLI
  type: env_var_name
  default: GOOGLE_PROJECT_ID
 
- google-compute-zone:
- description: The Google compute zone to connect with via the gcloud CLI
- type: env_var_name
- default: GOOGLE_COMPUTE_ZONE
-
- google-compute-region:
- description: The Google compute zone to connect with via the gcloud CLI
- type: env_var_name
- default: GOOGLE_COMPUTE_REGION
-
  registry-url:
  description: The GCR registry URL from ['', us, eu, asia].gcr.io
  type: string
@@ -47,12 +32,9 @@ parameters:
  description: A new Docker image tag
 
 steps:
-
  - gcr-auth:
+ registry-url: <<parameters.registry-url>>
  google-project-id: <<parameters.google-project-id>>
- google-compute-zone: <<parameters.google-compute-zone>>
- google-compute-region: <<parameters.google-compute-region>>
- gcloud-service-key: <<parameters.gcloud-service-key>>
 
  - tag-image:
  registry-url: <<parameters.registry-url>>

src/jobs/build-and-push-image.yml

@@ -1,5 +1,5 @@
 description: >
- Install GCP CLI, if needed, and configure. Build and push image to repository.
+ Build and push image to repository.
 
 executor: <<parameters.executor>>
 
@@ -9,21 +9,11 @@ parameters:
  description: executor to use for this job
  type: executor
 
- gcloud-service-key:
- description: The gcloud service key
- type: env_var_name
- default: GCLOUD_SERVICE_KEY
-
  google-project-id:
  description: The Google project ID to connect with via the gcloud CLI
  type: env_var_name
  default: GOOGLE_PROJECT_ID
 
- google-compute-zone:
- description: The Google compute zone to connect with via the gcloud CLI
- type: env_var_name
- default: GOOGLE_COMPUTE_ZONE
-
  google-compute-region:
  description: The Google compute zone to connect with via the gcloud CLI
  type: env_var_name
@@ -124,9 +114,6 @@ steps:
 
  - gcr-auth:
  google-project-id: <<parameters.google-project-id>>
- google-compute-zone: <<parameters.google-compute-zone>>
- google-compute-region: <<parameters.google-compute-region>>
- gcloud-service-key: <<parameters.gcloud-service-key>>
  registry-url: <<parameters.registry-url>>
 
  - build-image:

src/scripts/gcr-auth.sh

@@ -3,6 +3,39 @@
 # Set sudo to work whether logged in as root user or non-root user
 if [[ $EUID == 0 ]]; then export SUDO=""; else export SUDO="sudo"; fi
 
+
+# Check if the AWS CLI is installed
+if ! command -v gcloud &>/dev/null; then
+ echo "GCP CLI could not be found. Please install it before initiating the GCP CLI.
+
+Use the circleci/gcp-cli orb to install the GCP CLI.
+https://circleci.com/developer/orbs/orb/circleci/gcp-gcr#usage-examples
+
+Job example:
+
+jobs:
+ build_app:
+ executor: gcp-gcr/default
+ steps:
+ - checkout
+
+ - gcp-cli/setup
+
+ - gcp-gcr/gcr-auth
+
+
+Workflow example:
+
+workflows:
+ test_and_deploy:
+ jobs:
+ - gcp-gcr/add-image-tag:
+ pre-steps:
+ - gcp-cli/setup
+"
+ exit 1
+fi
+
 # configure Docker to use gcloud as a credential helper
 mkdir -p "$HOME/.docker"