Skip to content

Commit

Permalink
Merge pull request #648 from ansible-collections/remove-f-string
Browse files Browse the repository at this point in the history
Prepare a v1.4.1 release
  • Loading branch information
SirGitsalot authored Aug 22, 2024
2 parents 7b55b22 + ff3e2a2 commit 56199b7
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 2 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
======

Expand Down
8 changes: 8 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
5 changes: 4 additions & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
9 changes: 9 additions & 0 deletions plugins/filter/gcp_kms_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type

DOCUMENTATION = '''
author:
- Eric Anderson <[email protected]>
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

Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/gcp_secret_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 56199b7

Please sign in to comment.