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

Prep amazon.cloud 0.3.0 #49

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,45 @@ amazon.cloud Release Notes
.. contents:: Topics


v0.3.0
======

Major Changes
-------------

- amazon.cloud collection - The amazon.cloud collection collection has dropped support for ``botocore<1.28.0`` and ``boto3<1.25.0``. (https://github.com/ansible-collections/amazon.cloud/pull/48).

Breaking Changes / Porting Guide
--------------------------------

- amazon.cloud collection - Support for ansible-core < 2.11 has been dropped (https://github.com/ansible-collections/amazon.cloud/pull/27).

New Modules
-----------

- autoscaling_launch_configuration - Creates and manages a web ACL association.
- autoscaling_lifecycle_hook - Creates and manages an Auto Scaling group
- autoscaling_warm_pool - Creates and manages a pool of pre-initialized EC2 instances that sits alongside the Auto Scaling group
- ec2_placement_group - Creates and manages a placement group
- ecr_repository - Creates and manages an AWS ECR Repository resource
- ecs_capacity_provider - Creates and manages a capacity provider
- ecs_cluster - Creates and manages an Amazon Elastic Container Service (Amazon ECS) cluster
- ecs_cluster_capacity_provider_associations - Creates and manages the association between one or more capacity providers and a default capacity provider strategy with a cluster
- ecs_primary_task_set - Specifies which task set in a service is the primary task set.
- iam_instance_profile - Creates and manages an instance profile
- logs_metric_filter - Specifies a metric filter that describes how CloudWatch Logs extracts information from logs and transforms it into Amazon CloudWatch metrics
- rds_db_cluster_parameter_group - Creates and manages an Amazon Aurora DB cluster or Multi-AZ DB cluster
- rds_db_instance - Creates and manages resource creates an Amazon DB instance
- rds_db_subnet_group - Creates and manages a database subnet group
- rds_global_cluster - Creates and manages an Amazon Aurora global database spread across multiple AWS Regions
- rds_option_group - Creates and manages an option group
- ssm_document - Creates and manages a Systems Manager (SSM) document
- ssm_resource_data_sync - Creates and manages a resource data sync
- wafv2_ip_set - Creates and manages and IP set
- wafv2_logging_configuration - Creates and manages an association between logging destinations and a web ACL resource
- wafv2_regex_pattern_set - Creates and manages an AWS WAFv2 Regex Pattern Set
- wafv2_web_acl_association - Creates and manages a web ACL association

v0.2.0
======

Expand Down
86 changes: 86 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,89 @@ releases:
name: s3objectlambda_access_point_policy
namespace: ''
release_date: '2022-08-30'
0.3.0:
changes:
breaking_changes:
- amazon.cloud collection - Support for ansible-core < 2.11 has been dropped
(https://github.com/ansible-collections/amazon.cloud/pull/27).
major_changes:
- amazon.cloud collection - The amazon.cloud collection collection has dropped
support for ``botocore<1.28.0`` and ``boto3<1.25.0``. (https://github.com/ansible-collections/amazon.cloud/pull/48).
fragments:
- bump_boto3_botocore_versions.yml
- drop-old-ansible.yml
modules:
- description: Creates and manages a web ACL association.
name: autoscaling_launch_configuration
namespace: ''
- description: Creates and manages an Auto Scaling group
name: autoscaling_lifecycle_hook
namespace: ''
- description: Creates and manages a pool of pre-initialized EC2 instances that
sits alongside the Auto Scaling group
name: autoscaling_warm_pool
namespace: ''
- description: Creates and manages a placement group
name: ec2_placement_group
namespace: ''
- description: Creates and manages an AWS ECR Repository resource
name: ecr_repository
namespace: ''
- description: Creates and manages a capacity provider
name: ecs_capacity_provider
namespace: ''
- description: Creates and manages an Amazon Elastic Container Service (Amazon
ECS) cluster
name: ecs_cluster
namespace: ''
- description: Creates and manages the association between one or more capacity
providers and a default capacity provider strategy with a cluster
name: ecs_cluster_capacity_provider_associations
namespace: ''
- description: Specifies which task set in a service is the primary task set.
name: ecs_primary_task_set
namespace: ''
- description: Creates and manages an instance profile
name: iam_instance_profile
namespace: ''
- description: Specifies a metric filter that describes how CloudWatch Logs extracts
information from logs and transforms it into Amazon CloudWatch metrics
name: logs_metric_filter
namespace: ''
- description: Creates and manages an Amazon Aurora DB cluster or Multi-AZ DB
cluster
name: rds_db_cluster_parameter_group
namespace: ''
- description: Creates and manages resource creates an Amazon DB instance
name: rds_db_instance
namespace: ''
- description: Creates and manages a database subnet group
name: rds_db_subnet_group
namespace: ''
- description: Creates and manages an Amazon Aurora global database spread across
multiple AWS Regions
name: rds_global_cluster
namespace: ''
- description: Creates and manages an option group
name: rds_option_group
namespace: ''
- description: Creates and manages a Systems Manager (SSM) document
name: ssm_document
namespace: ''
- description: Creates and manages a resource data sync
name: ssm_resource_data_sync
namespace: ''
- description: Creates and manages and IP set
name: wafv2_ip_set
namespace: ''
- description: Creates and manages an association between logging destinations
and a web ACL resource
name: wafv2_logging_configuration
namespace: ''
- description: Creates and manages an AWS WAFv2 Regex Pattern Set
name: wafv2_regex_pattern_set
namespace: ''
- description: Creates and manages a web ACL association
name: wafv2_web_acl_association
namespace: ''
release_date: '2023-03-06'
4 changes: 0 additions & 4 deletions changelogs/fragments/bump_boto3_botocore_versions.yml

This file was deleted.

2 changes: 0 additions & 2 deletions changelogs/fragments/drop-old-ansible.yml

This file was deleted.

6 changes: 3 additions & 3 deletions galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

namespace: amazon
name: cloud
version: 0.2.0
version: 0.3.0
readme: README.md
authors:
- Ansible (https://github.com/ansible)
description: null
license_file: LICENSE
tags: [amazon, cloud, aws]
dependencies:
amazon.aws: '>=5.2.0'
community.aws: '>=5.2.0'
amazon.aws: '>=5.3.0'
community.aws: '>=5.3.0'
repository: https://github.com/ansible-collections/amazon.cloud
documentation: https://github.com/ansible-collections/amazon.cloud/tree/main/docs
homepage: https://github.com/ansible-collections/amazon.cloud
Expand Down
24 changes: 23 additions & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
requires_ansible: '>=2.9.10'
requires_ansible: '>=2.11.0'
action_groups:
aws:
- backup_backup_vault
Expand Down Expand Up @@ -37,6 +37,28 @@ action_groups:
- cloudtrail_event_data_store
- cloudwatch_composite_alarm
- cloudwatch_metric_stream
- rds_db_instance
- rds_db_cluster_parameter_group
- rds_db_subnet_group
- rds_global_cluster
- rds_option_group
- ssm_document
- ssm_resource_data_sync
- wafv2_ip_set
- wafv2_logging_configuration
- wafv2_regex_pattern_set
- wafv2_web_acl_association
- ecr_repository
- ecs_capacity_provider
- ecs_cluster
- ecs_cluster_capacity_provider_associations
- ecs_primary_task_set
- iam_instance_profile
- logs_metric_filter
- ec2_placement_group
- autoscaling_launch_configuration
- autoscaling_lifecycle_hook
- autoscaling_warm_pool
- rdsdb_proxy
- s3_object_lambda_access_point
- s3_object_lambda_access_point_policy
Expand Down
4 changes: 2 additions & 2 deletions plugins/doc_fragments/boto3.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
class ModuleDocFragment(object):

# Minimum requirements for the collection
DOCUMENTATION = r'''
DOCUMENTATION = r"""
options: {}
requirements:
- python >= 3.9
- boto3 >= 1.25.0
- botocore >= 1.28.0
- jsonpatch
'''
"""
24 changes: 24 additions & 0 deletions plugins/module_utils/common.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright: (c) 2022, Ansible Project
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
# Replicated from amazon.aws because the client agent string will be released
# in amazon.aws 6.0.0

AMAZON_CLOUD_COLLECTION_NAME = "amazon.cloud"
AMAZON_CLOUD_COLLECTION_VERSION = "0.3.0"


_collection_info_context = {
"name": AMAZON_CLOUD_COLLECTION_NAME,
"version": AMAZON_CLOUD_COLLECTION_VERSION,
}


def set_collection_info(collection_name=None, collection_version=None):
if collection_name:
_collection_info_context["name"] = collection_name
if collection_version:
_collection_info_context["version"] = collection_version


def get_collection_info():
return _collection_info_context
7 changes: 5 additions & 2 deletions plugins/module_utils/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@

from ansible_collections.amazon.aws.plugins.module_utils.ec2 import AWSRetry
from ansible_collections.amazon.aws.plugins.module_utils.core import AnsibleAWSModule
from ansible_collections.amazon.aws.plugins.module_utils.common import (

# Replicated common.py filefrom amazon.aws because the client agent string will be
# released in amazon.aws 6.0.0
from ansible_collections.amazon.cloud.plugins.module_utils.common import (
set_collection_info,
)
from .utils import (
Expand Down Expand Up @@ -65,7 +68,7 @@
HAS_BOTO3 = False

AMAZON_CLOUD_COLLECTION_NAME = "amazon.cloud"
AMAZON_CLOUD_COLLECTION_VERSION = "0.2.0"
AMAZON_CLOUD_COLLECTION_VERSION = "0.3.0"


class CloudControlResource(object):
Expand Down
12 changes: 9 additions & 3 deletions plugins/module_utils/waiters.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,15 @@
except ImportError:
pass # caught by HAS_BOTO3

from ansible_collections.amazon.aws.plugins.module_utils.retries import (
RetryingBotoClientWrapper,
)
try:
# Will be released in amazon.aws 6.0.0
from ansible_collections.amazon.aws.plugins.module_utils.retries import (
RetryingBotoClientWrapper,
)
except ImportError:
from ansible_collections.amazon.aws.plugins.module_utils.modules import (
_RetryingBotoClientWrapper as RetryingBotoClientWrapper,
)


cloudcontrolapi_data = {
Expand Down
Loading