From b1a75cf3833d0f4fada040730d261965b096890d Mon Sep 17 00:00:00 2001
From: Chris Hawk <hawk@google.com>
Date: Fri, 10 Jan 2025 15:58:54 -0800
Subject: [PATCH] Install google-cloud-cli instead of google-cloud-sdk

---
 roles/gcloud/meta/main.yml            |  3 +++
 roles/gcloud/tasks/package/debian.yml | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/roles/gcloud/meta/main.yml b/roles/gcloud/meta/main.yml
index 049ed0e..2567187 100644
--- a/roles/gcloud/meta/main.yml
+++ b/roles/gcloud/meta/main.yml
@@ -8,6 +8,9 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
+        - focal
+        - jammy
+        - noble
         - precise
         - trusty
         - xenial
diff --git a/roles/gcloud/tasks/package/debian.yml b/roles/gcloud/tasks/package/debian.yml
index 726c79e..7fc5867 100644
--- a/roles/gcloud/tasks/package/debian.yml
+++ b/roles/gcloud/tasks/package/debian.yml
@@ -9,20 +9,20 @@
   ansible.builtin.apt_repository:
     repo: deb {{ gcloud_apt_url }} {{ gcloud_apt_repo }} main
     state: present
-    filename: google-cloud-sdk
+    filename: google-cloud-cli
 
-- name: Gcloud | Debian | Install the google-cloud-sdk package
+- name: Gcloud | Debian | Install the google-cloud-cli package
   ansible.builtin.apt:
-    name: google-cloud-sdk
+    name: google-cloud-cli
     update_cache: "yes"
   register: task_result
   until: task_result is success
   retries: 10
   delay: 2
 
-- name: Gcloud | Debian | Install the google-cloud-sdk additional components
+- name: Gcloud | Debian | Install the google-cloud-cli additional components
   ansible.builtin.apt:
-    name: google-cloud-sdk-{{ item }}
+    name: google-cloud-cli-{{ item }}
     update_cache: "yes"
   register: task_result
   until: task_result is success