ssm connection plugin - Replace Fedora tests with CentOS 9 (#1793)

ssm connection plugin - Replace Fedora tests with CentOS 9 SUMMARY Applies black to the SSM connection plugin Fedora 34 AMIs aren't available for integration tests any more, move over to CentOS 9 because Fedora Images will keep going away. ISSUE TYPE Bugfix Pull Request COMPONENT NAME aws_ssm ADDITIONAL INFORMATION Reviewed-by: Alina Buzachis Reviewed-by: Markus Bergholz <[email protected]>
ansible-collections · Jan 3, 2024 · e5ea29e · e5ea29e
1 parent e5a41df
commit e5ea29e
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 20 deletions.
diff --git a/changelogs/fragments/ssm-fedora34.yml b/changelogs/fragments/ssm-fedora34.yml
@@ -0,0 +1,2 @@
+trivial:
+- ssm - bump test image from Fedora 34 to CentOS 9
diff --git a/plugins/connection/aws_ssm.py b/plugins/connection/aws_ssm.py
@@ -25,8 +25,9 @@
   - Files sent via S3 will be named in S3 with the EC2 host ID (e.g. C(i-123abc/)) as the prefix.
   - The files in S3 will be deleted by the end of the playbook run. If the play is terminated ungracefully, the files may remain in the bucket.
     If the bucket has versioning enabled, the files will remain in version history. If your tasks involve sending secrets to/from the remote instance
-    (e.g. within a C(shell) command, or a SQL password in the C(community.postgresql.postgresql_query) module) then those passwords will be included in plaintext in those files in S3 indefinitely,
-    visible to anyone with access to that bucket. Therefore it is recommended to use a bucket with versioning disabled/suspended.
+    (e.g. within a C(shell) command, or a SQL password in the C(community.postgresql.postgresql_query) module) then those passwords will be included in
+    plaintext in those files in S3 indefinitely, visible to anyone with access to that bucket. Therefore it is recommended to use a bucket with versioning
+    disabled/suspended.
   - The files in S3 will be deleted even if the C(keep_remote_files) setting is C(true).
 
 requirements:
@@ -144,7 +145,6 @@
 """
 
 EXAMPLES = r"""
-
 # Wait for SSM Agent to be available on the Instance
 - name: Wait for connection to be available
   vars:

diff --git a/tests/integration/targets/connection_aws_ssm_addressing/aliases b/tests/integration/targets/connection_aws_ssm_addressing/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/tests/integration/targets/connection_aws_ssm_addressing/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_addressing/aws_ssm_integration_test_setup.yml
@@ -2,7 +2,7 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
         encrypted_bucket: False
         s3_bucket_region: 'eu-central-1'
         s3_addressing_style: virtual

diff --git a/...targets/connection_aws_ssm_fedora/aliases → ...targets/connection_aws_ssm_centos/aliases b/...targets/connection_aws_ssm_fedora/aliases → ...targets/connection_aws_ssm_centos/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/...fedora/aws_ssm_integration_test_setup.yml → ...centos/aws_ssm_integration_test_setup.yml b/...fedora/aws_ssm_integration_test_setup.yml → ...centos/aws_ssm_integration_test_setup.yml
@@ -2,4 +2,4 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
diff --git a/...ora/aws_ssm_integration_test_teardown.yml → ...tos/aws_ssm_integration_test_teardown.yml b/...ora/aws_ssm_integration_test_teardown.yml → ...tos/aws_ssm_integration_test_teardown.yml
diff --git a/...s/connection_aws_ssm_fedora/meta/main.yml → ...s/connection_aws_ssm_centos/meta/main.yml b/...s/connection_aws_ssm_fedora/meta/main.yml → ...s/connection_aws_ssm_centos/meta/main.yml
diff --git a/...argets/connection_aws_ssm_fedora/runme.sh → ...argets/connection_aws_ssm_centos/runme.sh b/...argets/connection_aws_ssm_fedora/runme.sh → ...argets/connection_aws_ssm_centos/runme.sh
diff --git a/tests/integration/targets/connection_aws_ssm_cross_region/aliases b/tests/integration/targets/connection_aws_ssm_cross_region/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/tests/integration/targets/connection_aws_ssm_cross_region/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_cross_region/aws_ssm_integration_test_setup.yml
@@ -2,7 +2,7 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
         s3_bucket_region: 'eu-central-1'
         # Post 2019 regions behave differently from other regions
         # they're worth testing but it's not possible in CI today.

diff --git a/tests/integration/targets/connection_aws_ssm_encrypted_s3/aliases b/tests/integration/targets/connection_aws_ssm_encrypted_s3/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/tests/integration/targets/connection_aws_ssm_encrypted_s3/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_encrypted_s3/aws_ssm_integration_test_setup.yml
@@ -2,6 +2,6 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
         encrypted_bucket: True
         test_suffix: encrypteds3
diff --git a/tests/integration/targets/connection_aws_ssm_endpoint/aliases b/tests/integration/targets/connection_aws_ssm_endpoint/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/tests/integration/targets/connection_aws_ssm_endpoint/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_endpoint/aws_ssm_integration_test_setup.yml
@@ -2,6 +2,6 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
         test_suffix: endpoint
         endpoint_url: 'https://s3.dualstack.{{ aws_region }}.amazonaws.com'
diff --git a/tests/integration/targets/connection_aws_ssm_profile/aliases b/tests/integration/targets/connection_aws_ssm_profile/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/tests/integration/targets/connection_aws_ssm_profile/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_profile/aws_ssm_integration_test_setup.yml
@@ -2,5 +2,5 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
         profile_name: test_profile
diff --git a/tests/integration/targets/connection_aws_ssm_ssm_document/aliases b/tests/integration/targets/connection_aws_ssm_ssm_document/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/tests/integration/targets/connection_aws_ssm_ssm_document/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_ssm_document/aws_ssm_integration_test_setup.yml
@@ -2,6 +2,6 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
         use_ssm_document: True
         test_suffix: document
diff --git a/tests/integration/targets/connection_aws_ssm_vars/aliases b/tests/integration/targets/connection_aws_ssm_vars/aliases
@@ -1,5 +1,4 @@
 time=10m
 
-disabled
 cloud/aws
 connection_aws_ssm
diff --git a/tests/integration/targets/connection_aws_ssm_vars/aws_ssm_integration_test_setup.yml b/tests/integration/targets/connection_aws_ssm_vars/aws_ssm_integration_test_setup.yml
@@ -2,5 +2,5 @@
   roles:
     - role: ../setup_connection_aws_ssm
       vars:
-        target_os: fedora
+        target_os: centos
         credential_vars: True
diff --git a/tests/integration/targets/setup_connection_aws_ssm/defaults/main.yml b/tests/integration/targets/setup_connection_aws_ssm/defaults/main.yml
@@ -4,7 +4,15 @@ instance_type: t3.micro
 ami_details:
     fedora:
         owner: 125523088429
-        name: Fedora-Cloud-Base-34-1.2.x86_64*
+        name: 'Fedora-Cloud-Base-41-1.2.x86_64*'
+        user_data: |
+            #!/bin/sh
+            sudo dnf install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
+            sudo systemctl start amazon-ssm-agent
+        os_type: linux
+    centos:
+        owner: 125523088429
+        name: 'CentOS Stream 9 x86_64*'
         user_data: |
             #!/bin/sh
             sudo dnf install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		trivial:
		- ssm - bump test image from Fedora 34 to CentOS 9