From 6867ae1b1255c6bcc6d628924256011de961fc61 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 20 Jun 2025 13:57:08 -0700 Subject: [PATCH 1/5] Add changelog fragments --- .../fragments/685-support-for-regional-secret-manager.yaml | 3 +++ .../686-add-discard_local_ssd-flag-to-compute-instance.yaml | 3 +++ changelogs/fragments/688-add-gvnic-support.yaml | 3 +++ .../fragments/689-hostname-support-for-dynamic-inventory.yaml | 3 +++ ...lear-up-error-responses-from-gcp_secret_manager-lookup.yaml | 3 +++ ...691-updated-documentation-for-gcp_serviceusage_service.yaml | 3 +++ 6 files changed, 18 insertions(+) create mode 100644 changelogs/fragments/685-support-for-regional-secret-manager.yaml create mode 100644 changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml create mode 100644 changelogs/fragments/688-add-gvnic-support.yaml create mode 100644 changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml create mode 100644 changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml create mode 100644 changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml diff --git a/changelogs/fragments/685-support-for-regional-secret-manager.yaml b/changelogs/fragments/685-support-for-regional-secret-manager.yaml new file mode 100644 index 00000000..1603c4f4 --- /dev/null +++ b/changelogs/fragments/685-support-for-regional-secret-manager.yaml @@ -0,0 +1,3 @@ +minor_changes: + - gcp_secret_manager - added support for regional secret manager + (https://github.com/ansible-collections/google.cloud/pull/685). \ No newline at end of file diff --git a/changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml b/changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml new file mode 100644 index 00000000..34905e55 --- /dev/null +++ b/changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml @@ -0,0 +1,3 @@ +minor_changes: + - gcp_compute - added ``discard_local_ssd`` flag to compute instance + (https://github.com/ansible-collections/google.cloud/pull/686). \ No newline at end of file diff --git a/changelogs/fragments/688-add-gvnic-support.yaml b/changelogs/fragments/688-add-gvnic-support.yaml new file mode 100644 index 00000000..c17f3248 --- /dev/null +++ b/changelogs/fragments/688-add-gvnic-support.yaml @@ -0,0 +1,3 @@ +minor_changes: + - gcp_compute - added GVNIC support to compute instance + (https://github.com/ansible-collections/google.cloud/pull/688). \ No newline at end of file diff --git a/changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml b/changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml new file mode 100644 index 00000000..faa096f5 --- /dev/null +++ b/changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml @@ -0,0 +1,3 @@ +minor_changes: + - gcp_compute - added hostname support to dynamic inventory + (https://github.com/ansible-collections/google.cloud/pull/689). \ No newline at end of file diff --git a/changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml b/changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml new file mode 100644 index 00000000..bd1cffeb --- /dev/null +++ b/changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml @@ -0,0 +1,3 @@ +bugfixes: + - gcp_secret_manager - cleaned up error responses + (https://github.com/ansible-collections/google.cloud/pull/690). \ No newline at end of file diff --git a/changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml b/changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml new file mode 100644 index 00000000..d42a299d --- /dev/null +++ b/changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml @@ -0,0 +1,3 @@ +bugfixes: + - gcp_serviceusage_service - updated documentation + (https://github.com/ansible-collections/google.cloud/pull/691). \ No newline at end of file From b485570c2d7248a672db9ac6e09b77004762a090 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 20 Jun 2025 14:00:52 -0700 Subject: [PATCH 2/5] Update version to 1.6.0 --- galaxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy.yml b/galaxy.yml index fd0d4fb5..ecc5be87 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -10,7 +10,7 @@ namespace: google name: cloud # The version of the collection. Must be compatible with semantic versioning -version: 1.5.3 +version: 1.6.0 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md From 50ed75fe9c0718821c25c713eef778b27bdd0f58 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 20 Jun 2025 14:02:13 -0700 Subject: [PATCH 3/5] Build changelog --- CHANGELOG.rst | 17 +++++++++++++++++ changelogs/changelog.yaml | 18 ++++++++++++++++++ ...85-support-for-regional-secret-manager.yaml | 3 --- ...ard_local_ssd-flag-to-compute-instance.yaml | 3 --- .../fragments/688-add-gvnic-support.yaml | 3 --- ...hostname-support-for-dynamic-inventory.yaml | 3 --- ...sponses-from-gcp_secret_manager-lookup.yaml | 3 --- ...mentation-for-gcp_serviceusage_service.yaml | 3 --- 8 files changed, 35 insertions(+), 18 deletions(-) delete mode 100644 changelogs/fragments/685-support-for-regional-secret-manager.yaml delete mode 100644 changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml delete mode 100644 changelogs/fragments/688-add-gvnic-support.yaml delete mode 100644 changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml delete mode 100644 changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml delete mode 100644 changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5dcfaf4a..fdb4c8fd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,23 @@ Google.Cloud Release Notes .. contents:: Topics +v1.6.0 +====== + +Minor Changes +------------- + +- gcp_compute - added GVNIC support to compute instance (https://github.com/ansible-collections/google.cloud/pull/688). +- gcp_compute - added ``discard_local_ssd`` flag to compute instance (https://github.com/ansible-collections/google.cloud/pull/686). +- gcp_compute - added hostname support to dynamic inventory (https://github.com/ansible-collections/google.cloud/pull/689). +- gcp_secret_manager - added support for regional secret manager (https://github.com/ansible-collections/google.cloud/pull/685). + +Bugfixes +-------- + +- gcp_secret_manager - cleaned up error responses (https://github.com/ansible-collections/google.cloud/pull/690). +- gcp_serviceusage_service - updated documentation (https://github.com/ansible-collections/google.cloud/pull/691). + v1.5.3 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index c93d52a5..3e8b9ad8 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -142,3 +142,21 @@ releases: fragments: - 682-update-readme.yaml release_date: '2025-04-30' + 1.6.0: + changes: + bugfixes: + - gcp_secret_manager - cleaned up error responses (https://github.com/ansible-collections/google.cloud/pull/690). + - gcp_serviceusage_service - updated documentation (https://github.com/ansible-collections/google.cloud/pull/691). + minor_changes: + - gcp_compute - added GVNIC support to compute instance (https://github.com/ansible-collections/google.cloud/pull/688). + - gcp_compute - added ``discard_local_ssd`` flag to compute instance (https://github.com/ansible-collections/google.cloud/pull/686). + - gcp_compute - added hostname support to dynamic inventory (https://github.com/ansible-collections/google.cloud/pull/689). + - gcp_secret_manager - added support for regional secret manager (https://github.com/ansible-collections/google.cloud/pull/685). + fragments: + - 685-support-for-regional-secret-manager.yaml + - 686-add-discard_local_ssd-flag-to-compute-instance.yaml + - 688-add-gvnic-support.yaml + - 689-hostname-support-for-dynamic-inventory.yaml + - 690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml + - 691-updated-documentation-for-gcp_serviceusage_service.yaml + release_date: '2025-06-20' diff --git a/changelogs/fragments/685-support-for-regional-secret-manager.yaml b/changelogs/fragments/685-support-for-regional-secret-manager.yaml deleted file mode 100644 index 1603c4f4..00000000 --- a/changelogs/fragments/685-support-for-regional-secret-manager.yaml +++ /dev/null @@ -1,3 +0,0 @@ -minor_changes: - - gcp_secret_manager - added support for regional secret manager - (https://github.com/ansible-collections/google.cloud/pull/685). \ No newline at end of file diff --git a/changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml b/changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml deleted file mode 100644 index 34905e55..00000000 --- a/changelogs/fragments/686-add-discard_local_ssd-flag-to-compute-instance.yaml +++ /dev/null @@ -1,3 +0,0 @@ -minor_changes: - - gcp_compute - added ``discard_local_ssd`` flag to compute instance - (https://github.com/ansible-collections/google.cloud/pull/686). \ No newline at end of file diff --git a/changelogs/fragments/688-add-gvnic-support.yaml b/changelogs/fragments/688-add-gvnic-support.yaml deleted file mode 100644 index c17f3248..00000000 --- a/changelogs/fragments/688-add-gvnic-support.yaml +++ /dev/null @@ -1,3 +0,0 @@ -minor_changes: - - gcp_compute - added GVNIC support to compute instance - (https://github.com/ansible-collections/google.cloud/pull/688). \ No newline at end of file diff --git a/changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml b/changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml deleted file mode 100644 index faa096f5..00000000 --- a/changelogs/fragments/689-hostname-support-for-dynamic-inventory.yaml +++ /dev/null @@ -1,3 +0,0 @@ -minor_changes: - - gcp_compute - added hostname support to dynamic inventory - (https://github.com/ansible-collections/google.cloud/pull/689). \ No newline at end of file diff --git a/changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml b/changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml deleted file mode 100644 index bd1cffeb..00000000 --- a/changelogs/fragments/690-clear-up-error-responses-from-gcp_secret_manager-lookup.yaml +++ /dev/null @@ -1,3 +0,0 @@ -bugfixes: - - gcp_secret_manager - cleaned up error responses - (https://github.com/ansible-collections/google.cloud/pull/690). \ No newline at end of file diff --git a/changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml b/changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml deleted file mode 100644 index d42a299d..00000000 --- a/changelogs/fragments/691-updated-documentation-for-gcp_serviceusage_service.yaml +++ /dev/null @@ -1,3 +0,0 @@ -bugfixes: - - gcp_serviceusage_service - updated documentation - (https://github.com/ansible-collections/google.cloud/pull/691). \ No newline at end of file From 9bdfba5e5c1bb7b3be8cf9aceb1005b9ffdb805b Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 20 Jun 2025 14:44:45 -0700 Subject: [PATCH 4/5] Fix lint errors --- .../integration/targets/gcp_compute_instance/tasks/gvnic.yml | 3 ++- tests/integration/targets/inventory_gce/playbooks/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/integration/targets/gcp_compute_instance/tasks/gvnic.yml b/tests/integration/targets/gcp_compute_instance/tasks/gvnic.yml index ad2338fe..bc5db37c 100644 --- a/tests/integration/targets/gcp_compute_instance/tasks/gvnic.yml +++ b/tests/integration/targets/gcp_compute_instance/tasks/gvnic.yml @@ -3,7 +3,8 @@ ansible.builtin.debug: msg: "Testing {{ item.key }} scenario" -- block: +- name: Test GVNIC scenarios + block: - name: Create disk google.cloud.gcp_compute_disk: name: "{{ resource_prefix }}-{{ item.key }}" diff --git a/tests/integration/targets/inventory_gce/playbooks/test.yml b/tests/integration/targets/inventory_gce/playbooks/test.yml index da119970..aaa539af 100644 --- a/tests/integration/targets/inventory_gce/playbooks/test.yml +++ b/tests/integration/targets/inventory_gce/playbooks/test.yml @@ -12,12 +12,12 @@ content: "{{ lookup('template', '../templates/inventory.yml.j2') }}" mode: preserve - - name: slurp + - name: TEST | slurp ansible.builtin.slurp: src: "../{{ inventory_filename }}" register: _inv - - name: debug + - name: TEST | debug ansible.builtin.debug: msg: "{{ _inv.content | b64decode }}" verbosity: 3 From 5cd81072c43de657ea5f6b3bc4054eb012ff1a95 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 20 Jun 2025 15:28:16 -0700 Subject: [PATCH 5/5] Refactor inventory_gce tests to make the linter happy --- tests/integration/targets/inventory_gce/playbooks/setup.yml | 2 +- .../integration/targets/inventory_gce/playbooks/teardown.yml | 2 +- tests/integration/targets/inventory_gce/playbooks/test.yml | 4 ++-- tests/integration/targets/inventory_gce/runme.sh | 2 +- .../targets/inventory_gce/{playbooks => }/testcase_basic.yml | 0 .../inventory_gce/{playbooks => }/testcase_hostname.yml | 0 .../targets/inventory_gce/{playbooks => }/vars.yml | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename tests/integration/targets/inventory_gce/{playbooks => }/testcase_basic.yml (100%) rename tests/integration/targets/inventory_gce/{playbooks => }/testcase_hostname.yml (100%) rename tests/integration/targets/inventory_gce/{playbooks => }/vars.yml (100%) diff --git a/tests/integration/targets/inventory_gce/playbooks/setup.yml b/tests/integration/targets/inventory_gce/playbooks/setup.yml index d26ce149..78fbf3cd 100644 --- a/tests/integration/targets/inventory_gce/playbooks/setup.yml +++ b/tests/integration/targets/inventory_gce/playbooks/setup.yml @@ -4,7 +4,7 @@ connection: local gather_facts: false vars_files: - - vars.yml + - ../vars.yml tasks: - name: SETUP | Create network google.cloud.gcp_compute_network: diff --git a/tests/integration/targets/inventory_gce/playbooks/teardown.yml b/tests/integration/targets/inventory_gce/playbooks/teardown.yml index b4e48041..44cf14c4 100644 --- a/tests/integration/targets/inventory_gce/playbooks/teardown.yml +++ b/tests/integration/targets/inventory_gce/playbooks/teardown.yml @@ -4,7 +4,7 @@ connection: local gather_facts: false vars_files: - - vars.yml + - ../vars.yml tasks: - name: TEARDOWN | Delete instance # noqa: ignore-errors google.cloud.gcp_compute_instance: diff --git a/tests/integration/targets/inventory_gce/playbooks/test.yml b/tests/integration/targets/inventory_gce/playbooks/test.yml index aaa539af..25feba39 100644 --- a/tests/integration/targets/inventory_gce/playbooks/test.yml +++ b/tests/integration/targets/inventory_gce/playbooks/test.yml @@ -4,7 +4,7 @@ connection: local gather_facts: false vars_files: - - vars.yml + - ../vars.yml tasks: - name: TEST | render inventory file ansible.builtin.copy: @@ -27,4 +27,4 @@ - name: TEST | run test case ansible.builtin.include_tasks: - file: "testcase_{{ testcase }}.yml" + file: "../testcase_{{ testcase }}.yml" diff --git a/tests/integration/targets/inventory_gce/runme.sh b/tests/integration/targets/inventory_gce/runme.sh index 4b56a3a1..175dab85 100755 --- a/tests/integration/targets/inventory_gce/runme.sh +++ b/tests/integration/targets/inventory_gce/runme.sh @@ -11,7 +11,7 @@ RC=0 # we want to run teardown regardless of playbook exit status, so catch the # exit code of ansible-playbook manually set +e -for ts in playbooks/testcase_*.yml; +for ts in testcase_*.yml; do testcase=$( basename "$ts" | sed -e 's/testcase_//' | sed -e 's/.yml//' ) ansible-playbook playbooks/test.yml "$@" --extra-vars "testcase=${testcase}" diff --git a/tests/integration/targets/inventory_gce/playbooks/testcase_basic.yml b/tests/integration/targets/inventory_gce/testcase_basic.yml similarity index 100% rename from tests/integration/targets/inventory_gce/playbooks/testcase_basic.yml rename to tests/integration/targets/inventory_gce/testcase_basic.yml diff --git a/tests/integration/targets/inventory_gce/playbooks/testcase_hostname.yml b/tests/integration/targets/inventory_gce/testcase_hostname.yml similarity index 100% rename from tests/integration/targets/inventory_gce/playbooks/testcase_hostname.yml rename to tests/integration/targets/inventory_gce/testcase_hostname.yml diff --git a/tests/integration/targets/inventory_gce/playbooks/vars.yml b/tests/integration/targets/inventory_gce/vars.yml similarity index 100% rename from tests/integration/targets/inventory_gce/playbooks/vars.yml rename to tests/integration/targets/inventory_gce/vars.yml