Mass update of docs and tests (credentials/session tokens) #1714

tremble · 2023-08-30T14:48:36Z

SUMMARY

We had a cleanup of credentials/session parameters which included a batch of deprecations and renames.

Ensure that all of our tests and docs are using the 'canonical' names

ISSUE TYPE

Docs Pull Request

COMPONENT NAME

plugins/inventory/aws_ec2.py
plugins/lookup/secretsmanager_secret.py
plugins/lookup/ssm_parameter.py
plugins/modules/ec2_security_group.py
tests/integration/targets

ADDITIONAL INFORMATION

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

softwarefactory-project-zuul · 2023-08-30T16:35:21Z

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/47a8faf4fcbc4291a51b2bd3e57a915c

✔️ ansible-galaxy-importer SUCCESS in 6m 05s
✔️ build-ansible-collection SUCCESS in 12m 31s
✔️ ansible-test-splitter SUCCESS in 4m 54s
✔️ integration-amazon.aws-1 SUCCESS in 27m 32s
✔️ integration-amazon.aws-2 SUCCESS in 38m 12s
✔️ integration-amazon.aws-3 SUCCESS in 21m 12s
✔️ integration-amazon.aws-4 SUCCESS in 33m 36s
✔️ integration-amazon.aws-5 SUCCESS in 25m 32s
✔️ integration-amazon.aws-6 SUCCESS in 45m 56s
✔️ integration-amazon.aws-7 SUCCESS in 22m 55s
✔️ integration-amazon.aws-8 SUCCESS in 36m 07s
✔️ integration-amazon.aws-9 SUCCESS in 44m 50s
✔️ integration-amazon.aws-10 SUCCESS in 1h 01m 44s
❌ integration-amazon.aws-11 RETRY_LIMIT in 1m 42s
✔️ integration-amazon.aws-12 SUCCESS in 15m 23s
✔️ integration-amazon.aws-13 SUCCESS in 22m 43s
✔️ integration-amazon.aws-14 SUCCESS in 27m 22s
✔️ integration-amazon.aws-15 SUCCESS in 43m 19s
✔️ integration-amazon.aws-16 SUCCESS in 45m 27s
✔️ integration-amazon.aws-17 SUCCESS in 46m 27s
✔️ integration-amazon.aws-18 SUCCESS in 40m 34s
✔️ integration-amazon.aws-19 SUCCESS in 52m 11s
✔️ integration-amazon.aws-20 SUCCESS in 31m 23s
✔️ integration-amazon.aws-21 SUCCESS in 36m 54s
✔️ integration-amazon.aws-22 SUCCESS in 22m 51s
Skipped 22 jobs

softwarefactory-project-zuul · 2023-08-30T20:05:58Z

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/7e3d4744919545fea7679d90fd1b0f90

✔️ ansible-galaxy-importer SUCCESS in 6m 46s
✔️ build-ansible-collection SUCCESS in 12m 50s
✔️ ansible-test-splitter SUCCESS in 4m 56s
✔️ integration-amazon.aws-1 SUCCESS in 30m 41s
✔️ integration-amazon.aws-2 SUCCESS in 41m 14s
✔️ integration-amazon.aws-3 SUCCESS in 23m 16s
✔️ integration-amazon.aws-4 SUCCESS in 37m 31s
✔️ integration-amazon.aws-5 SUCCESS in 56m 16s
✔️ integration-amazon.aws-6 SUCCESS in 41m 34s
✔️ integration-amazon.aws-7 SUCCESS in 19m 17s
✔️ integration-amazon.aws-8 SUCCESS in 41m 12s
✔️ integration-amazon.aws-9 SUCCESS in 43m 07s
✔️ integration-amazon.aws-10 SUCCESS in 38m 53s
✔️ integration-amazon.aws-11 SUCCESS in 35m 33s
✔️ integration-amazon.aws-12 SUCCESS in 13m 29s
✔️ integration-amazon.aws-13 SUCCESS in 27m 10s
✔️ integration-amazon.aws-14 SUCCESS in 32m 20s
✔️ integration-amazon.aws-15 SUCCESS in 41m 38s
✔️ integration-amazon.aws-16 SUCCESS in 38m 59s
✔️ integration-amazon.aws-17 SUCCESS in 45m 03s
✔️ integration-amazon.aws-18 SUCCESS in 42m 50s
✔️ integration-amazon.aws-19 SUCCESS in 33m 44s
✔️ integration-amazon.aws-20 SUCCESS in 35m 10s
✔️ integration-amazon.aws-21 SUCCESS in 32m 01s
✔️ integration-amazon.aws-22 SUCCESS in 22m 03s
Skipped 22 jobs

