From 69cbcf1203b44161daddb1d92a0d12cda7129693 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 3 Oct 2025 14:51:35 -0700 Subject: [PATCH 1/7] Add scp_if_ssh changelog fragment --- changelogs/fragments/716-iap-scp-if-ssh-option.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/716-iap-scp-if-ssh-option.yml diff --git a/changelogs/fragments/716-iap-scp-if-ssh-option.yml b/changelogs/fragments/716-iap-scp-if-ssh-option.yml new file mode 100644 index 00000000..76affd6f --- /dev/null +++ b/changelogs/fragments/716-iap-scp-if-ssh-option.yml @@ -0,0 +1,3 @@ +minor_changes: + - iap - added scp_if_ssh option + (https://github.com/ansible-collections/google.cloud/pull/716). From 064fcdce0e7efd2552cbdefe968a8f21a614f978 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 3 Oct 2025 14:57:38 -0700 Subject: [PATCH 2/7] Bump version and update changelog --- CHANGELOG.rst | 8 ++++++++ changelogs/changelog.yaml | 7 +++++++ changelogs/fragments/716-iap-scp-if-ssh-option.yml | 3 --- galaxy.yml | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 changelogs/fragments/716-iap-scp-if-ssh-option.yml diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 83e258ee..8570b5a1 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,14 @@ Google.Cloud Release Notes .. contents:: Topics +v1.9.0 +====== + +Minor Changes +------------- + +- iap - added scp_if_ssh option (https://github.com/ansible-collections/google.cloud/pull/716). + v1.8.0 ====== diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 0ff8d3ee..6eccbf05 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -189,3 +189,10 @@ releases: - 709-iap-connection-plugin.yml - 711-attach-disk-to-instance.yml release_date: '2025-09-11' + 1.9.0: + changes: + minor_changes: + - iap - added scp_if_ssh option (https://github.com/ansible-collections/google.cloud/pull/716). + fragments: + - 716-iap-scp-if-ssh-option.yml + release_date: '2025-10-03' diff --git a/changelogs/fragments/716-iap-scp-if-ssh-option.yml b/changelogs/fragments/716-iap-scp-if-ssh-option.yml deleted file mode 100644 index 76affd6f..00000000 --- a/changelogs/fragments/716-iap-scp-if-ssh-option.yml +++ /dev/null @@ -1,3 +0,0 @@ -minor_changes: - - iap - added scp_if_ssh option - (https://github.com/ansible-collections/google.cloud/pull/716). diff --git a/galaxy.yml b/galaxy.yml index 6c0688da..e699d2e0 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.8.0 +version: 1.9.0 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md From 1a3da701d875666c7bab573a40f8a72f1f190e7e Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 3 Oct 2025 15:07:24 -0700 Subject: [PATCH 3/7] Add a newline to plugins/connection/iap.py to make the linter happy --- plugins/connection/iap.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/connection/iap.py b/plugins/connection/iap.py index 1e22b4f2..5b09fc01 100644 --- a/plugins/connection/iap.py +++ b/plugins/connection/iap.py @@ -786,4 +786,5 @@ class Connection(sshconn.Connection): # remove ssh config os.unlink(self.ssh_config) - self._connected = False \ No newline at end of file + self._connected = False + From 510cf5fb088c07e33cf7f9ece25e4ed1b0a90456 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 3 Oct 2025 15:21:52 -0700 Subject: [PATCH 4/7] That should be one blank line, not two --- plugins/connection/iap.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/connection/iap.py b/plugins/connection/iap.py index 5b09fc01..a2dbe415 100644 --- a/plugins/connection/iap.py +++ b/plugins/connection/iap.py @@ -787,4 +787,3 @@ class Connection(sshconn.Connection): os.unlink(self.ssh_config) self._connected = False - From 51c1be228f15f8c744722ebf19ed63b95f6e4325 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 3 Oct 2025 16:09:22 -0700 Subject: [PATCH 5/7] Test out a theory about the failing integration test --- .github/workflows/ansible-integration-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ansible-integration-tests.yml b/.github/workflows/ansible-integration-tests.yml index dc96f6fd..7080060a 100644 --- a/.github/workflows/ansible-integration-tests.yml +++ b/.github/workflows/ansible-integration-tests.yml @@ -25,7 +25,6 @@ jobs: # and test against the minimum version of Python supported by both. If/when we change # the integration tests to support parallelism we can revisit. ansible_version: - - stable-2.16 - stable-2.17 - stable-2.18 - stable-2.19 From 1035213580daa6848fbd8a7122d448f6944d1a61 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 3 Oct 2025 16:15:26 -0700 Subject: [PATCH 6/7] Back out ci change, try installing community.crypto in runme.sh --- .github/workflows/ansible-integration-tests.yml | 1 + tests/integration/targets/connection_plugin/runme.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ansible-integration-tests.yml b/.github/workflows/ansible-integration-tests.yml index 7080060a..dc96f6fd 100644 --- a/.github/workflows/ansible-integration-tests.yml +++ b/.github/workflows/ansible-integration-tests.yml @@ -25,6 +25,7 @@ jobs: # and test against the minimum version of Python supported by both. If/when we change # the integration tests to support parallelism we can revisit. ansible_version: + - stable-2.16 - stable-2.17 - stable-2.18 - stable-2.19 diff --git a/tests/integration/targets/connection_plugin/runme.sh b/tests/integration/targets/connection_plugin/runme.sh index 678cb6a6..c6f9b553 100755 --- a/tests/integration/targets/connection_plugin/runme.sh +++ b/tests/integration/targets/connection_plugin/runme.sh @@ -2,6 +2,9 @@ set -eux +# prereq +ansible-galaxy collection install community.crypto + # test infra ansible-playbook playbooks/setup.yml "$@" From 8b092f167fc972e66e1f5cef0afc06909aa3c754 Mon Sep 17 00:00:00 2001 From: Chris Hawk Date: Fri, 3 Oct 2025 16:44:53 -0700 Subject: [PATCH 7/7] Back out runme.sh to change in a future PR --- tests/integration/targets/connection_plugin/runme.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/integration/targets/connection_plugin/runme.sh b/tests/integration/targets/connection_plugin/runme.sh index c6f9b553..678cb6a6 100755 --- a/tests/integration/targets/connection_plugin/runme.sh +++ b/tests/integration/targets/connection_plugin/runme.sh @@ -2,9 +2,6 @@ set -eux -# prereq -ansible-galaxy collection install community.crypto - # test infra ansible-playbook playbooks/setup.yml "$@"