Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DNM - Migrate modules ec2_vpc_nacl,ec2_vpc_nacl_info and tests #2339

Merged

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Oct 15, 2024

  • Migrage modules ec2_vpc_nacl,ec2_vpc_nacl_info and tests from collection community.aws.

Copy link

github-actions bot commented Oct 15, 2024

Docs Build 📝

Thank you for contribution!✨

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

Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 54s
✔️ build-ansible-collection SUCCESS in 11m 22s
✔️ ansible-test-splitter SUCCESS in 4m 36s
✔️ integration-amazon.aws-1 SUCCESS in 8m 27s
✔️ integration-community.aws-1 SUCCESS in 6m 49s
Skipped 42 jobs

jillr and others added 27 commits October 16, 2024 12:12
* Rename core collection

Rename references to ansible.amazon to amazon.aws.

* Rename community.amazon to community.aws
Fix pep8 line lengths for rewritten amazon.aws imports

* Missed a path in shippable.sh
* Dependency repos moved

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@235c5db
* Remove ANSIBLE_METADATA entirely, see ansible/ansible/pull/69454.
Remove `license` field from galaxy.yml, in favor of `license_file`.

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@05672a6
* Update module deprecations

Switch version to `removed_at_date`

* Don't install amazon.aws from galaxy

We've been using galaxy to install amazon.aws in shippable, but that
doesn't really work if we aren't publising faster. Get that collection
from git so it is most up to date.

* We need to declare python test deps now

* missed a python dep

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@7cd211e
* Update docs

Remove .git from repo url so links in readme will generate correctly
Add required ansible version
Run latest version of add_docs.py
Add version_added string to modules

* galaxy.yml was missing authors

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@96ee268
* Split imports and sort
* Move camel_dict_to_snake_dict imports to ansible.module_utils.common.dict_transformations
* Cleanup unused imports
* Bulk migration to fail_json_aws
* Changelog

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@6c88315
* Reorder imports
* Make use of is_boto3_error_message
* Mass-migration over to is_boto3_error_code
* Remove unused imports
* unused vars in exception
* Improve consistency around catching BotoCoreError and ClientError
* Remove unused imports
* Remove unused 'PolicyError' from iam_policy_info
* Avoid catching botocore.exceptions.ClientError when we only want some error codes
* Import camel_dict_to_snake_dict/snake_dict_to_camel_dict from ansible.module_utils.common.dict_transformations

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@4cf52ef
* More aliases cleanup
* Mark ec2_classic_lb tests unstable
* Add more comments about why tests aren't enabled

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@cb55efa
This collection has been operating on Zuul CI for some weeks now

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@4e0d83c
Remove deprecated "facts" aliases

SUMMARY
Modules named "facts.py" that do not return ansible_facts were renamed to "info.py" in 2.9. Remove these aliases now that the deprecation period is over.
This PR should be included in 3.0.0 of the collection.
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
*_facts.py

Reviewed-by: Mark Chappell <None>
Reviewed-by: Jill R <None>
Reviewed-by: None <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@68aaa70
Integration test dependency cleanup

SUMMARY

