From bc7313854d8e3e32c73715804f9e0e4b7db2cdb3 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Thu, 22 Aug 2024 15:40:29 -0700 Subject: [PATCH 1/3] Remove an f-string usage for backward compatibility --- plugins/modules/gcp_secret_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/gcp_secret_manager.py b/plugins/modules/gcp_secret_manager.py index 91b186df9..a02a402dc 100644 --- a/plugins/modules/gcp_secret_manager.py +++ b/plugins/modules/gcp_secret_manager.py @@ -443,7 +443,7 @@ def main(): fetch.pop('value') fetch.pop('payload') if "msg" in fetch: - fetch['msg'] = f"{fetch['msg']} | not returning secret value since 'return_value is set to false" + fetch['msg'] = "{} | not returning secret value since 'return_value is set to false".format(fetch['msg']) else: fetch['msg'] = "not returning secret value since 'return_value is set to false" From 83e84e80d56312306a77c9f45c13dd23585a127b Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Thu, 22 Aug 2024 16:04:26 -0700 Subject: [PATCH 2/3] Add a basic DOCUMENTATION string for gcp_kms_filters.py --- plugins/filter/gcp_kms_filters.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/filter/gcp_kms_filters.py b/plugins/filter/gcp_kms_filters.py index 44ae8d0ac..4a08c1af3 100644 --- a/plugins/filter/gcp_kms_filters.py +++ b/plugins/filter/gcp_kms_filters.py @@ -13,6 +13,15 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type +DOCUMENTATION = ''' + author: + - Eric Anderson + name: gcp_kms_filters + short_description: Support auth tokens as a Filter plugin + description: + - Enables the 'accesstoken' authentication choice. +''' + from ansible.errors import AnsibleError from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import GcpSession From ff3e2a2d430747cc47f32df62ced67c8eb68ca6c Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Thu, 22 Aug 2024 16:32:54 -0700 Subject: [PATCH 3/3] Prepare for 1.4.1 release --- CHANGELOG.rst | 9 +++++++++ changelogs/changelog.yaml | 8 ++++++++ galaxy.yml | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9a5c3cecc..7e76c68af 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,15 @@ Google.Cloud Release Notes .. contents:: Topics +v1.4.1 +====== + +Bugfixes +-------- + +- gcp_kms_filters - add DOCUMENTATION string +- gcp_secret_manager - make an f-string usage backward compatible + v1.4.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index fbd9264c4..738da7bcc 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -92,3 +92,11 @@ releases: fragments: - release-1-4-0.yml release_date: '2024-08-21' + 1.4.1: + changes: + bugfixes: + - gcp_kms_filters - add DOCUMENTATION string + - gcp_secret_manager - make an f-string usage backward compatible + fragments: + - release-1-4-1.yml + release_date: '2024-08-22' diff --git a/galaxy.yml b/galaxy.yml index 5c8bc1703..abd99cb4f 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.4.0 +version: 1.4.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md @@ -61,3 +61,6 @@ homepage: http://cloud.google.com # The URL to the collection issue tracker issues: https://github.com/ansible-collections/google.cloud/issues + +build_ignore: + - venv