alinabuzachis · 2023-08-30T21:03:15Z

tests/integration/targets/cloudtrail/tasks/main.yml

+      access_key: "{{ noKms_assumed_role.sts_creds.access_key }}"
+      secret_key: "{{ noKms_assumed_role.sts_creds.secret_key }}"
+      session_token: "{{ noKms_assumed_role.sts_creds.session_token }}"


These creds should not be needed.

This is just a rename PR, not sure why they're there so I'd rather handle that separately.

softwarefactory-project-zuul · 2023-08-30T23:00:53Z

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/fe5c3d8e564743a99c2330538f149f25

✔️ ansible-galaxy-importer SUCCESS in 4m 29s
✔️ build-ansible-collection SUCCESS in 14m 00s
✔️ ansible-test-splitter SUCCESS in 4m 49s
✔️ integration-amazon.aws-1 SUCCESS in 25m 31s
✔️ integration-amazon.aws-2 SUCCESS in 36m 39s
✔️ integration-amazon.aws-3 SUCCESS in 24m 04s
✔️ integration-amazon.aws-4 SUCCESS in 31m 29s
✔️ integration-amazon.aws-5 SUCCESS in 24m 27s
✔️ integration-amazon.aws-6 SUCCESS in 42m 18s
✔️ integration-amazon.aws-7 SUCCESS in 18m 52s
✔️ integration-amazon.aws-8 SUCCESS in 40m 18s
✔️ integration-amazon.aws-9 SUCCESS in 45m 28s
✔️ integration-amazon.aws-10 SUCCESS in 45m 11s
✔️ integration-amazon.aws-11 SUCCESS in 34m 06s
✔️ integration-amazon.aws-12 SUCCESS in 12m 56s
✔️ integration-amazon.aws-13 SUCCESS in 23m 51s
✔️ integration-amazon.aws-14 SUCCESS in 32m 30s
✔️ integration-amazon.aws-15 SUCCESS in 50m 51s
✔️ integration-amazon.aws-16 SUCCESS in 38m 36s
✔️ integration-amazon.aws-17 SUCCESS in 46m 38s
✔️ integration-amazon.aws-18 SUCCESS in 41m 42s
✔️ integration-amazon.aws-19 SUCCESS in 46m 25s
✔️ integration-amazon.aws-20 SUCCESS in 18m 12s
✔️ integration-amazon.aws-21 SUCCESS in 29m 35s
✔️ integration-amazon.aws-22 SUCCESS in 20m 45s
Skipped 22 jobs

patchback · 2023-08-31T07:18:41Z

Backport to stable-6: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply e50e2e0 on top of patchback/backports/stable-6/e50e2e01ecac8b6686c609f9b2d9c3c9e18b7545/pr-1714

Backporting merged PR #1714 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/ansible-collections/amazon.aws.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/stable-6/e50e2e01ecac8b6686c609f9b2d9c3c9e18b7545/pr-1714 upstream/stable-6

Now, cherry-pick PR Mass update of docs and tests (credentials/session tokens) #1714 contents into that branch:
```
$ git cherry-pick -x e50e2e01ecac8b6686c609f9b2d9c3c9e18b7545
```
If it'll yell at you with something like fatal: Commit e50e2e01ecac8b6686c609f9b2d9c3c9e18b7545 is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x e50e2e01ecac8b6686c609f9b2d9c3c9e18b7545
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Mass update of docs and tests (credentials/session tokens) #1714 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/stable-6/e50e2e01ecac8b6686c609f9b2d9c3c9e18b7545/pr-1714

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

alinabuzachis · 2023-08-31T14:32:45Z

@tremble backport failed, will you open a PR against stable-6?

tremble · 2023-08-31T14:34:49Z

I was waiting on #1721 and would backport both together.

Integration tests - Drop use of ec2_region SUMMARY Follow up to #1714 missed "ec2_region" ISSUE TYPE Docs Pull Request COMPONENT NAME tests/ ADDITIONAL INFORMATION Reviewed-by: Alina Buzachis

Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/modules/batch_compute_environment.py plugins/modules/cloudformation_exports_info.py plugins/modules/ec2_vpc_vpn.py plugins/modules/elasticache.py plugins/modules/elasticache_parameter_group.py plugins/modules/elasticache_snapshot.py plugins/modules/ses_rule_set.py plugins/modules/sts_assume_role.py plugins/modules/sts_session_token.py tests/integration ADDITIONAL INFORMATION See also ansible-collections/amazon.aws#1172 ansible-collections/amazon.aws#1714 Reviewed-by: Alina Buzachis

…ollections#1714) Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/inventory/aws_ec2.py plugins/lookup/secretsmanager_secret.py plugins/lookup/ssm_parameter.py plugins/modules/ec2_security_group.py tests/integration/targets ADDITIONAL INFORMATION See Also: ansible-collections#1172 Reviewed-by: Alina Buzachis Reviewed-by: Mark Chappell

Integration tests - Drop use of ec2_region SUMMARY Follow up to ansible-collections#1714 missed "ec2_region" ISSUE TYPE Docs Pull Request COMPONENT NAME tests/ ADDITIONAL INFORMATION Reviewed-by: Alina Buzachis

…ollections#1714) Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/inventory/aws_ec2.py plugins/lookup/secretsmanager_secret.py plugins/lookup/ssm_parameter.py plugins/modules/ec2_security_group.py tests/integration/targets ADDITIONAL INFORMATION See Also: ansible-collections#1172 Reviewed-by: Alina Buzachis Reviewed-by: Mark Chappell

Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/modules/batch_compute_environment.py plugins/modules/cloudformation_exports_info.py plugins/modules/ec2_vpc_vpn.py plugins/modules/elasticache.py plugins/modules/elasticache_parameter_group.py plugins/modules/elasticache_snapshot.py plugins/modules/ses_rule_set.py plugins/modules/sts_assume_role.py plugins/modules/sts_session_token.py tests/integration ADDITIONAL INFORMATION See also #1172 #1714 Reviewed-by: Alina Buzachis This commit was initially merged in https://github.com/ansible-collections/community.aws See: ansible-collections/community.aws@4a5b50e

…ollections#1921) Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/modules/batch_compute_environment.py plugins/modules/cloudformation_exports_info.py plugins/modules/ec2_vpc_vpn.py plugins/modules/elasticache.py plugins/modules/elasticache_parameter_group.py plugins/modules/elasticache_snapshot.py plugins/modules/ses_rule_set.py plugins/modules/sts_assume_role.py plugins/modules/sts_session_token.py tests/integration ADDITIONAL INFORMATION See also ansible-collections#1172 ansible-collections#1714 Reviewed-by: Alina Buzachis This commit was initially merged in https://github.com/ansible-collections/community.aws See: ansible-collections/community.aws@4a5b50e

Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/modules/batch_compute_environment.py plugins/modules/cloudformation_exports_info.py plugins/modules/ec2_vpc_vpn.py plugins/modules/elasticache.py plugins/modules/elasticache_parameter_group.py plugins/modules/elasticache_snapshot.py plugins/modules/ses_rule_set.py plugins/modules/sts_assume_role.py plugins/modules/sts_session_token.py tests/integration ADDITIONAL INFORMATION See also #1172 #1714 Reviewed-by: Alina Buzachis This commit was initially merged in https://github.com/ansible-collections/community.aws See: ansible-collections/community.aws@4a5b50e

…ollections#1921) Mass update of docs and tests (credentials/session tokens) SUMMARY We had a cleanup of credentials/session parameters which included a batch of deprecations and renames. Ensure that all of our tests and docs are using the 'canonical' names ISSUE TYPE Docs Pull Request COMPONENT NAME plugins/modules/batch_compute_environment.py plugins/modules/cloudformation_exports_info.py plugins/modules/ec2_vpc_vpn.py plugins/modules/elasticache.py plugins/modules/elasticache_parameter_group.py plugins/modules/elasticache_snapshot.py plugins/modules/ses_rule_set.py plugins/modules/sts_assume_role.py plugins/modules/sts_session_token.py tests/integration ADDITIONAL INFORMATION See also ansible-collections#1172 ansible-collections#1714 Reviewed-by: Alina Buzachis This commit was initially merged in https://github.com/ansible-collections/community.aws See: ansible-collections/community.aws@4a5b50e

Mass update of docs and tests (credentials/session tokens)

102054b

ansibullbot added community_review docs needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR needs_triage labels Aug 30, 2023

changelog

e61e5db

tremble marked this pull request as ready for review August 30, 2023 20:59

tremble requested review from hakbailey and alinabuzachis August 30, 2023 20:59

alinabuzachis approved these changes Aug 30, 2023

View reviewed changes

tremble added the mergeit Merge the PR (SoftwareFactory) label Aug 30, 2023

softwarefactory-project-zuul bot merged commit e50e2e0 into ansible-collections:main Aug 30, 2023
63 checks passed

tremble added the backport-6 PR should be backported to the stable-6 branch label Aug 31, 2023

This was referenced Aug 31, 2023

Integration tests - Drop use of ec2_region #1721

Merged

Mass update of docs and tests (credentials/session tokens) ansible-collections/community.aws#1921

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Mass update of docs and tests (credentials/session tokens) #1714

Mass update of docs and tests (credentials/session tokens) #1714

tremble commented Aug 30, 2023 •

edited

Loading

ansibullbot commented Aug 30, 2023

github-actions bot commented Aug 30, 2023 •

edited

Loading

softwarefactory-project-zuul bot commented Aug 30, 2023

softwarefactory-project-zuul bot commented Aug 30, 2023

alinabuzachis Aug 30, 2023

tremble Aug 30, 2023

softwarefactory-project-zuul bot commented Aug 30, 2023

patchback bot commented Aug 31, 2023 •

edited

Loading

alinabuzachis commented Aug 31, 2023

tremble commented Aug 31, 2023

Mass update of docs and tests (credentials/session tokens) #1714

Mass update of docs and tests (credentials/session tokens) #1714

Conversation

tremble commented Aug 30, 2023 • edited Loading

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

ansibullbot commented Aug 30, 2023

github-actions bot commented Aug 30, 2023 • edited Loading

Docs Build 📝

softwarefactory-project-zuul bot commented Aug 30, 2023

softwarefactory-project-zuul bot commented Aug 30, 2023

alinabuzachis Aug 30, 2023

Choose a reason for hiding this comment

tremble Aug 30, 2023

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Aug 30, 2023

patchback bot commented Aug 31, 2023 • edited Loading

Backport to stable-6: 💔 cherry-picking failed — conflicts found

Backporting merged PR #1714 into main

alinabuzachis commented Aug 31, 2023

tremble commented Aug 31, 2023

tremble commented Aug 30, 2023 •

edited

Loading

github-actions bot commented Aug 30, 2023 •

edited

Loading

patchback bot commented Aug 31, 2023 •

edited

Loading