remove dependencies on setup_remote_tmp_dir where it's not used (often just copy & paste from another test)
remove setup_ec2 (no main.yml means it's not doing anything)
remove prepare_tests (empty main.yml means it's not doing anything)

ISSUE TYPE

Feature Pull Request

COMPONENT NAME
tests/integration/targets
ADDITIONAL INFORMATION
By cleaning up what we have we reduce the chance of people copying things about "because that's what test XYZ did".

Reviewed-by: Alina Buzachis <None>
Reviewed-by: Mark Woolley <[email protected]>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@dd12046
ec2_vpc_nacl - Add support for purge_tags

SUMMARY

Add support to ec2_vpc_nacl for purge_tags
Use ec2 helper for tagging
Use TaggingSpecifications on creation

ISSUE TYPE

Feature Pull Request

COMPONENT NAME
ec2_vpc_nacl
ADDITIONAL INFORMATION

 Changelog
 Integration tests

Reviewed-by: Joseph Torcasso <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@edc393e
Minor sanity test fixes (new devel)

SUMMARY
ansible-devel has added a new PEP test (missing whitespace after keyword), this adds the fixes before the devel sanity tests are 'voting'.
Additionally fixes:

unused variables
broad catching of Exception

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
plugins/modules/autoscaling_group_info.py
plugins/modules/cloudfront_distribution.py
plugins/modules/cloudfront_origin_access_identity.py
plugins/modules/cloudtrail.py
plugins/modules/ec2_vpc_nacl.py
plugins/modules/eks_fargate_profile.py
plugins/modules/redshift.py
plugins/modules/s3_bucket_info.py
ADDITIONAL INFORMATION
cloudfront_distribution still has a lot of catch Exception but it's part of parameter validation which should be overhauled separately, unfortunately the tests are rather b0rked.

Reviewed-by: Alina Buzachis <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@3d4736b
…collections#1459)

Update extends_documentation_fragment with amazon.aws.boto3

Depends-On: ansible/ansible-zuul-jobs#1654
SUMMARY

As per ansible-collections#985 add amazon.aws.boto3.

ISSUE TYPE

Docs Pull Request

COMPONENT NAME

several

Reviewed-by: Jill R <None>
Reviewed-by: Mark Chappell <None>
Reviewed-by: Markus Bergholz <[email protected]>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@bd3c03f
Fix non-matching defaults in docs

Depends-On: ansible-collections#1579
SUMMARY
Fix various non-matching default values exposed by ansible/ansible#79267.
ISSUE TYPE

Docs Pull Request

COMPONENT NAME
various

Reviewed-by: Markus Bergholz <[email protected]>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@15568f0
…ons#1632)

Ansible User-Agent identification for community.aws

SUMMARY

The value will be similar to this APN/1.0 Ansible/2.14.1 community.aws/6.0.0-dev0

ISSUE TYPE

Feature Pull Request

Reviewed-by: Mark Chappell <None>
Reviewed-by: Bikouo Aubin <None>
Reviewed-by: Alina Buzachis <None>

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@a8cbce2
Cleanup headers and imports

SUMMARY
Mass update of imports, docs fragments and file headers

Many of the amazon.aws module_utils and docs fragments got moved about, update community.aws to reflect this.
Consistently apply the comment headers as documented at https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_documenting.html#python-shebang-utf-8-coding

ISSUE TYPE

Docs Pull Request
Feature Pull Request

COMPONENT NAME
ADDITIONAL INFORMATION
Header cleanup based upon:
https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_documenting.html#python-shebang-utf-8-coding

Begin your Ansible module with #!/usr/bin/python - this “shebang” allows ansible_python_interpreter to work. Follow the shebang immediately with # -*- coding: utf-8 -*- to clarify that the file is UTF-8 encoded.

and
https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_documenting.html#copyright-and-license

After the shebang and UTF-8 coding, add a copyright line with the original copyright holder and a license declaration. The license declaration should be ONLY one line, not the full GPL prefix.
...
Additions to the module (for instance, rewrites) are not permitted to add additional copyright lines other than the default copyright statement if missing:

Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@a4f20bf
* Black prep

* Black

* changelog

* Fix pylint unused-import in tests

* Split SSM connection plugin changes

* disable glue tests - bucket's missing

* Disable s3_logging and s3_sync tests

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@2c4575c
Bulk migration to Python 3.6 f-strings

SUMMARY
We've dropped support for Python <3.6, bulk migrate to fstrings and perform some general string cleanup
A combination of

black --preview
flynt
some manual cleanup

ISSUE TYPE

Feature Pull Request

COMPONENT NAME
plugins/
tests/
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@de33821
…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
tremble and others added 5 commits October 16, 2024 12:12
SUMMARY

Apply isort - see also ansible-collections#1771
Apply flynt - see also ansible-collections#1802

ISSUE TYPE

    Feature Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@c0117b5
…s#2036)

ansible-lint (documentation) cleanup for plugins/

SUMMARY
Fixes an array of ansible-lint failures in plugins/
Adds ansible-lint plugins/ to tox -m lint
ISSUE TYPE

Docs Pull Request

COMPONENT NAME
plugins/
ADDITIONAL INFORMATION
docs changes only (no changelog fragment needed)

Reviewed-by: Alina Buzachis

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@6dd4a00
…ible-collections#2159)

SUMMARY

Use shared code from amazon.aws.plugins.module_utils.ec2
Refactor module ec2_vpc_nacl and ec2_vpc_nacl_info

ISSUE TYPE

Feature Pull Request

Reviewed-by: Alina Buzachis
Reviewed-by: Bikouo Aubin
Reviewed-by: GomathiselviS

This commit was initially merged in https://github.com/ansible-collections/community.aws
See: ansible-collections/community.aws@86d268f
@abikouo abikouo force-pushed the migrate_ec2_vpc_nacl_20241015_1 branch from 76933f7 to c5ec25c Compare October 16, 2024 10:13
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/44f32c07c11a452a970f88ca2a8b6947

✔️ ansible-galaxy-importer SUCCESS in 7m 39s
✔️ build-ansible-collection SUCCESS in 10m 12s
✔️ ansible-test-splitter SUCCESS in 4m 04s
✔️ integration-amazon.aws-1 SUCCESS in 7m 44s
✔️ integration-community.aws-1 SUCCESS in 10m 14s
Skipped 42 jobs

plugins/modules/ec2_vpc_nacl_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_nacl_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_nacl_info.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_nacl.py Outdated Show resolved Hide resolved
plugins/modules/ec2_vpc_nacl.py Outdated Show resolved Hide resolved
@abikouo abikouo force-pushed the migrate_ec2_vpc_nacl_20241015_1 branch from e7b75f1 to d230058 Compare October 17, 2024 10:13
@abikouo abikouo requested a review from alinabuzachis October 17, 2024 10:13
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/25619550056744b2b9b5c98aba130eab

✔️ ansible-galaxy-importer SUCCESS in 5m 05s
✔️ build-ansible-collection SUCCESS in 10m 16s
✔️ ansible-test-splitter SUCCESS in 3m 47s
✔️ integration-amazon.aws-1 SUCCESS in 8m 12s
✔️ integration-community.aws-1 SUCCESS in 6m 14s
Skipped 42 jobs

Figrol and others added 2 commits October 17, 2024 13:31
Corrected spelling of the word to
SUMMARY

Small spelling mistake the current word of "ton" does not make sense and assume it should be "to".

ISSUE TYPE


Docs Pull Request

COMPONENT NAME

Doc spelling correction
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis
Reviewed-by: Bikouo Aubin
@abikouo abikouo force-pushed the migrate_ec2_vpc_nacl_20241015_1 branch from d230058 to fc3e13b Compare October 17, 2024 11:31
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 27s
✔️ build-ansible-collection SUCCESS in 10m 20s
✔️ ansible-test-splitter SUCCESS in 4m 04s
✔️ integration-amazon.aws-1 SUCCESS in 7m 37s
✔️ integration-community.aws-1 SUCCESS in 9m 04s
Skipped 42 jobs

@GomathiselviS GomathiselviS merged commit 45a4bdb into ansible-collections:main Oct 24, 2024
34 of 35 checks passed
softwarefactory-project-zuul bot pushed a commit to ansible-collections/community.aws that referenced this pull request Oct 25, 2024
Depends-On: ansible-collections/amazon.aws#2339

Remove ec2_vpc_nacl,ec2_vpc_nacl_info modules and tests, these modules have been migrated to amazon.aws collection.
Update runtime.yml with redirects to that collection
Update ignore files

Reviewed-by: GomathiselviS <[email protected]>
Reviewed-by: Mandar Kulkarni <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants