diff --git a/c7n/resources/airflow.py b/c7n/resources/airflow.py new file mode 100644 index 00000000000..41bbe08cd53 --- /dev/null +++ b/c7n/resources/airflow.py @@ -0,0 +1,115 @@ +# Copyright The Cloud Custodian Authors. +# SPDX-License-Identifier: Apache-2.0 +from c7n.manager import resources +from c7n.query import QueryResourceManager, TypeInfo +from c7n.filters.kms import KmsRelatedFilter +from c7n.tags import RemoveTag, Tag, TagDelayedAction, TagActionFilter + + +@resources.register('airflow') +class ApacheAirflow(QueryResourceManager): + class resource_type(TypeInfo): + service = 'mwaa' + id = name = 'Name' + enum_spec = ('list_environments', 'Environments', None) + detail_spec = ('get_environment', 'Name', None, 'Environment') + arn = 'Arn' + arn_type = 'environment' + cfn_type = 'AWS::MWAA::Environment' + permission_prefix = 'airflow' + + permissions = ( + 'airflow:GetEnvironment', + 'airflow:ListEnvironments', + ) + + def augment(self, resources): + resources = super(ApacheAirflow, self).augment(resources) + for r in resources: + r['Tags'] = [{'Key': k, 'Value': v} for k, v in r.get('Tags', {}).items()] + return resources + + +@ApacheAirflow.filter_registry.register('kms-key') +class ApacheAirflowKmsFilter(KmsRelatedFilter): + """ + + Filter a Managed Workflow for Apache Airflow environment by its associcated kms key + and optionally the aliasname of the kms key by using 'c7n:AliasName' + + :example: + + .. code-block:: yaml + + policies: + - name: airflow-kms-key-filter + resource: airflow + filters: + - type: kms-key + key: c7n:AliasName + value: alias/aws/mwaa + """ + RelatedIdsExpression = 'KmsKey' + + +@ApacheAirflow.action_registry.register('tag') +class TagApacheAirflow(Tag): + """Action to create tag(s) on a Managed Workflow for Apache Airflow environment + + :example: + + .. code-block:: yaml + + policies: + - name: tag-airflow + resource: airflow + filters: + - "tag:target-tag": absent + actions: + - type: tag + key: target-tag + value: target-tag-value + """ + + permissions = ('airflow:TagResource',) + + def process_resource_set(self, client, airflow, new_tags): + for r in airflow: + try: + client.tag_resource( + ResourceArn=r['Arn'], + Tags={t['Key']: t['Value'] for t in new_tags}) + except client.exceptions.ResourceNotFound: + continue + + +@ApacheAirflow.action_registry.register('remove-tag') +class UntagApacheAirflow(RemoveTag): + """Action to remove tag(s) on a Managed Workflow for Apache Airflow environment + + :example: + + .. code-block:: yaml + + policies: + - name: airflow-remove-tag + resource: airflow + filters: + - "tag:OutdatedTag": present + actions: + - type: remove-tag + tags: ["OutdatedTag"] + """ + + permissions = ('airflow:UntagResource',) + + def process_resource_set(self, client, airflow, tags): + for r in airflow: + try: + client.untag_resource(ResourceArn=r['Arn'], tagKeys=tags) + except client.exceptions.ResourceNotFound: + continue + + +ApacheAirflow.filter_registry.register('marked-for-op', TagActionFilter) +ApacheAirflow.action_registry.register('mark-for-op', TagDelayedAction) diff --git a/c7n/resources/code.py b/c7n/resources/code.py index 02330c40b11..a7086d17003 100644 --- a/c7n/resources/code.py +++ b/c7n/resources/code.py @@ -6,9 +6,11 @@ from c7n.actions import BaseAction from c7n.filters.vpc import SubnetFilter, SecurityGroupFilter, VpcFilter from c7n.manager import resources -from c7n.query import QueryResourceManager, DescribeSource, ConfigSource, TypeInfo +from c7n.query import ( + QueryResourceManager, DescribeSource, ConfigSource, TypeInfo, ChildResourceManager) from c7n.tags import universal_augment from c7n.utils import local_session, type_schema +from c7n import query from .securityhub import OtherResourcePostFinding @@ -265,3 +267,132 @@ def process(self, resources): self.manager.retry(client.delete_pipeline, name=r['name']) except client.exceptions.PipelineNotFoundException: continue + + +@resources.register('codedeploy-app') +class CodeDeployApplication(QueryResourceManager): + + class resource_type(TypeInfo): + service = 'codedeploy' + enum_spec = ('list_applications', 'applications', None) + batch_detail_spec = ( + 'batch_get_applications', 'applicationNames', + None, 'applicationsInfo', None) + id = 'applicationId' + name = 'applicationName' + date = 'createTime' + arn_type = "application" + arn_separator = ":" + cfn_type = "AWS::CodeDeploy::Application" + universal_taggable = True + + def augment(self, resources): + resources = super().augment(resources) + client = local_session(self.session_factory).client('codedeploy') + for r, arn in zip(resources, self.get_arns(resources)): + r['Tags'] = client.list_tags_for_resource( + ResourceArn=arn).get('Tags', []) + return resources + + def get_arns(self, resources): + return [self.generate_arn(r['applicationName']) for r in resources] + + +@CodeDeployApplication.action_registry.register('delete') +class DeleteApplication(BaseAction): + + schema = type_schema('delete') + permissions = ('codedeploy:DeleteApplication',) + + def process(self, resources): + client = local_session(self.manager.session_factory).client('codedeploy') + for r in resources: + try: + self.manager.retry(client.delete_application, applicationName=r['applicationName']) + except (client.exceptions.InvalidApplicationNameException, + client.exceptions.ApplicationDoesNotExistException): + continue + + +@resources.register('codedeploy-deployment') +class CodeDeployDeployment(QueryResourceManager): + + class resource_type(TypeInfo): + service = 'codedeploy' + enum_spec = ('list_deployments', 'deployments', {'includeOnlyStatuses': [ + 'Created', 'Queued', 'InProgress', 'Baking', 'Ready']}) + batch_detail_spec = ( + 'batch_get_deployments', 'deploymentIds', + None, 'deploymentsInfo', None) + name = id = 'deploymentId' + # couldn't find a real cloudformation type + cfn_type = None + arn_type = "deploymentgroup" + date = 'createTime' + + +class DescribeDeploymentGroup(query.ChildDescribeSource): + + def get_query(self): + query = super().get_query() + query.capture_parent_id = True + return query + + def augment(self, resources): + client = local_session(self.manager.session_factory).client('codedeploy') + results = [] + for parent_id, group_name in resources: + dg = self.manager.retry( + client.get_deployment_group, applicationName=parent_id, + deploymentGroupName=group_name).get('deploymentGroupInfo') + results.append(dg) + for r in results: + rarn = self.manager.generate_arn(r['applicationName'] + '/' + r['deploymentGroupName']) + r['Tags'] = self.manager.retry( + client.list_tags_for_resource, ResourceArn=rarn).get('Tags') + return results + + +@resources.register('codedeploy-group') +class CodeDeployDeploymentGroup(ChildResourceManager): + + class resource_type(TypeInfo): + service = 'codedeploy' + parent_spec = ('codedeploy-app', 'applicationName', None) + enum_spec = ('list_deployment_groups', 'deploymentGroups', None) + id = 'deploymentGroupId' + name = 'deploymentGroupName' + arn_type = "deploymentgroup" + cfn_type = 'AWS::CodeDeploy::DeploymentGroup' + arn_separator = ':' + permission_prefix = 'codedeploy' + universal_taggable = True + + source_mapping = { + 'describe-child': DescribeDeploymentGroup + } + + def get_arns(self, resources): + arns = [] + for r in resources: + arns.append(self.generate_arn(r['applicationName'] + '/' + r['deploymentGroupName'])) + return arns + + +@CodeDeployDeploymentGroup.action_registry.register('delete') +class DeleteDeploymentGroup(BaseAction): + """Delete a deployment group tied to an application. + """ + + schema = type_schema('delete') + permissions = ('codedeploy:DeleteDeploymentGroup',) + + def process(self, resources): + client = local_session(self.manager.session_factory).client('codedeploy') + for r in resources: + try: + self.manager.retry(client.delete_deployment_group, + applicationName=r['applicationName'], + deploymentGroupName=r['deploymentGroupName']) + except client.exceptions.InvalidDeploymentGroupNameException: + continue diff --git a/c7n/resources/resource_map.py b/c7n/resources/resource_map.py index f9dcd6726cd..f87358ee2c3 100644 --- a/c7n/resources/resource_map.py +++ b/c7n/resources/resource_map.py @@ -3,6 +3,7 @@ ResourceMap = { "aws.account": "c7n.resources.account.Account", "aws.acm-certificate": "c7n.resources.acm.Certificate", + "aws.airflow": "c7n.resources.airflow.ApacheAirflow", "aws.alarm": "c7n.resources.cw.Alarm", "aws.ami": "c7n.resources.ami.AMI", "aws.app-elb": "c7n.resources.appelb.AppELB", @@ -27,6 +28,9 @@ "aws.artifact-repo": "c7n.resources.artifact.ArtifactRepo", "aws.codebuild": "c7n.resources.code.CodeBuildProject", "aws.codecommit": "c7n.resources.code.CodeRepository", + "aws.codedeploy-app": "c7n.resources.code.CodeDeployApplication", + "aws.codedeploy-deployment": "c7n.resources.code.CodeDeployDeployment", + "aws.codedeploy-group": "c7n.resources.code.CodeDeployDeploymentGroup", "aws.codepipeline": "c7n.resources.code.CodeDeployPipeline", "aws.config-recorder": "c7n.resources.config.ConfigRecorder", "aws.config-rule": "c7n.resources.config.ConfigRule", diff --git a/c7n/version.py b/c7n/version.py index 9be3a3c6a60..a879ff51c5a 100644 --- a/c7n/version.py +++ b/c7n/version.py @@ -1,2 +1,2 @@ # Generated via tools/dev/poetrypkg.py -version = "0.9.13" +version = "0.9.14" diff --git a/docs/source/aws/contribute.rst b/docs/source/aws/contribute.rst index 04945a71540..7feacd47894 100644 --- a/docs/source/aws/contribute.rst +++ b/docs/source/aws/contribute.rst @@ -10,8 +10,8 @@ Run the following commands in the root directory after cloning Cloud Custodian: .. code-block:: bash - $ make install - $ source bin/activate + make install + source bin/activate This creates a virtual env in your enlistment and installs all packages as editable. diff --git a/docs/source/aws/gettingstarted.rst b/docs/source/aws/gettingstarted.rst index d0849354134..16604abf66c 100644 --- a/docs/source/aws/gettingstarted.rst +++ b/docs/source/aws/gettingstarted.rst @@ -157,14 +157,14 @@ Given that, you can run Cloud Custodian with .. code-block:: bash # Validate the configuration (note this happens by default on run) - $ custodian validate policy.yml + custodian validate policy.yml # Dryrun on the policies (no actions executed) to see what resources # match each policy. - $ custodian run --dryrun -s out policy.yml + custodian run --dryrun -s out policy.yml # Run the policy - $ custodian run -s out policy.yml + custodian run -s out policy.yml .. _monitor-aws-cc: @@ -173,15 +173,15 @@ Monitor AWS You can generate CloudWatch metrics by specifying the ``--metrics`` flag and specifying ``aws``:: - $ custodian run -s --metrics aws .yml + custodian run -s --metrics aws .yml You can also upload Cloud Custodian logs to CloudWatch logs:: - $ custodian run --log-group=/cloud-custodian// -s .yml + custodian run --log-group=/cloud-custodian// -s .yml And you can output logs and resource records to S3:: - $ custodian run -s s3:// .yml + custodian run -s s3:// .yml If Custodian is being run without Assume Roles, all output will be put into the same account. Custodian is built with the ability to be run from different accounts and leverage STS @@ -200,4 +200,4 @@ as well, either on the command line or in an environment variable: .. code-block:: bash - $ AWS_DEFAULT_REGION=us-west-1 + AWS_DEFAULT_REGION=us-west-1 diff --git a/docs/source/aws/usage.rst b/docs/source/aws/usage.rst index 9a674f5423a..360b63d961f 100644 --- a/docs/source/aws/usage.rst +++ b/docs/source/aws/usage.rst @@ -31,29 +31,29 @@ Additionally some filters and actions may generate their own metrics. In order to enable metrics output, the boolean metrics flag needs to be specified when running Cloud Custodian:: - $ custodian run -s --metrics aws .yml + custodian run -s --metrics aws .yml You can also consolidate metrics into a single account by specifying the ``master`` location in the cli. Note that this is only applicable when using the ``--assume`` option in the cli or when using c7n-org. By default, metrics will be sent to the same account that is being executed against:: - $ custodian run -s --metrics aws://master + custodian run -s --metrics aws://master Additionally, to use a different namespace other than the default ``CloudMaid``, you can add the following query parameter to the metrics flag:: - $ custodian run -s --metrics aws://?namespace=foo + custodian run -s --metrics aws://?namespace=foo This will create a new namespace, ``foo`` in CloudWatch Metrics. You can also combine these two options to emit metrics into a custom namespace in a central account:: - $ custodian run -s --metrics aws://master?namespace=foo + custodian run -s --metrics aws://master?namespace=foo Finally, to send metrics to a specific region, use the ``region`` query parameter to specify a region:: - $ custodian run -s --metrics aws://?region=us-west-2 + custodian run -s --metrics aws://?region=us-west-2 When running the metrics in a centralized account or when centralizing to a specific region, additional account and region dimensions will be included. @@ -68,7 +68,7 @@ separate stream. Usage example:: - $ custodian run --log-group=/cloud-custodian// .yml + custodian run --log-group=/cloud-custodian// .yml If enabled, it is recommended to set a log subscription on the group to @@ -81,17 +81,17 @@ You can also aggregate your logs within a single region or account using the sam To send your logs to a region in the master account use:: - $ custodian run --log-group=aws://master/?region= .yml + custodian run --log-group=aws://master/?region= .yml This will set up a stream for every region/account you run custodian against within the specified log group. The default log stream format looks like this: - $ account_id/region/policy_name + account_id/region/policy_name If you want to override this then you can pass the the log stream parameter like this: - $ custodian run --log-group="aws://master/?region=&stream=custodian_{region}_{account}_{policy} .yml" + custodian run --log-group="aws://master/?region=&stream=custodian_{region}_{account}_{policy} .yml" it currently accepts these variables: {account}: the account where the check was executed. @@ -107,7 +107,7 @@ with its log files for archival purposes. The S3 bucket and prefix can be specified via parameters:: - $ custodian run --output-dir s3:/// .yml + custodian run --output-dir s3:/// .yml Reports ------- @@ -116,4 +116,4 @@ CSV or text-based reports can be generated with the ``report`` subcommand. Reporting is used to list information gathered during previous calls to the ``run`` subcommand. If your goal is to find out what resources match on a policy use ``run`` -along with the ``--dryrun`` option. +along with the ``--dryrun`` option. \ No newline at end of file diff --git a/docs/source/deployment.rst b/docs/source/deployment.rst index 738d13585e0..9801b6b1471 100644 --- a/docs/source/deployment.rst +++ b/docs/source/deployment.rst @@ -28,11 +28,11 @@ to add a README or any other files to it first. .. code-block:: bash - $ mkdir my-policies - $ cd my-policies - $ git init - $ git remote add origin - $ touch policy.yml + mkdir my-policies + cd my-policies + git init + git remote add origin + touch policy.yml Next, we'll add a policy to our new ``policy.yml`` file. @@ -48,11 +48,11 @@ working directory and push it up to our remote: .. code-block:: bash # this should show your policy.yml as an untracked file - $ git status + git status - $ git add policy.yml - $ git commit -m 'init my first policy' - $ git push -u origin master + git add policy.yml + git commit -m 'init my first policy' + git push -u origin master Once you've pushed your changes you should be able to see your new changes inside of Github. Congratulations, you're now ready to start automatically validating and @@ -199,7 +199,7 @@ in the :ref:`install-cc` guide. Once you have Cloud Custodian installed, download your policies that you created in the :ref:`compliance_as_code` section. If using git, just simply do a ``git clone``:: - $ git clone + git clone You now have your policies and custodian available on the instance. Typically, policies that query the extant resources in the account/project/subscription should be run @@ -218,13 +218,13 @@ When executing Custodian, you can enable metrics simply by adding the ``-m`` fla cloud provider:: # AWS - $ custodian run -s output -m aws policy.yml + custodian run -s output -m aws policy.yml # Azure - $ custodian run -s output -m azure policy.yml + custodian run -s output -m azure policy.yml # GCP - $ custodian run -s output -m gcp policy.yml + custodian run -s output -m gcp policy.yml When you enable metrics, a new namespace will be created and the following metrics will be recorded there: @@ -236,22 +236,22 @@ recorded there: To enable logging to CloudWatch logs, Stackdriver, or Azure AppInsights, use the ``-l`` flag:: # AWS CloudWatch Logs - $ custodian run -s output -l /cloud-custodian/policies policy.yml + custodian run -s output -l /cloud-custodian/policies policy.yml # Azure App Insights Logs - $ custodian run -s output -l azure://cloud-custodian/policies policy.yml + custodian run -s output -l azure://cloud-custodian/policies policy.yml # Stackdriver Logs - $ custodian run -s output -l gcp://cloud-custodian/policies policy.yml + custodian run -s output -l gcp://cloud-custodian/policies policy.yml You can also store the output of your Custodian logs in a cloud provider's blob storage like S3 or Azure Storage accounts:: # AWS S3 - $ custodian run -s s3://my-custodian-bucket policy.yml + custodian run -s s3://my-custodian-bucket policy.yml # Azure Storage Accounts - $ custodian run -s azure://my-custodian-storage-account policy.yml + custodian run -s azure://my-custodian-storage-account policy.yml .. _mailer_and_notifications_deployment: @@ -287,9 +287,9 @@ recent commit and master. .. code-block:: bash # in your git directory for policies - $ docker pull cloudcustodian/policystream - $ docker run -v $(pwd):/home/custodian/policies cloudcustodian > policystream-diff.yml - $ custodian run -s output -v --dryrun policystream-diff.yml + docker pull cloudcustodian/policystream + docker run -v $(pwd):/home/custodian/policies cloudcustodian > policystream-diff.yml + custodian run -s output -v --dryrun policystream-diff.yml After running your new policy file (policystream-diff.yml), the outputs will be stored in the output directory. diff --git a/docs/source/developer/documentation.rst b/docs/source/developer/documentation.rst index 7056cbf49df..68348b9cfbc 100644 --- a/docs/source/developer/documentation.rst +++ b/docs/source/developer/documentation.rst @@ -81,7 +81,7 @@ In general, you should use tox to build the documentation: .. code-block:: - $ tox -e docs + tox -e docs This command will clean previously built files and rebuild the entire documentation tree. @@ -90,7 +90,7 @@ To do so, use the following command: .. code-block:: - $ make -f docs/Makefile.sphinx html + make -f docs/Makefile.sphinx html You can also build documentation via the provided tox dockerfile. You will need to build and @@ -98,5 +98,5 @@ run from the root of your source enlistment each time you edit documentation fil .. code-block:: - $ docker build -t tox_linux --build-arg TOX_ENV=docs . -f tools/dev/docker_tox_linux/Dockerfile - $ docker run -v 'pwd'/docs/build:/src/docs/build -it tox_linux + docker build -t tox_linux --build-arg TOX_ENV=docs . -f tools/dev/docker_tox_linux/Dockerfile + docker run -v 'pwd'/docs/build:/src/docs/build -it tox_linux diff --git a/docs/source/developer/installing.rst b/docs/source/developer/installing.rst index 62c657bee6f..3bf73c87828 100644 --- a/docs/source/developer/installing.rst +++ b/docs/source/developer/installing.rst @@ -27,25 +27,25 @@ To get Python 3.8, first add the deadsnakes package repository: .. code-block:: bash - $ sudo add-apt-repository ppa:deadsnakes/ppa + sudo add-apt-repository ppa:deadsnakes/ppa Next, install python3.8 and the development headers for it: .. code-block:: bash - $ sudo apt-get install python3.8 python3.8-dev + sudo apt-get install python3.8 python3.8-dev Then, install ``pip``: .. code-block:: - $ sudo apt-get install python3-pip + sudo apt-get install python3-pip When this is complete you should be able to check that you have pip properly installed: .. code-block:: - $ python3.8 -m pip --version + python3.8 -m pip --version pip 9.0.1 from /usr/lib/python3/dist-packages (python 3.8) (your exact version numbers will likely differ) @@ -56,7 +56,7 @@ On macOS with Homebrew .. code-block:: bash - $ brew install python3 + brew install python3 Installing ``python3`` will get you the latest version of Python 3 supported by Homebrew, currently Python 3.7. @@ -68,7 +68,7 @@ Once your Python installation is squared away, you will need to install ``tox``: .. code-block:: bash - $ python3.7 -m pip install -U pip tox + python3.7 -m pip install -U pip tox (note that we also updated ``pip`` in order to get the latest version) @@ -80,8 +80,8 @@ First, clone the repository: .. code-block:: bash - $ git clone https://github.com/cloud-custodian/cloud-custodian.git - $ cd cloud-custodian + git clone https://github.com/cloud-custodian/cloud-custodian.git + cd cloud-custodian .. note:: If you have the intention to contribute to Cloud Custodian, it's better to make @@ -91,28 +91,28 @@ First, clone the repository: .. code-block:: bash - $ git clone https://github.com//cloud-custodian.git + git clone https://github.com//cloud-custodian.git To keep track of the changes to the original cloud-custodian repository, add a remote upstream repository in your fork: .. code-block:: bash - $ git remote add upstream https://github.com/cloud-custodian/cloud-custodian.git + git remote add upstream https://github.com/cloud-custodian/cloud-custodian.git Then, to get the upstream changes and merge them into your fork: .. code-block:: bash - $ git fetch upstream - $ git merge upstream/master + git fetch upstream + git merge upstream/master Now that the repository is set up, build the software with `tox `_: .. code-block:: bash - $ tox + tox Tox creates a sandboxed "virtual environment" ("venv") for each Python version, 3.6, 3.7, 3.8 These are stored in the ``.tox/`` directory. @@ -124,14 +124,14 @@ You can run the test suite in a single environment with the ``-e`` flag: .. code-block:: bash - $ tox -e py38 + tox -e py38 To access the executables installed in one or the other virtual environment, source the venv into your current shell, e.g.: .. code-block:: bash - $ source .tox/py37/bin/activate + source .tox/py37/bin/activate You should then have, e.g., the ``custodian`` command available: @@ -160,7 +160,7 @@ module. It can be done right inside the cloned Cloud Custodian repository: .. code-block:: bash - $ python3 -m venv . + python3 -m venv . The above command assumes the current directory is the Cloud Custodian checkout. @@ -172,20 +172,20 @@ For osx and linux, poetry recommends running this for installing: .. code-block:: bash - $ curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python - + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python - For windows powershell use this command: .. code-block:: bash - $ (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python - + (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py -UseBasicParsing).Content | python - Once poetry is installed, you can set up Cloud Custodian using the included Makefile: .. code-block:: bash - $ source bin/activate + source bin/activate (cloud-custodian) $ make install-poetry .. note:: @@ -205,7 +205,7 @@ using the shell: .. code-block:: bash - $ source test.env + source test.env In general, it's best to use ``tox`` to run the full test suite, and use ``pytest`` to run specific tests that you are working on. \ No newline at end of file diff --git a/docs/source/gcp/contribute.rst b/docs/source/gcp/contribute.rst index c078071325d..4b897adf360 100644 --- a/docs/source/gcp/contribute.rst +++ b/docs/source/gcp/contribute.rst @@ -8,8 +8,8 @@ in the makefile: .. code-block:: bash - $ make install - $ source bin/activate + make install + source bin/activate This creates a virtual env in your enlistment and installs all packages as editable. diff --git a/docs/source/gcp/gettingstarted.rst b/docs/source/gcp/gettingstarted.rst index ce777307793..9d69f06616e 100644 --- a/docs/source/gcp/gettingstarted.rst +++ b/docs/source/gcp/gettingstarted.rst @@ -24,8 +24,8 @@ Option 1: Install released packages to local Python Environment .. code-block:: bash - $ pip install c7n - $ pip install c7n_gcp + pip install c7n + pip install c7n_gcp Option 2: Install latest from the repository @@ -33,9 +33,9 @@ Option 2: Install latest from the repository .. code-block:: bash - $ git clone https://github.com/cloud-custodian/cloud-custodian.git - $ pip install -e ./cloud-custodian - $ pip install -e ./cloud-custodian/tools/c7n_gcp + git clone https://github.com/cloud-custodian/cloud-custodian.git + pip install -e ./cloud-custodian + pip install -e ./cloud-custodian/tools/c7n_gcp .. _gcp_authenticate: diff --git a/docs/source/quickstart/advanced.rst b/docs/source/quickstart/advanced.rst index 2fcdb0f2b09..4e8201fa38f 100644 --- a/docs/source/quickstart/advanced.rst +++ b/docs/source/quickstart/advanced.rst @@ -23,7 +23,7 @@ order: It is possible to run policies against multiple regions by specifying the ``--region`` flag multiple times:: - $ custodian run -s out --region us-east-1 --region us-west-1 policy.yml + custodian run -s out --region us-east-1 --region us-west-1 policy.yml If a supplied region does not support the resource for a given policy that region will be skipped. @@ -33,7 +33,7 @@ should run against `all applicable regions `_ for the policy's resource:: - $ custodian run -s out --region all policy.yml + custodian run -s out --region all policy.yml Note: when running reports against multiple regions the output is placed in a different directory than when running against a single region. See the multi-region reporting @@ -48,7 +48,7 @@ When running against multiple regions the output files are placed in a different location that when running against a single region. When generating a report, specify multiple regions the same way as with the ``run`` command:: - $ custodian report -s out --region us-east-1 --region-us-west-1 policy.yml + custodian report -s out --region us-east-1 --region-us-west-1 policy.yml A region column will be added to reports generated that include multiple regions to indicate which region each row is from. @@ -177,7 +177,7 @@ Max resources can also be specified as an absolute number using `max-resources` specified on a policy. When executing if the limit is exceeded, policy execution is stopped before taking any actions:: - $ custodian run -s out policy.yml + custodian run -s out policy.yml custodian.commands:ERROR policy: log-delete exceeded resource limit: 2.5% found: 1 total: 1 If metrics are being published :code:`(-m/--metrics)` then an additional @@ -220,14 +220,14 @@ use the ``--field`` flag, which can be supplied multiple times. The syntax is: ``--field KEY=VALUE`` where KEY is the header name (what will print at the top of the column) and the VALUE is a JMESPath expression accessing the desired data:: - $ custodian report -s out --field Image=ImageId policy.yml + custodian report -s out --field Image=ImageId policy.yml If hyphens or other special characters are present in the JMESPath it may require quoting, e.g.:: - $ custodian report -s . --field "AccessKey1LastRotated"='"c7n:credential-report".access_keys[0].last_rotated' policy.yml + custodian report -s . --field "AccessKey1LastRotated"='"c7n:credential-report".access_keys[0].last_rotated' policy.yml To remove the default fields and only add the desired ones, the ``--no-default-fields`` flag can be specified and then specific fields can be added in, e.g.:: - $ custodian report -s out --no-default-fields --field Image=ImageId policy.yml + custodian report -s out --no-default-fields --field Image=ImageId policy.yml diff --git a/docs/source/quickstart/index.rst b/docs/source/quickstart/index.rst index 7ae48ad468f..81e7fda5b51 100644 --- a/docs/source/quickstart/index.rst +++ b/docs/source/quickstart/index.rst @@ -10,6 +10,7 @@ See also the readme in the GitHub repository. * :ref:`cloud-providers` * :ref:`monitor-cc` * :ref:`tab-completion` +* :ref:`community` .. _install-cc: @@ -249,6 +250,20 @@ Run: Now launch a new shell (or refresh your bash environment by sourcing the appropriate file). +.. _community + +Community Resources +------------------- + +We have a regular community meeting that is open to all users and developers of +every skill level. Joining the `mailing list +https://groups.google.com/forum/#!forum/cloud-custodian`_ will automatically send +you a meeting invite. See the notes below for more technical information on +joining the meeting. + + * `Community Meeting Videos `_ + * `Community Meeting Notes Archive `_ + Troubleshooting +++++++++++++++ @@ -262,3 +277,6 @@ If you have other errors, or for tcsh support, see `the argcomplete docs If you are invoking `custodian` via the `python` executable tab completion will not work. You must invoke `custodian` directly. + + + diff --git a/poetry.lock b/poetry.lock index 47aef3c3d78..824fab5535d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -49,11 +49,11 @@ wrapt = "*" [[package]] name = "bleach" -version = "3.3.0" +version = "4.0.0" description = "An easy safelist-based HTML-sanitizing tool." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.6" [package.dependencies] packaging = "*" @@ -62,24 +62,27 @@ webencodings = "*" [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -99,7 +102,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.5" +version = "1.14.6" description = "Foreign Function Interface for Python calling C code." category = "dev" optional = false @@ -109,12 +112,15 @@ python-versions = "*" pycparser = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "click" @@ -205,15 +211,15 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "main" optional = false @@ -238,14 +244,15 @@ python-versions = "*" [[package]] name = "jeepney" -version = "0.6.0" +version = "0.7.1" description = "Low-level, pure Python DBus protocol wrapper." category = "dev" optional = false python-versions = ">=3.6" [package.extras] -test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio"] +test = ["pytest", "pytest-trio", "pytest-asyncio", "testpath", "trio", "async-timeout"] +trio = ["trio", "async-generator"] [[package]] name = "jmespath" @@ -341,18 +348,18 @@ python-versions = ">=3.6" [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" [[package]] name = "pkginfo" -version = "1.7.0" +version = "1.7.1" description = "Query metadatdata from sdists / bdists / installed packages." category = "dev" optional = false @@ -561,7 +568,7 @@ testing = ["filelock"] [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "main" optional = false @@ -613,21 +620,21 @@ md = ["cmarkgfm (>=0.5.0,<0.6.0)"] [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "requests-toolbelt" @@ -653,11 +660,11 @@ idna2008 = ["idna"] [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "main" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -714,12 +721,15 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "tqdm" -version = "4.61.1" +version = "4.62.0" description = "Fast, Extensible Progress Meter" category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + [package.extras] dev = ["py-make (>=0.1.0)", "twine", "wheel"] notebook = ["ipywidgets (>=6)"] @@ -727,7 +737,7 @@ telegram = ["requests"] [[package]] name = "twine" -version = "3.4.1" +version = "3.4.2" description = "Collection of utilities for publishing packages on PyPI" category = "dev" optional = false @@ -810,7 +820,7 @@ typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false @@ -818,7 +828,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -843,63 +853,71 @@ aws-xray-sdk = [ {file = "aws_xray_sdk-2.8.0-py2.py3-none-any.whl", hash = "sha256:487e44a2e0b2a5b994f7db5fad3a8115f1ea238249117a119bce8ca2750661bd"}, ] bleach = [ - {file = "bleach-3.3.0-py2.py3-none-any.whl", hash = "sha256:6123ddc1052673e52bab52cdc955bcb57a015264a1c57d37bea2f6b817af0125"}, - {file = "bleach-3.3.0.tar.gz", hash = "sha256:98b3170739e5e83dd9dc19633f074727ad848cbedb6026708c8ac2d3b697a433"}, + {file = "bleach-4.0.0-py2.py3-none-any.whl", hash = "sha256:c1685a132e6a9a38bf93752e5faab33a9517a6c0bb2f37b785e47bf253bdb51d"}, + {file = "bleach-4.0.0.tar.gz", hash = "sha256:ffa9221c6ac29399cc50fcc33473366edd0cf8d5e2cbbbb63296dc327fb67cc8"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] certifi = [ {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] cffi = [ - {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, - {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, - {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, - {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, - {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, - {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, - {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, - {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, - {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, - {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, - {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, - {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, - {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, - {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, - {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, - {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, - {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, - {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, - {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, -] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, + {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, + {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, + {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, + {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, + {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, + {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, + {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, + {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, + {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, + {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, + {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, + {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, + {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, + {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, + {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, + {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, + {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, + {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, + {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, +] +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] click = [ {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, @@ -993,20 +1011,20 @@ future = [ {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, ] jeepney = [ - {file = "jeepney-0.6.0-py3-none-any.whl", hash = "sha256:aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae"}, - {file = "jeepney-0.6.0.tar.gz", hash = "sha256:7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"}, + {file = "jeepney-0.7.1-py3-none-any.whl", hash = "sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac"}, + {file = "jeepney-0.7.1.tar.gz", hash = "sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, @@ -1076,12 +1094,12 @@ multidict = [ {file = "multidict-5.1.0.tar.gz", hash = "sha256:25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pkginfo = [ - {file = "pkginfo-1.7.0-py2.py3-none-any.whl", hash = "sha256:9fdbea6495622e022cc72c2e5e1b735218e4ffb2a2a69cde2694a6c1f16afb75"}, - {file = "pkginfo-1.7.0.tar.gz", hash = "sha256:029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"}, + {file = "pkginfo-1.7.1-py2.py3-none-any.whl", hash = "sha256:37ecd857b47e5f55949c41ed061eb51a0bee97a87c969219d144c0e023982779"}, + {file = "pkginfo-1.7.1.tar.gz", hash = "sha256:e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd"}, ] placebo = [ {file = "placebo-0.9.0.tar.gz", hash = "sha256:03157f8527bbc2965b71b88f4a139ef8038618b346787f20d63e3c5da541b047"}, @@ -1195,8 +1213,8 @@ pytest-xdist = [ {file = "pytest_xdist-1.34.0-py2.py3-none-any.whl", hash = "sha256:ba5d10729372d65df3ac150872f9df5d2ed004a3b0d499cc0164aafedd8c7b66"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pywin32 = [ {file = "pywin32-301-cp35-cp35m-win32.whl", hash = "sha256:93367c96e3a76dfe5003d8291ae16454ca7d84bb24d721e0b74a07610b7be4a7"}, @@ -1242,8 +1260,8 @@ readme-renderer = [ {file = "readme_renderer-29.0.tar.gz", hash = "sha256:92fd5ac2bf8677f310f3303aa4bce5b9d5f9f2094ab98c29f13791d7b805a3db"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] requests-toolbelt = [ {file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"}, @@ -1254,8 +1272,8 @@ rfc3986 = [ {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] secretstorage = [ {file = "SecretStorage-3.3.1-py3-none-any.whl", hash = "sha256:422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f"}, @@ -1277,12 +1295,12 @@ toml = [ {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] tqdm = [ - {file = "tqdm-4.61.1-py2.py3-none-any.whl", hash = "sha256:aa0c29f03f298951ac6318f7c8ce584e48fa22ec26396e6411e43d038243bdb2"}, - {file = "tqdm-4.61.1.tar.gz", hash = "sha256:24be966933e942be5f074c29755a95b315c69a91f839a29139bf26ffffe2d3fd"}, + {file = "tqdm-4.62.0-py2.py3-none-any.whl", hash = "sha256:706dea48ee05ba16e936ee91cb3791cd2ea6da348a0e50b46863ff4363ff4340"}, + {file = "tqdm-4.62.0.tar.gz", hash = "sha256:3642d483b558eec80d3c831e23953582c34d7e4540db86d9e5ed9dad238dabc6"}, ] twine = [ - {file = "twine-3.4.1-py3-none-any.whl", hash = "sha256:16f706f2f1687d7ce30e7effceee40ed0a09b7c33b9abb5ef6434e5551565d83"}, - {file = "twine-3.4.1.tar.gz", hash = "sha256:a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"}, + {file = "twine-3.4.2-py3-none-any.whl", hash = "sha256:087328e9bb405e7ce18527a2dca4042a84c7918658f951110b38bc135acab218"}, + {file = "twine-3.4.2.tar.gz", hash = "sha256:4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.0-py2-none-any.whl", hash = "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497"}, @@ -1344,6 +1362,6 @@ yarl = [ {file = "yarl-1.6.3.tar.gz", hash = "sha256:8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/pyproject.toml b/pyproject.toml index a3243c106b5..858ad86d90a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" authors = ["Cloud Custodian Project"] readme = "README.md" diff --git a/requirements.txt b/requirements.txt index a14e243c16d..7e66e44853e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,25 +2,25 @@ argcomplete==1.12.3 atomicwrites==1.4.0; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.4.0" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") attrs==21.2.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" aws-xray-sdk==2.8.0 -bleach==3.3.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -boto3==1.17.102; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -botocore==1.20.102; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -certifi==2021.5.30; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -cffi==1.14.5; sys_platform == "linux" and python_version >= "3.6" -chardet==4.0.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" +bleach==4.0.0; python_version >= "3.6" +boto3==1.18.21; python_version >= "3.6" +botocore==1.21.21; python_version >= "3.6" +certifi==2021.5.30; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" +cffi==1.14.6; sys_platform == "linux" and python_version >= "3.6" +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3.6" click==7.1.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -colorama==0.4.4; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.5.0" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") +colorama==0.4.4; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "win32" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") and platform_system == "Windows" or sys_platform == "win32" and python_version >= "3.6" and python_full_version >= "3.5.0" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6") and platform_system == "Windows" coverage==5.5; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4") cryptography==3.4.7; sys_platform == "linux" and python_version >= "3.6" docutils==0.17.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" execnet==1.9.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.5.0" flake8==3.9.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") future==0.18.2; python_version >= "2.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" -idna==2.10; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -importlib-metadata==4.6.0; python_version >= "3.6" +idna==3.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" +importlib-metadata==4.6.4; python_version >= "3.6" iniconfig==1.1.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -jeepney==0.6.0; sys_platform == "linux" and python_version >= "3.6" -jmespath==0.10.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.0" +jeepney==0.7.1; sys_platform == "linux" and python_version >= "3.6" +jmespath==0.10.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.3.0" and python_version >= "3.6" and python_version < "4.0" jsonpatch==1.32; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") jsonpointer==2.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" jsonschema==3.2.0 @@ -28,8 +28,8 @@ keyring==23.0.1; python_version >= "3.6" mccabe==0.6.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" mock==4.0.3; python_version >= "3.6" multidict==5.1.0; python_version >= "3.6" -packaging==20.9; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -pkginfo==1.7.0; python_version >= "3.6" +packaging==21.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" +pkginfo==1.7.1; python_version >= "3.6" placebo==0.9.0 pluggy==0.13.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" portalocker==1.7.1; python_version >= "3.6" and python_version < "4.0" @@ -39,7 +39,7 @@ pycodestyle==2.7.0; python_version >= "2.7" and python_full_version < "3.0.0" or pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" and sys_platform == "linux" or sys_platform == "linux" and python_version >= "3.6" and python_full_version >= "3.4.0" pyflakes==2.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" pygments==2.9.0; python_version >= "3.6" -pyparsing==2.4.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" +pyparsing==2.4.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" pyrsistent==0.18.0; python_version >= "3.6" pytest-cov==2.12.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") pytest-forked==1.3.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.5.0" @@ -47,26 +47,26 @@ pytest-sugar==0.9.4 pytest-terraform==0.5.3; python_version >= "3.6" and python_version < "4.0" pytest-xdist==1.34.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") pytest==6.2.4; python_version >= "3.6" -python-dateutil==2.8.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") +python-dateutil==2.8.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") pywin32-ctypes==0.2.0; sys_platform == "win32" and python_version >= "3.6" pywin32==301; python_version >= "3.6" and python_version < "4.0" and platform_system == "Windows" pyyaml==5.4.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") readme-renderer==29.0; python_version >= "3.6" requests-toolbelt==0.9.1; python_version >= "3.6" -requests==2.25.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" +requests==2.26.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" rfc3986==1.5.0; python_version >= "3.6" -s3transfer==0.4.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +s3transfer==0.5.0; python_version >= "3.6" secretstorage==3.3.1; sys_platform == "linux" and python_version >= "3.6" -six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.6.0" and python_version >= "3.6" and python_version < "4.0" +six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.6" and python_version < "4.0" tabulate==0.8.9 termcolor==1.1.0 toml==0.10.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -tqdm==4.61.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" -twine==3.4.1; python_version >= "3.6" +tqdm==4.62.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" +twine==3.4.2; python_version >= "3.6" typing-extensions==3.10.0.0; python_version < "3.8" and python_version >= "3.6" urllib3==1.26.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6" vcrpy==4.1.1; python_version >= "3.5" -webencodings==0.5.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" +webencodings==0.5.1; python_version >= "3.6" wrapt==1.12.1; python_version >= "3.5" yarl==1.6.3; python_version >= "3.6" -zipp==3.4.1; python_version >= "3.6" and python_version < "3.8" +zipp==3.5.0; python_version >= "3.6" and python_version < "3.8" diff --git a/setup.py b/setup.py index e61b21e3603..2f9b9a9a958 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ setup_kwargs = { 'name': 'c7n', - 'version': '0.9.13', + 'version': '0.9.14', 'description': 'Cloud Custodian - Policy Rules Engine', 'license': 'Apache-2.0', 'classifiers': [ @@ -36,7 +36,7 @@ 'Topic :: System :: Systems Administration', 'Topic :: System :: Distributed Computing' ], - 'long_description': 'Cloud Custodian\n=================\n\n

Cloud Custodian Logo

\n\n---\n\n[![](https://badges.gitter.im/cloud-custodian/cloud-custodian.svg)](https://gitter.im/cloud-custodian/cloud-custodian?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n[![CI](https://github.com/cloud-custodian/cloud-custodian/workflows/CI/badge.svg?event=push)](https://github.com/cloud-custodian/cloud-custodian/actions?query=workflow%3ACI+branch%3Amaster+event%3Apush)\n[![](https://dev.azure.com/cloud-custodian/cloud-custodian/_apis/build/status/Custodian%20-%20CI?branchName=master)](https://dev.azure.com/cloud-custodian/cloud-custodian/_build)\n[![](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)\n[![](https://codecov.io/gh/cloud-custodian/cloud-custodian/branch/master/graph/badge.svg)](https://codecov.io/gh/cloud-custodian/cloud-custodian)\n[![](https://requires.io/github/cloud-custodian/cloud-custodian/requirements.svg?branch=master)](https://requires.io/github/cloud-custodian/cloud-custodian/requirements/?branch=master)\n[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3402/badge)](https://bestpractices.coreinfrastructure.org/projects/3402)\n\nCloud Custodian is a rules engine for managing public cloud accounts and\nresources. It allows users to define policies to enable a well managed\ncloud infrastructure, that\\\'s both secure and cost optimized. It\nconsolidates many of the adhoc scripts organizations have into a\nlightweight and flexible tool, with unified metrics and reporting.\n\nCustodian can be used to manage AWS, Azure, and GCP environments by\nensuring real time compliance to security policies (like encryption and\naccess requirements), tag policies, and cost management via garbage\ncollection of unused resources and off-hours resource management.\n\nCustodian policies are written in simple YAML configuration files that\nenable users to specify policies on a resource type (EC2, ASG, Redshift,\nCosmosDB, PubSub Topic) and are constructed from a vocabulary of filters\nand actions.\n\nIt integrates with the cloud native serverless capabilities of each\nprovider to provide for real time enforcement of policies with builtin\nprovisioning. Or it can be run as a simple cron job on a server to\nexecute against large existing fleets.\n\nCloud Custodian is a CNCF Sandbox project, lead by a community of hundreds\nof contributors.\n\nFeatures\n--------\n\n- Comprehensive support for public cloud services and resources with a\n rich library of actions and filters to build policies with.\n- Supports arbitrary filtering on resources with nested boolean\n conditions.\n- Dry run any policy to see what it would do.\n- Automatically provisions serverless functions and event sources (\n AWS CloudWatchEvents, AWS Config Rules, Azure EventGrid, GCP\n AuditLog & Pub/Sub, etc)\n- Cloud provider native metrics outputs on resources that matched a\n policy\n- Structured outputs into cloud native object storage of which\n resources matched a policy.\n- Intelligent cache usage to minimize api calls.\n- Supports multi-account/subscription/project usage.\n- Battle-tested - in production on some very large cloud environments.\n\nLinks\n-----\n\n- [Homepage](http://cloudcustodian.io)\n- [Docs](http://cloudcustodian.io/docs/index.html)\n- [Developer Install](https://cloudcustodian.io/docs/developer/installing.html)\n- [Presentations](https://www.google.com/search?q=cloud+custodian&source=lnms&tbm=vid)\n\nQuick Install\n-------------\n\n```shell\n$ python3 -m venv custodian\n$ source custodian/bin/activate\n(custodian) $ pip install c7n\n```\n\n\nUsage\n-----\n\nThe first step to using Cloud Custodian is writing a YAML file\ncontaining the policies that you want to run. Each policy specifies\nthe resource type that the policy will run on, a set of filters which\ncontrol resources will be affected by this policy, actions which the policy\nwith take on the matched resources, and a mode which controls which\nhow the policy will execute.\n\nThe best getting started guides are the cloud provider specific tutorials.\n\n - [AWS Getting Started](https://cloudcustodian.io/docs/aws/gettingstarted.html)\n - [Azure Getting Started](https://cloudcustodian.io/docs/azure/gettingstarted.html)\n - [GCP Getting Started](https://cloudcustodian.io/docs/gcp/gettingstarted.html)\n\nAs a quick walk through, below are some sample policies for AWS resources.\n\n 1. will enforce that no S3 buckets have cross-account access enabled.\n 1. will terminate any newly launched EC2 instance that do not have an encrypted EBS volume.\n 1. will tag any EC2 instance that does not have the follow tags\n "Environment", "AppId", and either "OwnerContact" or "DeptID" to\n be stopped in four days.\n\n```yaml\npolicies:\n - name: s3-cross-account\n description: |\n Checks S3 for buckets with cross-account access and\n removes the cross-account access.\n resource: aws.s3\n region: us-east-1\n filters:\n - type: cross-account\n actions:\n - type: remove-statements\n statement_ids: matched\n\n - name: ec2-require-non-public-and-encrypted-volumes\n resource: aws.ec2\n description: |\n Provision a lambda and cloud watch event target\n that looks at all new instances and terminates those with\n unencrypted volumes.\n mode:\n type: cloudtrail\n role: CloudCustodian-QuickStart\n events:\n - RunInstances\n filters:\n - type: ebs\n key: Encrypted\n value: false\n actions:\n - terminate\n\n - name: tag-compliance\n resource: aws.ec2\n description: |\n Schedule a resource that does not meet tag compliance policies to be stopped in four days. Note a separate policy using the`marked-for-op` filter is required to actually stop the instances after four days.\n filters:\n - State.Name: running\n - "tag:Environment": absent\n - "tag:AppId": absent\n - or:\n - "tag:OwnerContact": absent\n - "tag:DeptID": absent\n actions:\n - type: mark-for-op\n op: stop\n days: 4\n```\n\nYou can validate, test, and run Cloud Custodian with the example policy with these commands:\n\n```shell\n# Validate the configuration (note this happens by default on run)\n$ custodian validate policy.yml\n\n# Dryrun on the policies (no actions executed) to see what resources\n# match each policy.\n$ custodian run --dryrun -s out policy.yml\n\n# Run the policy\n$ custodian run -s out policy.yml\n```\n\nYou can run Cloud Custodian via Docker as well:\n\n```shell\n# Download the image\n$ docker pull cloudcustodian/c7n\n$ mkdir output\n\n# Run the policy\n#\n# This will run the policy using only the environment variables for authentication\n$ docker run -it \\\n -v $(pwd)/output:/home/custodian/output \\\n -v $(pwd)/policy.yml:/home/custodian/policy.yml \\\n --env-file <(env | grep "^AWS\\|^AZURE\\|^GOOGLE") \\\n cloudcustodian/c7n run -v -s /home/custodian/output /home/custodian/policy.yml\n\n# Run the policy (using AWS\'s generated credentials from STS)\n#\n# NOTE: We mount the ``.aws/credentials`` and ``.aws/config`` directories to\n# the docker container to support authentication to AWS using the same credentials\n# credentials that are available to the local user if authenticating with STS.\n\n$ docker run -it \\\n -v $(pwd)/output:/home/custodian/output \\\n -v $(pwd)/policy.yml:/home/custodian/policy.yml \\\n -v $(cd ~ && pwd)/.aws/credentials:/home/custodian/.aws/credentials \\\n -v $(cd ~ && pwd)/.aws/config:/home/custodian/.aws/config \\\n --env-file <(env | grep "^AWS") \\\n cloudcustodian/c7n run -v -s /home/custodian/output /home/custodian/policy.yml\n```\n\nThe [custodian cask\ntool](https://cloudcustodian.io/docs/tools/cask.html) is a go binary\nthat provides a transparent front end to docker that mirors the regular\ncustodian cli, but automatically takes care of mounting volumes.\n\nConsult the documentation for additional information, or reach out on gitter.\n\nCloud Provider Specific Help\n----------------------------\n\nFor specific instructions for AWS, Azure, and GCP, visit the relevant getting started page.\n\n- [AWS](https://cloudcustodian.io/docs/aws/gettingstarted.html)\n- [Azure](https://cloudcustodian.io/docs/azure/gettingstarted.html)\n- [GCP](https://cloudcustodian.io/docs/gcp/gettingstarted.html)\n\nGet Involved\n------------\n\n- [Gitter](https://gitter.im/cloud-custodian/cloud-custodian)\n- [GitHub](https://github.com/cloud-custodian/cloud-custodian)\n- [Mailing List](https://groups.google.com/forum/#!forum/cloud-custodian)\n- [Reddit](https://reddit.com/r/cloudcustodian)\n- [StackOverflow](https://stackoverflow.com/questions/tagged/cloudcustodian)\n\nAdditional Tools\n----------------\n\nThe Custodian project also develops and maintains a suite of additional\ntools here\n:\n\n- [**_Org_:**](https://cloudcustodian.io/docs/tools/c7n-org.html) Multi-account policy execution.\n\n- [**_PolicyStream_:**](https://cloudcustodian.io/docs/tools/c7n-policystream.html) Git history as stream of logical policy changes.\n\n- [**_Salactus_:**](https://cloudcustodian.io/docs/tools/c7n-salactus.html) Scale out s3 scanning.\n\n- [**_Mailer_:**](https://cloudcustodian.io/docs/tools/c7n-mailer.html) A reference implementation of sending messages to users to notify them.\n\n- [**_Trail Creator_:**](https://cloudcustodian.io/docs/tools/c7n-trailcreator.html) Retroactive tagging of resources creators from CloudTrail\n\n- **_TrailDB_:** Cloudtrail indexing and time series generation for dashboarding.\n\n- [**_LogExporter_:**](https://cloudcustodian.io/docs/tools/c7n-logexporter.html) Cloud watch log exporting to s3\n\n- [**_Cask_:**](https://cloudcustodian.io/docs/tools/cask.html) Easy custodian exec via docker\n\n- [**_Guardian_:**](https://cloudcustodian.io/docs/tools/c7n-guardian.html) Automated multi-account Guard Duty setup\n\n- [**_Omni SSM_:**](https://cloudcustodian.io/docs/tools/omnissm.html) EC2 Systems Manager Automation\n\n- [**_Mugc_:**](https://github.com/cloud-custodian/cloud-custodian/tree/master/tools/ops#mugc) A utility used to clean up Cloud Custodian Lambda policies that are deployed in an AWS environment.\n\nContributing\n------------\n\nSee \n\nSecurity\n--------\n\nIf you\'ve found a security related issue, a vulnerability, or a\npotential vulnerability in Cloud Custodian please let the Cloud\n[Custodian Security Team](mailto:security@cloudcustodian.io) know with\nthe details of the vulnerability. We\'ll send a confirmation email to\nacknowledge your report, and we\'ll send an additional email when we\'ve\nidentified the issue positively or negatively.\n\nCode of Conduct\n---------------\n\nThis project adheres to the [Open Code of Conduct](https://developer.capitalone.com/resources/code-of-conduct). By\nparticipating, you are expected to honor this code.\n\n', + 'long_description': 'Cloud Custodian\n=================\n\n

Cloud Custodian Logo

\n\n---\n\n[![](https://badges.gitter.im/cloud-custodian/cloud-custodian.svg)](https://gitter.im/cloud-custodian/cloud-custodian?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n[![CI](https://github.com/cloud-custodian/cloud-custodian/workflows/CI/badge.svg?event=push)](https://github.com/cloud-custodian/cloud-custodian/actions?query=workflow%3ACI+branch%3Amaster+event%3Apush)\n[![](https://dev.azure.com/cloud-custodian/cloud-custodian/_apis/build/status/Custodian%20-%20CI?branchName=master)](https://dev.azure.com/cloud-custodian/cloud-custodian/_build)\n[![](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)\n[![](https://codecov.io/gh/cloud-custodian/cloud-custodian/branch/master/graph/badge.svg)](https://codecov.io/gh/cloud-custodian/cloud-custodian)\n[![](https://requires.io/github/cloud-custodian/cloud-custodian/requirements.svg?branch=master)](https://requires.io/github/cloud-custodian/cloud-custodian/requirements/?branch=master)\n[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3402/badge)](https://bestpractices.coreinfrastructure.org/projects/3402)\n\nCloud Custodian is a rules engine for managing public cloud accounts and\nresources. It allows users to define policies to enable a well managed\ncloud infrastructure, that\\\'s both secure and cost optimized. It\nconsolidates many of the adhoc scripts organizations have into a\nlightweight and flexible tool, with unified metrics and reporting.\n\nCustodian can be used to manage AWS, Azure, and GCP environments by\nensuring real time compliance to security policies (like encryption and\naccess requirements), tag policies, and cost management via garbage\ncollection of unused resources and off-hours resource management.\n\nCustodian policies are written in simple YAML configuration files that\nenable users to specify policies on a resource type (EC2, ASG, Redshift,\nCosmosDB, PubSub Topic) and are constructed from a vocabulary of filters\nand actions.\n\nIt integrates with the cloud native serverless capabilities of each\nprovider to provide for real time enforcement of policies with builtin\nprovisioning. Or it can be run as a simple cron job on a server to\nexecute against large existing fleets.\n\nCloud Custodian is a CNCF Sandbox project, lead by a community of hundreds\nof contributors.\n\nFeatures\n--------\n\n- Comprehensive support for public cloud services and resources with a\n rich library of actions and filters to build policies with.\n- Supports arbitrary filtering on resources with nested boolean\n conditions.\n- Dry run any policy to see what it would do.\n- Automatically provisions serverless functions and event sources (\n AWS CloudWatchEvents, AWS Config Rules, Azure EventGrid, GCP\n AuditLog & Pub/Sub, etc)\n- Cloud provider native metrics outputs on resources that matched a\n policy\n- Structured outputs into cloud native object storage of which\n resources matched a policy.\n- Intelligent cache usage to minimize api calls.\n- Supports multi-account/subscription/project usage.\n- Battle-tested - in production on some very large cloud environments.\n\nLinks\n-----\n\n- [Homepage](http://cloudcustodian.io)\n- [Docs](http://cloudcustodian.io/docs/index.html)\n- [Developer Install](https://cloudcustodian.io/docs/developer/installing.html)\n- [Presentations](https://www.google.com/search?q=cloud+custodian&source=lnms&tbm=vid)\n\nQuick Install\n-------------\n\n```shell\n$ python3 -m venv custodian\n$ source custodian/bin/activate\n(custodian) $ pip install c7n\n```\n\n\nUsage\n-----\n\nThe first step to using Cloud Custodian is writing a YAML file\ncontaining the policies that you want to run. Each policy specifies\nthe resource type that the policy will run on, a set of filters which\ncontrol resources will be affected by this policy, actions which the policy\nwith take on the matched resources, and a mode which controls which\nhow the policy will execute.\n\nThe best getting started guides are the cloud provider specific tutorials.\n\n - [AWS Getting Started](https://cloudcustodian.io/docs/aws/gettingstarted.html)\n - [Azure Getting Started](https://cloudcustodian.io/docs/azure/gettingstarted.html)\n - [GCP Getting Started](https://cloudcustodian.io/docs/gcp/gettingstarted.html)\n\nAs a quick walk through, below are some sample policies for AWS resources.\n\n 1. will enforce that no S3 buckets have cross-account access enabled.\n 1. will terminate any newly launched EC2 instance that do not have an encrypted EBS volume.\n 1. will tag any EC2 instance that does not have the follow tags\n "Environment", "AppId", and either "OwnerContact" or "DeptID" to\n be stopped in four days.\n\n```yaml\npolicies:\n - name: s3-cross-account\n description: |\n Checks S3 for buckets with cross-account access and\n removes the cross-account access.\n resource: aws.s3\n region: us-east-1\n filters:\n - type: cross-account\n actions:\n - type: remove-statements\n statement_ids: matched\n\n - name: ec2-require-non-public-and-encrypted-volumes\n resource: aws.ec2\n description: |\n Provision a lambda and cloud watch event target\n that looks at all new instances and terminates those with\n unencrypted volumes.\n mode:\n type: cloudtrail\n role: CloudCustodian-QuickStart\n events:\n - RunInstances\n filters:\n - type: ebs\n key: Encrypted\n value: false\n actions:\n - terminate\n\n - name: tag-compliance\n resource: aws.ec2\n description: |\n Schedule a resource that does not meet tag compliance policies to be stopped in four days. Note a separate policy using the`marked-for-op` filter is required to actually stop the instances after four days.\n filters:\n - State.Name: running\n - "tag:Environment": absent\n - "tag:AppId": absent\n - or:\n - "tag:OwnerContact": absent\n - "tag:DeptID": absent\n actions:\n - type: mark-for-op\n op: stop\n days: 4\n```\n\nYou can validate, test, and run Cloud Custodian with the example policy with these commands:\n\n```shell\n# Validate the configuration (note this happens by default on run)\n$ custodian validate policy.yml\n\n# Dryrun on the policies (no actions executed) to see what resources\n# match each policy.\n$ custodian run --dryrun -s out policy.yml\n\n# Run the policy\n$ custodian run -s out policy.yml\n```\n\nYou can run Cloud Custodian via Docker as well:\n\n```shell\n# Download the image\n$ docker pull cloudcustodian/c7n\n$ mkdir output\n\n# Run the policy\n#\n# This will run the policy using only the environment variables for authentication\n$ docker run -it \\\n -v $(pwd)/output:/home/custodian/output \\\n -v $(pwd)/policy.yml:/home/custodian/policy.yml \\\n --env-file <(env | grep "^AWS\\|^AZURE\\|^GOOGLE") \\\n cloudcustodian/c7n run -v -s /home/custodian/output /home/custodian/policy.yml\n\n# Run the policy (using AWS\'s generated credentials from STS)\n#\n# NOTE: We mount the ``.aws/credentials`` and ``.aws/config`` directories to\n# the docker container to support authentication to AWS using the same credentials\n# credentials that are available to the local user if authenticating with STS.\n\n$ docker run -it \\\n -v $(pwd)/output:/home/custodian/output \\\n -v $(pwd)/policy.yml:/home/custodian/policy.yml \\\n -v $(cd ~ && pwd)/.aws/credentials:/home/custodian/.aws/credentials \\\n -v $(cd ~ && pwd)/.aws/config:/home/custodian/.aws/config \\\n --env-file <(env | grep "^AWS") \\\n cloudcustodian/c7n run -v -s /home/custodian/output /home/custodian/policy.yml\n```\n\nThe [custodian cask\ntool](https://cloudcustodian.io/docs/tools/cask.html) is a go binary\nthat provides a transparent front end to docker that mirors the regular\ncustodian cli, but automatically takes care of mounting volumes.\n\nConsult the documentation for additional information, or reach out on gitter.\n\nCloud Provider Specific Help\n----------------------------\n\nFor specific instructions for AWS, Azure, and GCP, visit the relevant getting started page.\n\n- [AWS](https://cloudcustodian.io/docs/aws/gettingstarted.html)\n- [Azure](https://cloudcustodian.io/docs/azure/gettingstarted.html)\n- [GCP](https://cloudcustodian.io/docs/gcp/gettingstarted.html)\n\nGet Involved\n------------\n\n- [GitHub](https://github.com/cloud-custodian/cloud-custodian) - (This page)\n- [Gitter](https://gitter.im/cloud-custodian/cloud-custodian) - Real time chat if you\'re looking for help\n- [Mailing List](https://groups.google.com/forum/#!forum/cloud-custodian) - Our project mailing list, subscribe here for important project announcements, feel free to ask questions\n- [Reddit](https://reddit.com/r/cloudcustodian) - Our subreddit\n- [StackOverflow](https://stackoverflow.com/questions/tagged/cloudcustodian) - Q&A site for developers, we keep an eye on the `cloudcustodian` tag\n- [YouTube Channel](https://www.youtube.com/channel/UCdeXCdFLluylWnFfS0-jbDA/) - We\'re working on adding tutorials and other useful information, as well as meeting videos\n\nCommunity Resources\n-------------------\n\nWe have a regular community meeting that is open to all users and developers of every skill level.\nJoining the [mailing list](https://groups.google.com/forum/#!forum/cloud-custodian) will automatically send you a meeting invite. \nSee the notes below for more technical information on joining the meeting. \n\n- [Community Meeting Videos](https://www.youtube.com/watch?v=qy250y0UT-4&list=PLJ2Un8H_N5uBeAAWK95SnWvm_AuNJ8q2x)\n- [Community Meeting Notes Archive](https://github.com/cloud-custodian/community/discussions)\n\n\n\nAdditional Tools\n----------------\n\nThe Custodian project also develops and maintains a suite of additional\ntools here\n:\n\n- [**_Org_:**](https://cloudcustodian.io/docs/tools/c7n-org.html) Multi-account policy execution.\n\n- [**_PolicyStream_:**](https://cloudcustodian.io/docs/tools/c7n-policystream.html) Git history as stream of logical policy changes.\n\n- [**_Salactus_:**](https://cloudcustodian.io/docs/tools/c7n-salactus.html) Scale out s3 scanning.\n\n- [**_Mailer_:**](https://cloudcustodian.io/docs/tools/c7n-mailer.html) A reference implementation of sending messages to users to notify them.\n\n- [**_Trail Creator_:**](https://cloudcustodian.io/docs/tools/c7n-trailcreator.html) Retroactive tagging of resources creators from CloudTrail\n\n- **_TrailDB_:** Cloudtrail indexing and time series generation for dashboarding.\n\n- [**_LogExporter_:**](https://cloudcustodian.io/docs/tools/c7n-logexporter.html) Cloud watch log exporting to s3\n\n- [**_Cask_:**](https://cloudcustodian.io/docs/tools/cask.html) Easy custodian exec via docker\n\n- [**_Guardian_:**](https://cloudcustodian.io/docs/tools/c7n-guardian.html) Automated multi-account Guard Duty setup\n\n- [**_Omni SSM_:**](https://cloudcustodian.io/docs/tools/omnissm.html) EC2 Systems Manager Automation\n\n- [**_Mugc_:**](https://github.com/cloud-custodian/cloud-custodian/tree/master/tools/ops#mugc) A utility used to clean up Cloud Custodian Lambda policies that are deployed in an AWS environment.\n\nContributing\n------------\n\nSee \n\nSecurity\n--------\n\nIf you\'ve found a security related issue, a vulnerability, or a\npotential vulnerability in Cloud Custodian please let the Cloud\n[Custodian Security Team](mailto:security@cloudcustodian.io) know with\nthe details of the vulnerability. We\'ll send a confirmation email to\nacknowledge your report, and we\'ll send an additional email when we\'ve\nidentified the issue positively or negatively.\n\nCode of Conduct\n---------------\n\nThis project adheres to the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md)\n\nBy participating, you are expected to honor this code.\n\n', 'long_description_content_type': 'text/markdown', 'author': 'Cloud Custodian Project', 'author_email': None, diff --git a/tests/data/iam-actions.json b/tests/data/iam-actions.json index 225206ea8aa..65ba98a1a5b 100644 --- a/tests/data/iam-actions.json +++ b/tests/data/iam-actions.json @@ -2,6 +2,7 @@ "a4b": [ "ApproveSkill", "AssociateContactWithAddressBook", + "AssociateDeviceWithNetworkProfile", "AssociateDeviceWithRoom", "AssociateSkillGroupWithRoom", "AssociateSkillWithSkillGroup", @@ -11,6 +12,8 @@ "CreateBusinessReportSchedule", "CreateConferenceProvider", "CreateContact", + "CreateGatewayGroup", + "CreateNetworkProfile", "CreateProfile", "CreateRoom", "CreateSkillGroup", @@ -20,6 +23,9 @@ "DeleteConferenceProvider", "DeleteContact", "DeleteDevice", + "DeleteDeviceUsageData", + "DeleteGatewayGroup", + "DeleteNetworkProfile", "DeleteProfile", "DeleteRoom", "DeleteRoomSkillParameter", @@ -37,6 +43,9 @@ "GetConferenceProvider", "GetContact", "GetDevice", + "GetGateway", + "GetGatewayGroup", + "GetInvitationConfiguration", "GetNetworkProfile", "GetProfile", "GetRoom", @@ -45,6 +54,8 @@ "ListBusinessReportSchedules", "ListConferenceProviders", "ListDeviceEvents", + "ListGatewayGroups", + "ListGateways", "ListSkills", "ListSkillsStoreCategories", "ListSkillsStoreSkillsByCategory", @@ -52,6 +63,7 @@ "ListTags", "PutConferencePreference", "PutDeviceSetupEvents", + "PutInvitationConfiguration", "PutRoomSkillParameter", "PutSkillAuthorization", "RegisterAVSDevice", @@ -67,6 +79,7 @@ "SearchRooms", "SearchSkillGroups", "SearchUsers", + "SendAnnouncement", "SendInvitation", "StartDeviceSync", "StartSmartHomeApplianceDiscovery", @@ -77,12 +90,16 @@ "UpdateConferenceProvider", "UpdateContact", "UpdateDevice", + "UpdateGateway", + "UpdateGatewayGroup", + "UpdateNetworkProfile", "UpdateProfile", "UpdateRoom", "UpdateSkillGroup" ], "access-analyzer": [ "ApplyArchiveRule", + "CancelPolicyGeneration", "CreateAccessPreview", "CreateAnalyzer", "CreateArchiveRule", @@ -93,13 +110,16 @@ "GetAnalyzer", "GetArchiveRule", "GetFinding", + "GetGeneratedPolicy", "ListAccessPreviewFindings", "ListAccessPreviews", "ListAnalyzedResources", "ListAnalyzers", "ListArchiveRules", "ListFindings", + "ListPolicyGenerations", "ListTagsForResource", + "StartPolicyGeneration", "StartResourceScan", "TagResource", "UntagResource", @@ -204,6 +224,7 @@ "ListBranches", "ListDomainAssociations", "ListJobs", + "ListTagsForResource", "ListWebHooks", "StartDeployment", "StartJob", @@ -233,6 +254,7 @@ "GetBackendAuth", "GetBackendJob", "GetToken", + "ImportBackendAuth", "ListBackendJobs", "RemoveAllBackends", "RemoveBackendConfig", @@ -323,7 +345,8 @@ "TagResource", "UntagResource", "UpdateConnectorProfile", - "UpdateFlow" + "UpdateFlow", + "UseConnectorProfile" ], "application-autoscaling": [ "DeleteScalingPolicy", @@ -337,6 +360,14 @@ "PutScheduledAction", "RegisterScalableTarget" ], + "application-cost-profiler": [ + "DeleteReportDefinition", + "GetReportDefinition", + "ImportApplicationUsage", + "ListReportDefinitions", + "PutReportDefinition", + "UpdateReportDefinition" + ], "applicationinsights": [ "CreateApplication", "CreateComponent", @@ -445,6 +476,31 @@ "UpdateVirtualRouter", "UpdateVirtualService" ], + "apprunner": [ + "AssociateCustomDomain", + "CreateAutoScalingConfiguration", + "CreateConnection", + "CreateService", + "DeleteAutoScalingConfiguration", + "DeleteConnection", + "DeleteService", + "DescribeAutoScalingConfiguration", + "DescribeCustomDomains", + "DescribeOperation", + "DescribeService", + "DisassociateCustomDomain", + "ListAutoScalingConfigurations", + "ListConnections", + "ListOperations", + "ListServices", + "ListTagsForResource", + "PauseService", + "ResumeService", + "StartDeployment", + "TagResource", + "UntagResource", + "UpdateService" + ], "appstream": [ "AssociateFleet", "BatchAssociateUserStack", @@ -496,18 +552,22 @@ "UpdateStack" ], "appsync": [ + "CreateApiCache", "CreateApiKey", "CreateDataSource", "CreateFunction", "CreateGraphqlApi", "CreateResolver", "CreateType", + "DeleteApiCache", "DeleteApiKey", "DeleteDataSource", "DeleteFunction", "DeleteGraphqlApi", "DeleteResolver", "DeleteType", + "FlushApiCache", + "GetApiCache", "GetDataSource", "GetFunction", "GetGraphqlApi", @@ -528,6 +588,7 @@ "StartSchemaCreation", "TagResource", "UntagResource", + "UpdateApiCache", "UpdateApiKey", "UpdateDataSource", "UpdateFunction", @@ -664,6 +725,7 @@ "DeletePolicy", "DeleteScheduledAction", "DeleteTags", + "DeleteWarmPool", "DescribeAccountLimits", "DescribeAdjustmentTypes", "DescribeAutoScalingGroups", @@ -683,6 +745,7 @@ "DescribeScheduledActions", "DescribeTags", "DescribeTerminationPolicyTypes", + "DescribeWarmPool", "DetachInstances", "DetachLoadBalancerTargetGroups", "DetachLoadBalancers", @@ -695,6 +758,7 @@ "PutNotificationConfiguration", "PutScalingPolicy", "PutScheduledUpdateGroupAction", + "PutWarmPool", "RecordLifecycleActionHeartbeat", "ResumeProcesses", "SetDesiredCapacity", @@ -714,22 +778,47 @@ "UpdateScalingPlan" ], "aws-marketplace": [ + "AcceptAgreementApprovalRequest", "AssociateProductsWithPrivateMarketplace", + "BatchMeterUsage", + "CancelAgreementRequest", + "CancelChangeSet", + "CompleteTask", "CreatePrivateMarketplace", - "CreatePrivateMarketplaceProfile", "CreatePrivateMarketplaceRequests", - "DescribePrivateMarketplaceProducts", - "DescribePrivateMarketplaceProfile", + "DescribeAgreement", + "DescribeBuilds", + "DescribeChangeSet", + "DescribeEntity", "DescribePrivateMarketplaceRequests", - "DescribePrivateMarketplaceSettings", "DescribePrivateMarketplaceStatus", + "DescribeProcurementSystemConfiguration", + "DescribeTask", "DisassociateProductsFromPrivateMarketplace", - "ListPrivateMarketplaceProducts", + "GetAgreementApprovalRequest", + "GetAgreementRequest", + "GetAgreementTerms", + "GetEntitlements", + "ListAgreementApprovalRequests", + "ListAgreementRequests", + "ListBuilds", + "ListChangeSets", + "ListEntities", "ListPrivateMarketplaceRequests", - "StartPrivateMarketplace", - "StopPrivateMarketplace", - "UpdatePrivateMarketplaceProfile", - "UpdatePrivateMarketplaceSettings" + "ListTasks", + "MeterUsage", + "PutProcurementSystemConfiguration", + "RegisterUsage", + "RejectAgreementApprovalRequest", + "ResolveCustomer", + "SearchAgreements", + "StartBuild", + "StartChangeSet", + "Subscribe", + "Unsubscribe", + "UpdateAgreementApprovalRequest", + "UpdateTask", + "ViewSubscriptions" ], "aws-marketplace-management": [ "uploadFiles", @@ -854,6 +943,25 @@ "UpdateBudgetAction", "ViewBudget" ], + "bugbust": [ + "CreateEvent", + "EvaluateProfilingGroups", + "GetEvent", + "GetJoinEventStatus", + "JoinEvent", + "ListBugs", + "ListEventParticipants", + "ListEventScores", + "ListEvents", + "ListProfilingGroups", + "ListPullRequests", + "ListTagsForResource", + "TagResource", + "UntagResource", + "UpdateEvent", + "UpdateWorkItem", + "UpdateWorkItemAdmin" + ], "cassandra": [ "Alter", "Create", @@ -931,6 +1039,7 @@ "AssociateSigninDelegateGroupsWithAccount", "AuthorizeDirectory", "BatchCreateAttendee", + "BatchCreateChannelMembership", "BatchCreateRoomMembership", "BatchDeletePhoneNumber", "BatchSuspendUser", @@ -952,6 +1061,7 @@ "CreateChannelBan", "CreateChannelMembership", "CreateChannelModerator", + "CreateMediaCapturePipeline", "CreateMeeting", "CreateMeetingDialOut", "CreateMeetingWithAttendees", @@ -983,6 +1093,7 @@ "DeleteDomain", "DeleteEventsConfiguration", "DeleteGroups", + "DeleteMediaCapturePipeline", "DeleteMeeting", "DeletePhoneNumber", "DeleteProxySession", @@ -1025,6 +1136,7 @@ "GetDomain", "GetEventsConfiguration", "GetGlobalSettings", + "GetMediaCapturePipeline", "GetMeeting", "GetMeetingDetail", "GetMessagingSessionEndpoint", @@ -1076,6 +1188,7 @@ "ListDirectories", "ListDomains", "ListGroups", + "ListMediaCapturePipelines", "ListMeetingEvents", "ListMeetingTags", "ListMeetings", @@ -1087,6 +1200,7 @@ "ListRooms", "ListSipMediaApplications", "ListSipRules", + "ListSupportedPhoneNumberCountries", "ListTagsForResource", "ListUsers", "ListVoiceConnectorGroups", @@ -1145,6 +1259,7 @@ "UpdateRoom", "UpdateRoomMembership", "UpdateSipMediaApplication", + "UpdateSipMediaApplicationCall", "UpdateSipRule", "UpdateSupportedLicenses", "UpdateUser", @@ -1212,6 +1327,7 @@ "ListFacetNames", "ListIncomingTypedLinks", "ListIndex", + "ListManagedSchemaArns", "ListObjectAttributes", "ListObjectChildren", "ListObjectParentPaths", @@ -1281,6 +1397,7 @@ "ListTypeRegistrations", "ListTypeVersions", "ListTypes", + "RecordHandlerProgress", "RegisterType", "SetStackPolicy", "SetTypeDefaultVersion", @@ -1295,15 +1412,20 @@ "ValidateTemplate" ], "cloudfront": [ + "AssociateAlias", "CreateCachePolicy", "CreateCloudFrontOriginAccessIdentity", "CreateDistribution", "CreateDistributionWithTags", "CreateFieldLevelEncryptionConfig", "CreateFieldLevelEncryptionProfile", + "CreateFunction", "CreateInvalidation", + "CreateKeyGroup", + "CreateMonitoringSubscription", "CreateOriginRequestPolicy", "CreatePublicKey", + "CreateRealtimeLogConfig", "CreateStreamingDistribution", "CreateStreamingDistributionWithTags", "DeleteCachePolicy", @@ -1311,9 +1433,14 @@ "DeleteDistribution", "DeleteFieldLevelEncryptionConfig", "DeleteFieldLevelEncryptionProfile", + "DeleteFunction", + "DeleteKeyGroup", + "DeleteMonitoringSubscription", "DeleteOriginRequestPolicy", "DeletePublicKey", + "DeleteRealtimeLogConfig", "DeleteStreamingDistribution", + "DescribeFunction", "GetCachePolicy", "GetCachePolicyConfig", "GetCloudFrontOriginAccessIdentity", @@ -1324,35 +1451,51 @@ "GetFieldLevelEncryptionConfig", "GetFieldLevelEncryptionProfile", "GetFieldLevelEncryptionProfileConfig", + "GetFunction", "GetInvalidation", + "GetKeyGroup", + "GetKeyGroupConfig", + "GetMonitoringSubscription", "GetOriginRequestPolicy", "GetOriginRequestPolicyConfig", "GetPublicKey", "GetPublicKeyConfig", + "GetRealtimeLogConfig", "GetStreamingDistribution", "GetStreamingDistributionConfig", "ListCachePolicies", "ListCloudFrontOriginAccessIdentities", + "ListConflictingAliases", "ListDistributions", "ListDistributionsByCachePolicyId", + "ListDistributionsByKeyGroup", "ListDistributionsByOriginRequestPolicyId", + "ListDistributionsByRealtimeLogConfig", "ListDistributionsByWebACLId", "ListFieldLevelEncryptionConfigs", "ListFieldLevelEncryptionProfiles", + "ListFunctions", "ListInvalidations", + "ListKeyGroups", "ListOriginRequestPolicies", "ListPublicKeys", + "ListRealtimeLogConfigs", "ListStreamingDistributions", "ListTagsForResource", + "PublishFunction", "TagResource", + "TestFunction", "UntagResource", "UpdateCachePolicy", "UpdateCloudFrontOriginAccessIdentity", "UpdateDistribution", "UpdateFieldLevelEncryptionConfig", "UpdateFieldLevelEncryptionProfile", + "UpdateFunction", + "UpdateKeyGroup", "UpdateOriginRequestPolicy", "UpdatePublicKey", + "UpdateRealtimeLogConfig", "UpdateStreamingDistribution" ], "cloudhsm": [ @@ -1380,6 +1523,8 @@ "ListLunaClients", "ListTags", "ListTagsForResource", + "ModifyBackupAttributes", + "ModifyCluster", "ModifyHapg", "ModifyHsm", "ModifyLunaClient", @@ -1554,6 +1699,7 @@ "DeleteWebhook", "DescribeCodeCoverages", "DescribeTestCases", + "GetReportGroupTrend", "GetResourcePolicy", "ImportSourceCredentials", "InvalidateProjectCache", @@ -2107,7 +2253,9 @@ "compute-optimizer": [ "DescribeRecommendationExportJobs", "ExportAutoScalingGroupRecommendations", + "ExportEBSVolumeRecommendations", "ExportEC2InstanceRecommendations", + "ExportLambdaFunctionRecommendations", "GetAutoScalingGroupRecommendations", "GetEBSVolumeRecommendations", "GetEC2InstanceRecommendations", @@ -2207,6 +2355,8 @@ ], "connect": [ "AssociateApprovedOrigin", + "AssociateBot", + "AssociateCustomerProfilesDomain", "AssociateInstanceStorageConfig", "AssociateLambdaFunction", "AssociateLexBot", @@ -2215,13 +2365,17 @@ "AssociateSecurityKey", "CreateContactFlow", "CreateInstance", + "CreateIntegrationAssociation", "CreateQueue", "CreateQuickConnect", "CreateRoutingProfile", + "CreateUseCase", "CreateUser", "CreateUserHierarchyGroup", "DeleteInstance", + "DeleteIntegrationAssociation", "DeleteQuickConnect", + "DeleteUseCase", "DeleteUser", "DeleteUserHierarchyGroup", "DescribeContactFlow", @@ -2236,6 +2390,8 @@ "DescribeUserHierarchyGroup", "DescribeUserHierarchyStructure", "DisassociateApprovedOrigin", + "DisassociateBot", + "DisassociateCustomerProfilesDomain", "DisassociateInstanceStorageConfig", "DisassociateLambdaFunction", "DisassociateLexBot", @@ -2248,11 +2404,13 @@ "GetFederationTokens", "GetMetricData", "ListApprovedOrigins", + "ListBots", "ListContactFlows", "ListHoursOfOperations", "ListInstanceAttributes", "ListInstanceStorageConfigs", "ListInstances", + "ListIntegrationAssociations", "ListLambdaFunctions", "ListLexBots", "ListPhoneNumbers", @@ -2260,11 +2418,13 @@ "ListQueueQuickConnects", "ListQueues", "ListQuickConnects", + "ListRealtimeContactAnalysisSegments", "ListRoutingProfileQueues", "ListRoutingProfiles", "ListSecurityKeys", "ListSecurityProfiles", "ListTagsForResource", + "ListUseCases", "ListUserHierarchyGroups", "ListUsers", "ResumeContactRecording", @@ -2301,6 +2461,37 @@ "UpdateUserRoutingProfile", "UpdateUserSecurityProfiles" ], + "controltower": [ + "CreateManagedAccount", + "DeregisterManagedAccount", + "DeregisterOrganizationalUnit", + "DescribeAccountFactoryConfig", + "DescribeCoreService", + "DescribeGuardrail", + "DescribeGuardrailForTarget", + "DescribeManagedAccount", + "DescribeManagedOrganizationalUnit", + "DescribeSingleSignOn", + "DisableGuardrail", + "EnableGuardrail", + "GetAvailableUpdates", + "GetGuardrailComplianceStatus", + "GetHomeRegion", + "GetLandingZoneStatus", + "ListDirectoryGroups", + "ListEnabledGuardrails", + "ListGuardrailViolations", + "ListGuardrails", + "ListGuardrailsForTarget", + "ListManagedAccounts", + "ListManagedAccountsForGuardrail", + "ListManagedAccountsForParent", + "ListManagedOrganizationalUnits", + "ListManagedOrganizationalUnitsForGuardrail", + "ManageOrganizationalUnit", + "SetupLandingZone", + "UpdateAccountFactoryConfig" + ], "cur": [ "DeleteReportDefinition", "DescribeReportDefinitions", @@ -2366,6 +2557,7 @@ "ListJobs", "ListRevisionAssets", "ListTagsForResource", + "PublishDataSet", "StartJob", "TagResource", "UntagResource", @@ -2465,13 +2657,17 @@ "dbqms": [ "CreateFavoriteQuery", "CreateQueryHistory", + "CreateTab", "DeleteFavoriteQueries", "DeleteQueryHistory", + "DeleteTab", "DescribeFavoriteQueries", "DescribeQueryHistory", + "DescribeTabs", "GetQueryString", "UpdateFavoriteQuery", - "UpdateQueryHistory" + "UpdateQueryHistory", + "UpdateTab" ], "deepcomposer": [ "AssociateCoupon", @@ -2520,32 +2716,52 @@ "UpdateProject" ], "deepracer": [ + "AddLeaderboardAccessPermission", "CloneReinforcementLearningModel", "CreateAccountResources", + "CreateCar", + "CreateLeaderboard", + "CreateLeaderboardAccessToken", "CreateLeaderboardSubmission", "CreateReinforcementLearningModel", "DeleteAccountResources", + "DeleteLeaderboard", "DeleteModel", + "EditLeaderboard", "GetAccountResources", "GetAlias", + "GetAssetUrl", + "GetCar", + "GetCars", "GetEvaluation", "GetLatestUserSubmission", "GetLeaderboard", "GetModel", + "GetPrivateLeaderboard", "GetRankedUserSubmission", "GetTrack", "GetTrainingJob", + "ImportModel", "ListEvaluations", "ListLeaderboardSubmissions", "ListLeaderboards", "ListModels", + "ListPrivateLeaderboardParticipants", + "ListPrivateLeaderboards", + "ListSubscribedPrivateLeaderboards", + "ListTagsForResource", "ListTracks", "ListTrainingJobs", + "MigrateModels", + "RemoveLeaderboardAccessPermission", "SetAlias", "StartEvaluation", "StopEvaluation", "StopTrainingReinforcementLearningModel", - "TestRewardFunction" + "TagResource", + "TestRewardFunction", + "UntagResource", + "UpdateCar" ], "detective": [ "AcceptInvitation", @@ -2653,9 +2869,11 @@ "DescribeAccountHealth", "DescribeAccountOverview", "DescribeAnomaly", + "DescribeFeedback", "DescribeInsight", "DescribeResourceCollectionHealth", "DescribeServiceIntegration", + "GetCostEstimation", "GetResourceCollection", "ListAnomaliesForInsight", "ListEvents", @@ -2665,6 +2883,7 @@ "PutFeedback", "RemoveNotificationChannel", "SearchInsights", + "StartCostEstimation", "UpdateResourceCollection", "UpdateServiceIntegration" ], @@ -2773,6 +2992,7 @@ "CreateReplicationSubnetGroup", "CreateReplicationTask", "DeleteCertificate", + "DeleteConnection", "DeleteEndpoint", "DeleteEventSubscription", "DeleteReplicationInstance", @@ -2806,6 +3026,7 @@ "ModifyReplicationInstance", "ModifyReplicationSubnetGroup", "ModifyReplicationTask", + "MoveReplicationTask", "RebootReplicationInstance", "RefreshSchemas", "ReloadTables", @@ -2819,6 +3040,7 @@ "ds": [ "AcceptSharedDirectory", "AddIpRoutes", + "AddRegion", "AddTagsToResource", "AuthorizeApplication", "CancelSchemaExtension", @@ -2846,12 +3068,15 @@ "DescribeDomainControllers", "DescribeEventTopics", "DescribeLDAPSSettings", + "DescribeRegions", "DescribeSharedDirectories", "DescribeSnapshots", "DescribeTrusts", + "DisableClientAuthentication", "DisableLDAPS", "DisableRadius", "DisableSso", + "EnableClientAuthentication", "EnableLDAPS", "EnableRadius", "EnableSso", @@ -2868,6 +3093,7 @@ "RegisterEventTopic", "RejectSharedDirectory", "RemoveIpRoutes", + "RemoveRegion", "RemoveTagsFromResource", "ResetUserPassword", "RestoreFromSnapshot", @@ -3021,13 +3247,16 @@ "CreateNetworkInterface", "CreateNetworkInterfacePermission", "CreatePlacementGroup", + "CreateReplaceRootVolumeTask", "CreateReservedInstancesListing", + "CreateRestoreImageTask", "CreateRoute", "CreateRouteTable", "CreateSecurityGroup", "CreateSnapshot", "CreateSnapshots", "CreateSpotDatafeedSubscription", + "CreateStoreImageTask", "CreateSubnet", "CreateTags", "CreateTrafficMirrorFilter", @@ -3183,6 +3412,7 @@ "DescribePrincipalIdFormat", "DescribePublicIpv4Pools", "DescribeRegions", + "DescribeReplaceRootVolumeTasks", "DescribeReservedInstances", "DescribeReservedInstancesListings", "DescribeReservedInstancesModifications", @@ -3191,6 +3421,7 @@ "DescribeScheduledInstanceAvailability", "DescribeScheduledInstances", "DescribeSecurityGroupReferences", + "DescribeSecurityGroupRules", "DescribeSecurityGroups", "DescribeSnapshotAttribute", "DescribeSnapshots", @@ -3201,6 +3432,7 @@ "DescribeSpotInstanceRequests", "DescribeSpotPriceHistory", "DescribeStaleSecurityGroups", + "DescribeStoreImageTasks", "DescribeSubnets", "DescribeTags", "DescribeTrafficMirrorFilters", @@ -3238,6 +3470,8 @@ "DetachVpnGateway", "DisableEbsEncryptionByDefault", "DisableFastSnapshotRestores", + "DisableImageDeprecation", + "DisableSerialConsoleAccess", "DisableTransitGatewayRouteTablePropagation", "DisableVgwRoutePropagation", "DisableVpcClassicLink", @@ -3253,6 +3487,8 @@ "DisassociateVpcCidrBlock", "EnableEbsEncryptionByDefault", "EnableFastSnapshotRestores", + "EnableImageDeprecation", + "EnableSerialConsoleAccess", "EnableTransitGatewayRouteTablePropagation", "EnableVgwRoutePropagation", "EnableVolumeIO", @@ -3271,6 +3507,7 @@ "GetDefaultCreditSpecification", "GetEbsDefaultKmsKeyId", "GetEbsEncryptionByDefault", + "GetFlowLogsIntegrationTemplate", "GetGroupsForCapacityReservation", "GetHostReservationPurchasePreview", "GetLaunchTemplateData", @@ -3278,6 +3515,7 @@ "GetManagedPrefixListEntries", "GetPasswordData", "GetReservedInstancesExchangeQuote", + "GetSerialConsoleAccessStatus", "GetTransitGatewayAttachmentPropagations", "GetTransitGatewayMulticastDomainAssociations", "GetTransitGatewayPrefixListReferences", @@ -3311,6 +3549,7 @@ "ModifyManagedPrefixList", "ModifyNetworkInterfaceAttribute", "ModifyReservedInstances", + "ModifySecurityGroupRules", "ModifySnapshotAttribute", "ModifySpotFleetRequest", "ModifySubnetAttribute", @@ -3486,6 +3725,7 @@ "DescribeTaskSets", "DescribeTasks", "DiscoverPollEndpoint", + "ExecuteCommand", "ListAccountSettings", "ListAttributes", "ListClusters", @@ -3511,6 +3751,8 @@ "SubmitTaskStateChange", "TagResource", "UntagResource", + "UpdateCapacityProvider", + "UpdateCluster", "UpdateClusterSettings", "UpdateContainerAgent", "UpdateContainerInstancesState", @@ -3554,7 +3796,13 @@ "UpdateNodegroupVersion" ], "elastic-inference": [ - "Connect" + "Connect", + "DescribeAcceleratorOfferings", + "DescribeAcceleratorTypes", + "DescribeAccelerators", + "ListTagsForResource", + "TagResource", + "UntagResource" ], "elasticache": [ "AddTagsToResource", @@ -3689,6 +3937,7 @@ "DeleteMountTarget", "DeleteTags", "DescribeAccessPoints", + "DescribeAccountPreferences", "DescribeBackupPolicy", "DescribeFileSystemPolicy", "DescribeFileSystems", @@ -3698,6 +3947,7 @@ "DescribeTags", "ListTagsForResource", "ModifyMountTargetSecurityGroups", + "PutAccountPreferences", "PutBackupPolicy", "PutFileSystemPolicy", "PutLifecycleConfiguration", @@ -3707,34 +3957,61 @@ "UpdateFileSystem" ], "elasticloadbalancing": [ + "AddListenerCertificates", "AddTags", "ApplySecurityGroupsToLoadBalancer", "AttachLoadBalancerToSubnets", "ConfigureHealthCheck", "CreateAppCookieStickinessPolicy", "CreateLBCookieStickinessPolicy", + "CreateListener", "CreateLoadBalancer", "CreateLoadBalancerListeners", "CreateLoadBalancerPolicy", + "CreateRule", + "CreateTargetGroup", + "DeleteListener", "DeleteLoadBalancer", "DeleteLoadBalancerListeners", "DeleteLoadBalancerPolicy", + "DeleteRule", + "DeleteTargetGroup", "DeregisterInstancesFromLoadBalancer", + "DeregisterTargets", + "DescribeAccountLimits", "DescribeInstanceHealth", + "DescribeListenerCertificates", + "DescribeListeners", "DescribeLoadBalancerAttributes", "DescribeLoadBalancerPolicies", "DescribeLoadBalancerPolicyTypes", "DescribeLoadBalancers", + "DescribeRules", + "DescribeSSLPolicies", "DescribeTags", + "DescribeTargetGroupAttributes", + "DescribeTargetGroups", + "DescribeTargetHealth", "DetachLoadBalancerFromSubnets", "DisableAvailabilityZonesForLoadBalancer", "EnableAvailabilityZonesForLoadBalancer", + "ModifyListener", "ModifyLoadBalancerAttributes", + "ModifyRule", + "ModifyTargetGroup", + "ModifyTargetGroupAttributes", "RegisterInstancesWithLoadBalancer", + "RegisterTargets", + "RemoveListenerCertificates", "RemoveTags", + "SetIpAddressType", "SetLoadBalancerListenerSSLCertificate", "SetLoadBalancerPoliciesForBackendServer", - "SetLoadBalancerPoliciesOfListener" + "SetLoadBalancerPoliciesOfListener", + "SetRulePriorities", + "SetSecurityGroups", + "SetSubnets", + "SetWebAcl" ], "elasticmapreduce": [ "AddInstanceFleet", @@ -3743,24 +4020,39 @@ "AddTags", "CancelSteps", "CreateEditor", + "CreateRepository", "CreateSecurityConfiguration", + "CreateStudio", + "CreateStudioSessionMapping", "DeleteEditor", + "DeleteRepository", "DeleteSecurityConfiguration", + "DeleteStudio", + "DeleteStudioSessionMapping", "DescribeCluster", "DescribeEditor", "DescribeJobFlows", + "DescribeNotebookExecution", + "DescribeRepository", "DescribeSecurityConfiguration", "DescribeStep", + "DescribeStudio", "GetBlockPublicAccessConfiguration", "GetManagedScalingPolicy", + "GetStudioSessionMapping", + "LinkRepository", "ListBootstrapActions", "ListClusters", "ListEditors", "ListInstanceFleets", "ListInstanceGroups", "ListInstances", + "ListNotebookExecutions", + "ListRepositories", "ListSecurityConfigurations", "ListSteps", + "ListStudioSessionMappings", + "ListStudios", "ModifyCluster", "ModifyInstanceFleet", "ModifyInstanceGroups", @@ -3774,8 +4066,14 @@ "RunJobFlow", "SetTerminationProtection", "StartEditor", + "StartNotebookExecution", "StopEditor", + "StopNotebookExecution", "TerminateJobFlows", + "UnlinkRepository", + "UpdateRepository", + "UpdateStudio", + "UpdateStudioSessionMapping", "ViewEventsFromAllClustersInConsole" ], "elastictranscoder": [ @@ -3830,11 +4128,15 @@ ], "emr-containers": [ "CancelJobRun", + "CreateManagedEndpoint", "CreateVirtualCluster", + "DeleteManagedEndpoint", "DeleteVirtualCluster", "DescribeJobRun", + "DescribeManagedEndpoint", "DescribeVirtualCluster", "ListJobRuns", + "ListManagedEndpoints", "ListTagsForResource", "ListVirtualClusters", "StartJobRun", @@ -3842,23 +4144,47 @@ "UntagResource" ], "es": [ + "AcceptInboundConnection", "AcceptInboundCrossClusterSearchConnection", "AddTags", + "AssociatePackage", + "CancelElasticsearchServiceSoftwareUpdate", + "CreateDataPrepperPipeline", + "CreateDomain", "CreateElasticsearchDomain", "CreateElasticsearchServiceRole", + "CreateOutboundConnection", "CreateOutboundCrossClusterSearchConnection", + "CreatePackage", + "CreateServiceRole", + "DeleteDataPrepperPipeline", + "DeleteDomain", "DeleteElasticsearchDomain", "DeleteElasticsearchServiceRole", + "DeleteInboundConnection", "DeleteInboundCrossClusterSearchConnection", + "DeleteOutboundConnection", "DeleteOutboundCrossClusterSearchConnection", + "DeletePackage", + "DescribeDataPrepperPipeline", + "DescribeDomain", + "DescribeDomainConfig", + "DescribeDomains", "DescribeElasticsearchDomain", "DescribeElasticsearchDomainConfig", "DescribeElasticsearchDomains", "DescribeElasticsearchInstanceTypeLimits", + "DescribeInboundConnections", "DescribeInboundCrossClusterSearchConnections", + "DescribeInstanceTypeLimits", + "DescribeOutboundConnections", "DescribeOutboundCrossClusterSearchConnections", + "DescribePackages", "DescribeReservedElasticsearchInstanceOfferings", "DescribeReservedElasticsearchInstances", + "DescribeReservedInstanceOfferings", + "DescribeReservedInstances", + "DissociatePackage", "ESCrossClusterGet", "ESHttpDelete", "ESHttpGet", @@ -3867,17 +4193,32 @@ "ESHttpPost", "ESHttpPut", "GetCompatibleElasticsearchVersions", + "GetCompatibleVersions", + "GetPackageVersionHistory", "GetUpgradeHistory", "GetUpgradeStatus", + "IngestDataPrepperPipeline", + "ListDataPrepperPipelines", "ListDomainNames", + "ListDomainsForPackage", "ListElasticsearchInstanceTypeDetails", "ListElasticsearchInstanceTypes", "ListElasticsearchVersions", + "ListInstanceTypeDetails", + "ListInstanceTypes", + "ListPackagesForDomain", "ListTags", + "ListVersions", "PurchaseReservedElasticsearchInstanceOffering", + "PurchaseReservedInstanceOffering", + "RejectInboundConnection", "RejectInboundCrossClusterSearchConnection", "RemoveTags", + "StartElasticsearchServiceSoftwareUpdate", + "UpdateDataPrepperPipeline", + "UpdateDomainConfig", "UpdateElasticsearchDomainConfig", + "UpdatePackage", "UpgradeElasticsearchDomain" ], "events": [ @@ -4015,6 +4356,7 @@ "DeleteForecastExportJob", "DeletePredictor", "DeletePredictorBacktestExportJob", + "DeleteResourceTree", "DescribeDataset", "DescribeDatasetGroup", "DescribeDatasetImportJob", @@ -4113,6 +4455,7 @@ "AssociateFileGateway", "AssociateFileSystemAliases", "CancelDataRepositoryTask", + "CopyBackup", "CreateBackup", "CreateDataRepositoryTask", "CreateFileSystem", @@ -4127,6 +4470,7 @@ "DisassociateFileGateway", "DisassociateFileSystemAliases", "ListTagsForResource", + "ManageBackupPrincipalAssociations", "TagResource", "UntagResource", "UpdateFileSystem" @@ -4230,22 +4574,27 @@ ], "geo": [ "AssociateTrackerConsumer", + "BatchDeleteDevicePositionHistory", "BatchDeleteGeofence", "BatchEvaluateGeofences", "BatchGetDevicePosition", "BatchPutGeofence", "BatchUpdateDevicePosition", + "CalculateRoute", "CreateGeofenceCollection", "CreateMap", "CreatePlaceIndex", + "CreateRouteCalculator", "CreateTracker", "DeleteGeofenceCollection", "DeleteMap", "DeletePlaceIndex", + "DeleteRouteCalculator", "DeleteTracker", "DescribeGeofenceCollection", "DescribeMap", "DescribePlaceIndex", + "DescribeRouteCalculator", "DescribeTracker", "DisassociateTrackerConsumer", "GetDevicePosition", @@ -4255,16 +4604,20 @@ "GetMapSprites", "GetMapStyleDescriptor", "GetMapTile", - "GetMapTileJson", + "ListDevicePositions", "ListGeofenceCollections", "ListGeofences", "ListMaps", "ListPlaceIndexes", + "ListRouteCalculators", + "ListTagsForResource", "ListTrackerConsumers", "ListTrackers", "PutGeofence", "SearchPlaceIndexForPosition", "SearchPlaceIndexForText", + "TagResource", + "UntagResource", "UpdateGeofenceCollection", "UpdateTracker" ], @@ -4468,6 +4821,7 @@ "RegisterSchemaVersion", "RemoveSchemaVersionMetadata", "ResetJobBookmark", + "ResumeWorkflowRun", "SearchTables", "StartCrawler", "StartCrawlerSchedule", @@ -4481,6 +4835,7 @@ "StopCrawler", "StopCrawlerSchedule", "StopTrigger", + "StopWorkflowRun", "TagResource", "UntagResource", "UpdateClassifier", @@ -4501,9 +4856,11 @@ "UseMLTransforms" ], "grafana": [ + "AssociateLicense", "CreateWorkspace", "DeleteWorkspace", "DescribeWorkspace", + "DisassociateLicense", "ListPermissions", "ListWorkspaces", "UpdatePermissions", @@ -4512,6 +4869,8 @@ "greengrass": [ "AssociateRoleToGroup", "AssociateServiceRoleToAccount", + "CancelDeployment", + "CreateComponentVersion", "CreateConnectorDefinition", "CreateConnectorDefinitionVersion", "CreateCoreDefinition", @@ -4531,24 +4890,31 @@ "CreateSoftwareUpdateJob", "CreateSubscriptionDefinition", "CreateSubscriptionDefinitionVersion", + "DeleteComponent", "DeleteConnectorDefinition", "DeleteCoreDefinition", + "DeleteCoreDevice", "DeleteDeviceDefinition", "DeleteFunctionDefinition", "DeleteGroup", "DeleteLoggerDefinition", "DeleteResourceDefinition", "DeleteSubscriptionDefinition", + "DescribeComponent", "DisassociateRoleFromGroup", "DisassociateServiceRoleFromAccount", "Discover", "GetAssociatedRole", "GetBulkDeploymentStatus", + "GetComponent", + "GetComponentVersionArtifact", "GetConnectivityInfo", "GetConnectorDefinition", "GetConnectorDefinitionVersion", "GetCoreDefinition", "GetCoreDefinitionVersion", + "GetCoreDevice", + "GetDeployment", "GetDeploymentStatus", "GetDeviceDefinition", "GetDeviceDefinitionVersion", @@ -4568,18 +4934,23 @@ "GetThingRuntimeConfiguration", "ListBulkDeploymentDetailedReports", "ListBulkDeployments", + "ListComponentVersions", + "ListComponents", "ListConnectorDefinitionVersions", "ListConnectorDefinitions", "ListCoreDefinitionVersions", "ListCoreDefinitions", + "ListCoreDevices", "ListDeployments", "ListDeviceDefinitionVersions", "ListDeviceDefinitions", + "ListEffectiveDeployments", "ListFunctionDefinitionVersions", "ListFunctionDefinitions", "ListGroupCertificateAuthorities", "ListGroupVersions", "ListGroups", + "ListInstalledComponents", "ListLoggerDefinitionVersions", "ListLoggerDefinitions", "ListResourceDefinitionVersions", @@ -4588,6 +4959,7 @@ "ListSubscriptionDefinitions", "ListTagsForResource", "ResetDeployments", + "ResolveComponentCandidates", "StartBulkDeployment", "StopBulkDeployment", "TagResource", @@ -4632,6 +5004,7 @@ "UpdateMissionProfile" ], "groundtruthlabeling": [ + "AssociatePatchToManifestJob", "DescribeConsoleJob", "ListDatasetObjects", "RunFilterOrSampleDatasetJob", @@ -4668,8 +5041,10 @@ "GetIPSet", "GetInvitationsCount", "GetMasterAccount", + "GetMemberDetectors", "GetMembers", "GetThreatIntelSet", + "GetUsageStatistics", "InviteMembers", "ListDetectors", "ListFilters", @@ -4690,6 +5065,7 @@ "UpdateFilter", "UpdateFindingsFeedback", "UpdateIPSet", + "UpdateMemberDetectors", "UpdateOrganizationConfiguration", "UpdatePublishingDestination", "UpdateThreatIntelSet" @@ -4719,11 +5095,16 @@ "DescribeFHIRImportJob", "GetCapabilities", "ListFHIRDatastores", + "ListFHIRExportJobs", + "ListFHIRImportJobs", + "ListTagsForResource", "ReadResource", "SearchWithGet", "SearchWithPost", "StartFHIRExportJob", "StartFHIRImportJob", + "TagResource", + "UntagResource", "UpdateResource" ], "honeycode": [ @@ -4732,18 +5113,27 @@ "BatchDeleteTableRows", "BatchUpdateTableRows", "BatchUpsertTableRows", + "CreateTeam", "CreateTenant", + "DeregisterGroups", "DescribeTableDataImportJob", + "DescribeTeam", "GetScreenData", "InvokeScreenAutomation", + "ListDomains", + "ListGroups", "ListTableColumns", "ListTableRows", "ListTables", "ListTeamAssociations", "ListTenants", "QueryTableRows", + "RegisterDomainForVerification", + "RegisterGroups", "RejectTeamAssociation", - "StartTableDataImportJob" + "RestartDomainVerification", + "StartTableDataImportJob", + "UpdateTeam" ], "iam": [ "AddClientIDToOpenIDConnectProvider", @@ -4939,6 +5329,7 @@ "GetImageRecipe", "GetImageRecipePolicy", "GetInfrastructureConfiguration", + "ImportComponent", "ListComponentBuildVersions", "ListComponents", "ListContainerRecipes", @@ -4974,6 +5365,7 @@ "AddAttributesToFindings", "CreateAssessmentTarget", "CreateAssessmentTemplate", + "CreateExclusionsPreview", "CreateResourceGroup", "DeleteAssessmentRun", "DeleteAssessmentTarget", @@ -4982,15 +5374,19 @@ "DescribeAssessmentTargets", "DescribeAssessmentTemplates", "DescribeCrossAccountAccessRole", + "DescribeExclusions", "DescribeFindings", "DescribeResourceGroups", "DescribeRulesPackages", + "GetAssessmentReport", + "GetExclusionsPreview", "GetTelemetryMetadata", "ListAssessmentRunAgents", "ListAssessmentRuns", "ListAssessmentTargets", "ListAssessmentTemplates", "ListEventSubscriptions", + "ListExclusions", "ListFindings", "ListRulesPackages", "ListTagsForResource", @@ -5016,6 +5412,7 @@ "CancelAuditMitigationActionsTask", "CancelAuditTask", "CancelCertificateTransfer", + "CancelDetectMitigationActionsTask", "CancelJob", "CancelJobExecution", "ClearDefaultAuthorizer", @@ -5026,11 +5423,13 @@ "CreateAuthorizer", "CreateBillingGroup", "CreateCertificateFromCsr", + "CreateCustomMetric", "CreateDimension", "CreateDomainConfiguration", "CreateDynamicThingGroup", "CreateFleetMetric", "CreateJob", + "CreateJobTemplate", "CreateKeysAndCertificate", "CreateMitigationAction", "CreateOTAUpdate", @@ -5054,12 +5453,14 @@ "DeleteBillingGroup", "DeleteCACertificate", "DeleteCertificate", + "DeleteCustomMetric", "DeleteDimension", "DeleteDomainConfiguration", "DeleteDynamicThingGroup", "DeleteFleetMetric", "DeleteJob", "DeleteJobExecution", + "DeleteJobTemplate", "DeleteMitigationAction", "DeleteOTAUpdate", "DeletePolicy", @@ -5088,7 +5489,9 @@ "DescribeBillingGroup", "DescribeCACertificate", "DescribeCertificate", + "DescribeCustomMetric", "DescribeDefaultAuthorizer", + "DescribeDetectMitigationActionsTask", "DescribeDimension", "DescribeDomainConfiguration", "DescribeEndpoint", @@ -5097,6 +5500,7 @@ "DescribeIndex", "DescribeJob", "DescribeJobExecution", + "DescribeJobTemplate", "DescribeMitigationAction", "DescribeProvisioningTemplate", "DescribeProvisioningTemplateVersion", @@ -5115,6 +5519,7 @@ "DetachThingPrincipal", "DisableTopicRule", "EnableTopicRule", + "GetBehaviorModelTrainingSummaries", "GetBucketsAggregation", "GetCardinality", "GetEffectivePolicies", @@ -5144,12 +5549,16 @@ "ListCACertificates", "ListCertificates", "ListCertificatesByCA", + "ListCustomMetrics", + "ListDetectMitigationActionsExecutions", + "ListDetectMitigationActionsTasks", "ListDimensions", "ListDomainConfigurations", "ListFleetMetrics", "ListIndices", "ListJobExecutionsForJob", "ListJobExecutionsForThing", + "ListJobTemplates", "ListJobs", "ListMitigationActions", "ListNamedShadowsForThing", @@ -5202,6 +5611,7 @@ "SetV2LoggingLevel", "SetV2LoggingOptions", "StartAuditMitigationActionsTask", + "StartDetectMitigationActionsTask", "StartNextPendingJobExecution", "StartOnDemandAuditTask", "StartThingRegistrationTask", @@ -5218,6 +5628,7 @@ "UpdateBillingGroup", "UpdateCACertificate", "UpdateCertificate", + "UpdateCustomMetric", "UpdateDimension", "UpdateDomainConfiguration", "UpdateDynamicThingGroup", @@ -5294,6 +5705,7 @@ "DescribePipeline", "GetDatasetContent", "ListChannels", + "ListDatasetContents", "ListDatasets", "ListDatastores", "ListPipelines", @@ -5318,8 +5730,8 @@ "ListSuiteDefinitions", "ListSuiteRuns", "ListTagsForResource", - "ListTestCases", "StartSuiteRun", + "StopSuiteRun", "TagResource", "UntagResource", "UpdateSuiteDefinition" @@ -5350,6 +5762,7 @@ "ListDetectorModelVersions", "ListDetectorModels", "ListDetectors", + "ListInputRoutings", "ListInputs", "ListTagsForResource", "PutLoggingOptions", @@ -5394,6 +5807,7 @@ "DescribeAssetModel", "DescribeAssetProperty", "DescribeDashboard", + "DescribeDefaultEncryptionConfiguration", "DescribeGateway", "DescribeGatewayCapabilityConfiguration", "DescribeLoggingOptions", @@ -5414,12 +5828,14 @@ "ListProjectAssets", "ListProjects", "ListTagsForResource", + "PutDefaultEncryptionConfiguration", "PutLoggingOptions", "TagResource", "UntagResource", "UpdateAccessPolicy", "UpdateAsset", "UpdateAssetModel", + "UpdateAssetModelPropertyRouting", "UpdateAssetProperty", "UpdateDashboard", "UpdateGateway", @@ -5489,7 +5905,9 @@ "DisassociateWirelessGatewayFromThing", "GetDestination", "GetDeviceProfile", + "GetLogLevelsByResourceTypes", "GetPartnerAccount", + "GetResourceLogLevel", "GetServiceEndpoint", "GetServiceProfile", "GetWirelessDevice", @@ -5508,11 +5926,15 @@ "ListWirelessDevices", "ListWirelessGatewayTaskDefinitions", "ListWirelessGateways", + "PutResourceLogLevel", + "ResetAllResourceLogLevels", + "ResetResourceLogLevel", "SendDataToWirelessDevice", "TagResource", "TestWirelessDevice", "UntagResource", "UpdateDestination", + "UpdateLogLevelsByResourceTypes", "UpdatePartnerAccount", "UpdateWirelessDevice", "UpdateWirelessGateway" @@ -5527,17 +5949,21 @@ "BatchGetChannel", "BatchGetStreamKey", "CreateChannel", + "CreateRecordingConfiguration", "CreateStreamKey", "DeleteChannel", "DeletePlaybackKeyPair", + "DeleteRecordingConfiguration", "DeleteStreamKey", "GetChannel", "GetPlaybackKeyPair", + "GetRecordingConfiguration", "GetStream", "GetStreamKey", "ImportPlaybackKeyPair", "ListChannels", "ListPlaybackKeyPairs", + "ListRecordingConfigurations", "ListStreamKeys", "ListStreams", "ListTagsForResource", @@ -5579,25 +6005,53 @@ "UpdateConfiguration", "UpdateMonitoring" ], + "kafka-cluster": [ + "AlterCluster", + "AlterClusterDynamicConfiguration", + "AlterGroup", + "AlterTopic", + "AlterTopicDynamicConfiguration", + "AlterTransactionalId", + "Connect", + "CreateTopic", + "DeleteGroup", + "DeleteTopic", + "DescribeCluster", + "DescribeClusterDynamicConfiguration", + "DescribeGroup", + "DescribeTopic", + "DescribeTopicDynamicConfiguration", + "DescribeTransactionalId", + "ReadData", + "WriteData", + "WriteDataIdempotently" + ], "kendra": [ "BatchDeleteDocument", "BatchPutDocument", + "ClearQuerySuggestions", "CreateDataSource", "CreateFaq", "CreateIndex", + "CreateQuerySuggestionsBlockList", "CreateThesaurus", "DeleteDataSource", "DeleteFaq", "DeleteIndex", + "DeleteQuerySuggestionsBlockList", "DeleteThesaurus", "DescribeDataSource", "DescribeFaq", "DescribeIndex", + "DescribeQuerySuggestionsBlockList", + "DescribeQuerySuggestionsConfig", "DescribeThesaurus", + "GetQuerySuggestions", "ListDataSourceSyncJobs", "ListDataSources", "ListFaqs", "ListIndices", + "ListQuerySuggestionsBlockLists", "ListTagsForResource", "ListThesauri", "Query", @@ -5608,6 +6062,8 @@ "UntagResource", "UpdateDataSource", "UpdateIndex", + "UpdateQuerySuggestionsBlockList", + "UpdateQuerySuggestionsConfig", "UpdateThesaurus" ], "kinesis": [ @@ -5641,16 +6097,27 @@ "UpdateShardCount" ], "kinesisanalytics": [ + "AddApplicationCloudWatchLoggingOption", "AddApplicationInput", + "AddApplicationInputProcessingConfiguration", "AddApplicationOutput", "AddApplicationReferenceDataSource", + "AddApplicationVpcConfiguration", "CreateApplication", + "CreateApplicationPresignedUrl", + "CreateApplicationSnapshot", "DeleteApplication", + "DeleteApplicationCloudWatchLoggingOption", + "DeleteApplicationInputProcessingConfiguration", "DeleteApplicationOutput", "DeleteApplicationReferenceDataSource", + "DeleteApplicationSnapshot", + "DeleteApplicationVpcConfiguration", "DescribeApplication", + "DescribeApplicationSnapshot", "DiscoverInputSchema", "GetApplicationState", + "ListApplicationSnapshots", "ListApplications", "ListTagsForResource", "StartApplication", @@ -5729,15 +6196,18 @@ "PutKeyPolicy", "ReEncryptFrom", "ReEncryptTo", + "ReplicateKey", "RetireGrant", "RevokeGrant", "ScheduleKeyDeletion", "Sign", + "SynchronizeMultiRegionKey", "TagResource", "UntagResource", "UpdateAlias", "UpdateCustomKeyStore", "UpdateKeyDescription", + "UpdatePrimaryRegion", "Verify" ], "lakeformation": [ @@ -5829,19 +6299,47 @@ "StartProvisioning" ], "lex": [ + "BuildBotLocale", + "CreateBot", + "CreateBotAlias", + "CreateBotChannel", + "CreateBotLocale", "CreateBotVersion", + "CreateExport", + "CreateIntent", "CreateIntentVersion", + "CreateResourcePolicy", + "CreateSlot", + "CreateSlotType", "CreateSlotTypeVersion", + "CreateUploadUrl", "DeleteBot", "DeleteBotAlias", + "DeleteBotChannel", "DeleteBotChannelAssociation", + "DeleteBotLocale", "DeleteBotVersion", + "DeleteExport", + "DeleteImport", "DeleteIntent", "DeleteIntentVersion", + "DeleteResourcePolicy", "DeleteSession", + "DeleteSlot", "DeleteSlotType", "DeleteSlotTypeVersion", "DeleteUtterances", + "DescribeBot", + "DescribeBotAlias", + "DescribeBotChannel", + "DescribeBotLocale", + "DescribeBotVersion", + "DescribeExport", + "DescribeImport", + "DescribeIntent", + "DescribeResourcePolicy", + "DescribeSlot", + "DescribeSlotType", "GetBot", "GetBotAlias", "GetBotAliases", @@ -5862,6 +6360,18 @@ "GetSlotTypeVersions", "GetSlotTypes", "GetUtterancesView", + "ListBotAliases", + "ListBotChannels", + "ListBotLocales", + "ListBotVersions", + "ListBots", + "ListBuiltInIntents", + "ListBuiltInSlotTypes", + "ListExports", + "ListImports", + "ListIntents", + "ListSlotTypes", + "ListSlots", "ListTagsForResource", "PostContent", "PostText", @@ -5870,9 +6380,20 @@ "PutIntent", "PutSession", "PutSlotType", + "RecognizeSpeech", + "RecognizeText", + "StartConversation", "StartImport", "TagResource", - "UntagResource" + "UntagResource", + "UpdateBot", + "UpdateBotAlias", + "UpdateBotLocale", + "UpdateExport", + "UpdateIntent", + "UpdateResourcePolicy", + "UpdateSlot", + "UpdateSlotType" ], "license-manager": [ "AcceptGrant", @@ -5883,23 +6404,27 @@ "CreateGrantVersion", "CreateLicense", "CreateLicenseConfiguration", + "CreateLicenseManagerReportGenerator", "CreateLicenseVersion", "CreateToken", "DeleteGrant", "DeleteLicense", "DeleteLicenseConfiguration", + "DeleteLicenseManagerReportGenerator", "DeleteToken", "ExtendLicenseConsumption", "GetAccessToken", "GetGrant", "GetLicense", "GetLicenseConfiguration", + "GetLicenseManagerReportGenerator", "GetLicenseUsage", "GetServiceSettings", "ListAssociationsForLicenseConfiguration", "ListDistributedGrants", "ListFailuresForLicenseConfigurationOperations", "ListLicenseConfigurations", + "ListLicenseManagerReportGenerators", "ListLicenseSpecificationsForResource", "ListLicenseVersions", "ListLicenses", @@ -5913,6 +6438,7 @@ "TagResource", "UntagResource", "UpdateLicenseConfiguration", + "UpdateLicenseManagerReportGenerator", "UpdateLicenseSpecificationsForResource", "UpdateServiceSettings" ], @@ -5925,6 +6451,8 @@ "AttachStaticIp", "CloseInstancePublicPorts", "CopySnapshot", + "CreateBucket", + "CreateBucketAccessKey", "CreateCertificate", "CreateCloudFormationStack", "CreateContactMethod", @@ -5948,6 +6476,8 @@ "CreateRelationalDatabaseSnapshot", "DeleteAlarm", "DeleteAutoSnapshot", + "DeleteBucket", + "DeleteBucketAccessKey", "DeleteCertificate", "DeleteContactMethod", "DeleteContainerImage", @@ -5977,6 +6507,10 @@ "GetAlarms", "GetAutoSnapshots", "GetBlueprints", + "GetBucketAccessKeys", + "GetBucketBundles", + "GetBucketMetricData", + "GetBuckets", "GetBundles", "GetCertificates", "GetCloudFormationStackRecords", @@ -6044,6 +6578,7 @@ "ResetDistributionCache", "SendContactMethodVerification", "SetIpAddressType", + "SetResourceAccessForBucket", "StartInstance", "StartRelationalDatabase", "StopInstance", @@ -6052,6 +6587,8 @@ "TestAlarm", "UnpeerVpc", "UntagResource", + "UpdateBucket", + "UpdateBucketBundle", "UpdateContainerService", "UpdateDistribution", "UpdateDistributionBundle", @@ -6072,6 +6609,7 @@ "DeleteLogGroup", "DeleteLogStream", "DeleteMetricFilter", + "DeleteQueryDefinition", "DeleteResourcePolicy", "DeleteRetentionPolicy", "DeleteSubscriptionFilter", @@ -6081,6 +6619,7 @@ "DescribeLogStreams", "DescribeMetricFilters", "DescribeQueries", + "DescribeQueryDefinitions", "DescribeResourcePolicies", "DescribeSubscriptionFilters", "DisassociateKmsKey", @@ -6096,6 +6635,7 @@ "PutDestinationPolicy", "PutLogEvents", "PutMetricFilter", + "PutQueryDefinition", "PutResourcePolicy", "PutRetentionPolicy", "PutSubscriptionFilter", @@ -6240,16 +6780,19 @@ "DescribeOrganizationConfiguration", "DisableMacie", "DisableOrganizationAdminAccount", + "DisassociateFromAdministratorAccount", "DisassociateFromMasterAccount", "DisassociateMember", "EnableMacie", "EnableOrganizationAdminAccount", + "GetAdministratorAccount", "GetBucketStatistics", "GetClassificationExportConfiguration", "GetCustomDataIdentifier", "GetFindingStatistics", "GetFindings", "GetFindingsFilter", + "GetFindingsPublicationConfiguration", "GetInvitationsCount", "GetMacieSession", "GetMasterAccount", @@ -6265,6 +6808,8 @@ "ListOrganizationAdminAccounts", "ListTagsForResource", "PutClassificationExportConfiguration", + "PutFindingsPublicationConfiguration", + "SearchResources", "TagResource", "TestCustomDataIdentifier", "UntagResource", @@ -6345,18 +6890,34 @@ "UpdateQualificationType" ], "mediaconnect": [ + "AddFlowMediaStreams", "AddFlowOutputs", + "AddFlowSources", + "AddFlowVpcInterfaces", "CreateFlow", "DeleteFlow", "DescribeFlow", + "DescribeOffering", + "DescribeReservation", "GrantFlowEntitlements", "ListEntitlements", "ListFlows", + "ListOfferings", + "ListReservations", + "ListTagsForResource", + "PurchaseOffering", + "RemoveFlowMediaStream", "RemoveFlowOutput", + "RemoveFlowSource", + "RemoveFlowVpcInterface", "RevokeFlowEntitlement", "StartFlow", "StopFlow", + "TagResource", + "UntagResource", + "UpdateFlow", "UpdateFlowEntitlement", + "UpdateFlowMediaStream", "UpdateFlowOutput", "UpdateFlowSource" ], @@ -6457,6 +7018,7 @@ "ListHarvestJobs", "ListOriginEndpoints", "ListTagsForResource", + "RotateChannelCredentials", "RotateIngestEndpointCredentials", "TagResource", "UntagResource", @@ -6475,7 +7037,11 @@ "DescribePackagingGroup", "ListAssets", "ListPackagingConfigurations", - "ListPackagingGroups" + "ListPackagingGroups", + "ListTagsForResource", + "TagResource", + "UntagResource", + "UpdatePackagingGroup" ], "mediastore": [ "CreateContainer", @@ -6527,6 +7093,7 @@ "DisassociateDiscoveredResource", "GetHomeRegion", "ImportMigrationTask", + "ListApplicationStates", "ListCreatedArtifacts", "ListDiscoveredResources", "ListMigrationTasks", @@ -6535,6 +7102,59 @@ "NotifyMigrationTaskState", "PutResourceAttributes" ], + "mgn": [ + "BatchCreateVolumeSnapshotGroupForMgn", + "BatchDeleteSnapshotRequestForMgn", + "ChangeServerLifeCycleState", + "CreateReplicationConfigurationTemplate", + "DeleteJob", + "DeleteReplicationConfigurationTemplate", + "DeleteSourceServer", + "DescribeJobLogItems", + "DescribeJobs", + "DescribeReplicationConfigurationTemplates", + "DescribeReplicationServerAssociationsForMgn", + "DescribeSnapshotRequestsForMgn", + "DescribeSourceServers", + "DisconnectFromService", + "FinalizeCutover", + "GetAgentCommandForMgn", + "GetAgentConfirmedResumeInfoForMgn", + "GetAgentInstallationAssetsForMgn", + "GetAgentReplicationInfoForMgn", + "GetAgentRuntimeConfigurationForMgn", + "GetAgentSnapshotCreditsForMgn", + "GetChannelCommandsForMgn", + "GetLaunchConfiguration", + "GetReplicationConfiguration", + "InitializeService", + "ListTagsForResource", + "MarkAsArchived", + "NotifyAgentAuthenticationForMgn", + "NotifyAgentConnectedForMgn", + "NotifyAgentDisconnectedForMgn", + "NotifyAgentReplicationProgressForMgn", + "RegisterAgentForMgn", + "RetryDataReplication", + "SendAgentLogsForMgn", + "SendAgentMetricsForMgn", + "SendChannelCommandResultForMgn", + "SendClientLogsForMgn", + "SendClientMetricsForMgn", + "StartCutover", + "StartTest", + "TagResource", + "TerminateTargetInstances", + "UntagResource", + "UpdateAgentBacklogForMgn", + "UpdateAgentConversionInfoForMgn", + "UpdateAgentReplicationInfoForMgn", + "UpdateAgentReplicationProcessStateForMgn", + "UpdateAgentSourcePropertiesForMgn", + "UpdateLaunchConfiguration", + "UpdateReplicationConfiguration", + "UpdateReplicationConfigurationTemplate" + ], "mobileanalytics": [ "GetFinancialReports", "GetReports", @@ -6605,11 +7225,13 @@ "GetApnsVoipChannel", "GetApnsVoipSandboxChannel", "GetApp", + "GetApplicationDateRangeKpi", "GetApplicationSettings", "GetApps", "GetBaiduChannel", "GetCampaign", "GetCampaignActivities", + "GetCampaignDateRangeKpi", "GetCampaignVersion", "GetCampaignVersions", "GetCampaigns", @@ -6624,6 +7246,9 @@ "GetImportJob", "GetImportJobs", "GetJourney", + "GetJourneyDateRangeKpi", + "GetJourneyExecutionActivityMetrics", + "GetJourneyExecutionMetrics", "GetPushTemplate", "GetRecommenderConfiguration", "GetRecommenderConfigurations", @@ -6783,6 +7408,55 @@ "UpdateLink", "UpdateSite" ], + "nimble": [ + "AcceptEulas", + "CreateLaunchProfile", + "CreateStreamingImage", + "CreateStreamingSession", + "CreateStreamingSessionStream", + "CreateStudio", + "CreateStudioComponent", + "DeleteLaunchProfile", + "DeleteLaunchProfileMember", + "DeleteStreamingImage", + "DeleteStreamingSession", + "DeleteStudio", + "DeleteStudioComponent", + "DeleteStudioMember", + "GetEula", + "GetFeatureMap", + "GetLaunchProfile", + "GetLaunchProfileDetails", + "GetLaunchProfileInitialization", + "GetLaunchProfileMember", + "GetStreamingImage", + "GetStreamingSession", + "GetStreamingSessionStream", + "GetStudio", + "GetStudioComponent", + "GetStudioMember", + "ListEulaAcceptances", + "ListEulas", + "ListLaunchProfileMembers", + "ListLaunchProfiles", + "ListStreamingImages", + "ListStreamingSessions", + "ListStudioComponents", + "ListStudioMembers", + "ListStudios", + "ListTagsForResource", + "PutLaunchProfileMembers", + "PutStudioLogEvents", + "PutStudioMembers", + "StartStudioSSOConfigurationRepair", + "TagResource", + "UntagResource", + "UpdateLaunchProfile", + "UpdateLaunchProfileMember", + "UpdateStreamingImage", + "UpdateStudio", + "UpdateStudioComponent" + ], "opsworks": [ "AssignInstance", "AssignVolume", @@ -6816,6 +7490,7 @@ "DescribeLayers", "DescribeLoadBasedAutoScaling", "DescribeMyUserProfile", + "DescribeOperatingSystems", "DescribePermissions", "DescribeRaidArrays", "DescribeRdsDbInstances", @@ -6870,6 +7545,7 @@ "DescribeNodeAssociationStatus", "DescribeServers", "DisassociateNode", + "ExportServerEngineAttribute", "ListTagsForResource", "RestoreServer", "StartMaintenance", @@ -7039,6 +7715,7 @@ ], "pi": [ "DescribeDimensionKeys", + "GetDimensionKeyDetails", "GetResourceMetrics" ], "polly": [ @@ -7088,56 +7765,78 @@ "UpdateProfile" ], "proton": [ + "AcceptEnvironmentAccountConnection", + "CancelEnvironmentDeployment", + "CancelServiceInstanceDeployment", + "CancelServicePipelineDeployment", "CreateEnvironment", + "CreateEnvironmentAccountConnection", "CreateEnvironmentTemplate", "CreateEnvironmentTemplateMajorVersion", "CreateEnvironmentTemplateMinorVersion", + "CreateEnvironmentTemplateVersion", "CreateService", "CreateServiceTemplate", "CreateServiceTemplateMajorVersion", "CreateServiceTemplateMinorVersion", + "CreateServiceTemplateVersion", "DeleteAccountRoles", "DeleteEnvironment", + "DeleteEnvironmentAccountConnection", "DeleteEnvironmentTemplate", "DeleteEnvironmentTemplateMajorVersion", "DeleteEnvironmentTemplateMinorVersion", + "DeleteEnvironmentTemplateVersion", "DeleteService", "DeleteServiceTemplate", "DeleteServiceTemplateMajorVersion", "DeleteServiceTemplateMinorVersion", + "DeleteServiceTemplateVersion", "GetAccountRoles", + "GetAccountSettings", "GetEnvironment", + "GetEnvironmentAccountConnection", "GetEnvironmentTemplate", "GetEnvironmentTemplateMajorVersion", "GetEnvironmentTemplateMinorVersion", + "GetEnvironmentTemplateVersion", "GetService", "GetServiceInstance", "GetServiceTemplate", "GetServiceTemplateMajorVersion", "GetServiceTemplateMinorVersion", + "GetServiceTemplateVersion", + "ListEnvironmentAccountConnections", "ListEnvironmentTemplateMajorVersions", "ListEnvironmentTemplateMinorVersions", + "ListEnvironmentTemplateVersions", "ListEnvironmentTemplates", "ListEnvironments", "ListServiceInstances", "ListServiceTemplateMajorVersions", "ListServiceTemplateMinorVersions", + "ListServiceTemplateVersions", "ListServiceTemplates", "ListServices", "ListTagsForResource", + "RejectEnvironmentAccountConnection", "TagResource", "UntagResource", "UpdateAccountRoles", + "UpdateAccountSettings", "UpdateEnvironment", + "UpdateEnvironmentAccountConnection", "UpdateEnvironmentTemplate", "UpdateEnvironmentTemplateMajorVersion", "UpdateEnvironmentTemplateMinorVersion", + "UpdateEnvironmentTemplateVersion", "UpdateService", "UpdateServiceInstance", "UpdateServicePipeline", "UpdateServiceTemplate", "UpdateServiceTemplateMajorVersion", - "UpdateServiceTemplateMinorVersion" + "UpdateServiceTemplateMinorVersion", + "UpdateServiceTemplateVersion" ], "purchase-orders": [ "ModifyPurchaseOrders", @@ -7161,12 +7860,23 @@ "ListJournalS3ExportsForLedger", "ListLedgers", "ListTagsForResource", + "PartiQLCreateIndex", + "PartiQLCreateTable", + "PartiQLDelete", + "PartiQLDropIndex", + "PartiQLDropTable", + "PartiQLHistoryFunction", + "PartiQLInsert", + "PartiQLSelect", + "PartiQLUndropTable", + "PartiQLUpdate", "SendCommand", "ShowCatalog", "StreamJournalToKinesis", "TagResource", "UntagResource", - "UpdateLedger" + "UpdateLedger", + "UpdateLedgerPermissionsMode" ], "quicksight": [ "CancelIngestion", @@ -7228,6 +7938,9 @@ "DescribeThemeAlias", "DescribeThemePermissions", "DescribeUser", + "GenerateEmbedUrlForAnonymousUser", + "GenerateEmbedUrlForRegisteredUser", + "GetAnonymousUserEmbedUrl", "GetAuthCode", "GetDashboardEmbedUrl", "GetGroupMapping", @@ -7327,6 +8040,7 @@ "CopyDBParameterGroup", "CopyDBSnapshot", "CopyOptionGroup", + "CreateCustomAvailabilityZone", "CreateDBCluster", "CreateDBClusterEndpoint", "CreateDBClusterParameterGroup", @@ -7343,6 +8057,7 @@ "CreateGlobalCluster", "CreateOptionGroup", "CrossRegionCommunication", + "DeleteCustomAvailabilityZone", "DeleteDBCluster", "DeleteDBClusterEndpoint", "DeleteDBClusterParameterGroup", @@ -7357,10 +8072,12 @@ "DeleteDBSubnetGroup", "DeleteEventSubscription", "DeleteGlobalCluster", + "DeleteInstallationMedia", "DeleteOptionGroup", "DeregisterDBProxyTargets", "DescribeAccountAttributes", "DescribeCertificates", + "DescribeCustomAvailabilityZones", "DescribeDBClusterBacktracks", "DescribeDBClusterEndpoints", "DescribeDBClusterParameterGroups", @@ -7389,6 +8106,7 @@ "DescribeEvents", "DescribeExportTasks", "DescribeGlobalClusters", + "DescribeInstallationMedia", "DescribeOptionGroupOptions", "DescribeOptionGroups", "DescribeOrderableDBInstanceOptions", @@ -7400,7 +8118,9 @@ "DownloadDBLogFilePortion", "FailoverDBCluster", "FailoverGlobalCluster", + "ImportInstallationMedia", "ListTagsForResource", + "ModifyCertificates", "ModifyCurrentDBClusterCapacity", "ModifyDBCluster", "ModifyDBClusterEndpoint", @@ -7439,10 +8159,12 @@ "StartActivityStream", "StartDBCluster", "StartDBInstance", + "StartDBInstanceAutomatedBackupsReplication", "StartExportTask", "StopActivityStream", "StopDBCluster", - "StopDBInstance" + "StopDBInstance", + "StopDBInstanceAutomatedBackupsReplication" ], "rds-data": [ "BatchExecuteStatement", @@ -7457,7 +8179,9 @@ ], "redshift": [ "AcceptReservedNodeExchange", + "AssociateDataShareConsumer", "AuthorizeClusterSecurityGroupIngress", + "AuthorizeDataShare", "AuthorizeSnapshotAccess", "BatchDeleteClusterSnapshots", "BatchModifyClusterSnapshots", @@ -7479,6 +8203,8 @@ "CreateSnapshotCopyGrant", "CreateSnapshotSchedule", "CreateTags", + "CreateUsageLimit", + "DeauthorizeDataShare", "DeleteCluster", "DeleteClusterParameterGroup", "DeleteClusterSecurityGroup", @@ -7492,6 +8218,7 @@ "DeleteSnapshotCopyGrant", "DeleteSnapshotSchedule", "DeleteTags", + "DeleteUsageLimit", "DescribeAccountAttributes", "DescribeClusterDbRevisions", "DescribeClusterParameterGroups", @@ -7502,6 +8229,9 @@ "DescribeClusterTracks", "DescribeClusterVersions", "DescribeClusters", + "DescribeDataShares", + "DescribeDataSharesForConsumer", + "DescribeDataSharesForProducer", "DescribeDefaultClusterParameters", "DescribeEventCategories", "DescribeEventSubscriptions", @@ -7523,8 +8253,10 @@ "DescribeTable", "DescribeTableRestoreStatus", "DescribeTags", + "DescribeUsageLimits", "DisableLogging", "DisableSnapshotCopy", + "DisassociateDataShareConsumer", "EnableLogging", "EnableSnapshotCopy", "ExecuteQuery", @@ -7536,6 +8268,7 @@ "ListSavedQueries", "ListSchemas", "ListTables", + "ModifyAquaConfiguration", "ModifyCluster", "ModifyClusterDbRevision", "ModifyClusterIamRoles", @@ -7549,9 +8282,11 @@ "ModifyScheduledAction", "ModifySnapshotCopyRetentionPeriod", "ModifySnapshotSchedule", + "ModifyUsageLimit", "PauseCluster", "PurchaseReservedNodeOffering", "RebootCluster", + "RejectDataShare", "ResetClusterParameterGroup", "ResizeCluster", "RestoreFromClusterSnapshot", @@ -7564,6 +8299,7 @@ "ViewQueriesInConsole" ], "redshift-data": [ + "BatchExecuteStatement", "CancelStatement", "DescribeStatement", "DescribeTable", @@ -7642,6 +8378,7 @@ "GroupResources", "ListGroupResources", "ListGroups", + "PutGroupConfiguration", "PutGroupPolicy", "SearchResources", "Tag", @@ -7712,28 +8449,35 @@ "UpdateWorldTemplate" ], "route53": [ + "ActivateKeySigningKey", "AssociateVPCWithHostedZone", "ChangeResourceRecordSets", "ChangeTagsForResource", "CreateHealthCheck", "CreateHostedZone", + "CreateKeySigningKey", "CreateQueryLoggingConfig", "CreateReusableDelegationSet", "CreateTrafficPolicy", "CreateTrafficPolicyInstance", "CreateTrafficPolicyVersion", "CreateVPCAssociationAuthorization", + "DeactivateKeySigningKey", "DeleteHealthCheck", "DeleteHostedZone", + "DeleteKeySigningKey", "DeleteQueryLoggingConfig", "DeleteReusableDelegationSet", "DeleteTrafficPolicy", "DeleteTrafficPolicyInstance", "DeleteVPCAssociationAuthorization", + "DisableHostedZoneDNSSEC", "DisassociateVPCFromHostedZone", + "EnableHostedZoneDNSSEC", "GetAccountLimit", "GetChange", "GetCheckerIpRanges", + "GetDNSSEC", "GetGeoLocation", "GetHealthCheck", "GetHealthCheckCount", @@ -7770,8 +8514,72 @@ "UpdateTrafficPolicyComment", "UpdateTrafficPolicyInstance" ], + "route53-recovery-cluster": [ + "GetRoutingControlState", + "UpdateRoutingControlState", + "UpdateRoutingControlStates" + ], + "route53-recovery-control-config": [ + "CreateCluster", + "CreateControlPanel", + "CreateRoutingControl", + "CreateSafetyRule", + "DeleteCluster", + "DeleteControlPanel", + "DeleteRoutingControl", + "DeleteSafetyRule", + "DescribeCluster", + "DescribeControlPanel", + "DescribeRoutingControl", + "DescribeRoutingControlByName", + "DescribeSafetyRule", + "ListAssociatedRoute53HealthChecks", + "ListClusters", + "ListControlPanels", + "ListRoutingControls", + "UpdateControlPanel", + "UpdateRoutingControl", + "UpdateSafetyRule" + ], + "route53-recovery-readiness": [ + "CreateCell", + "CreateCrossAccountAuthorization", + "CreateReadinessCheck", + "CreateRecoveryGroup", + "CreateResourceSet", + "DeleteCell", + "DeleteCrossAccountAuthorization", + "DeleteReadinessCheck", + "DeleteRecoveryGroup", + "DeleteResourceSet", + "GetArchitectureRecommendations", + "GetCell", + "GetCellReadinessSummary", + "GetReadinessCheck", + "GetReadinessCheckResourceStatus", + "GetReadinessCheckStatus", + "GetRecoveryGroup", + "GetRecoveryGroupReadinessStatus", + "GetResourceSet", + "ListCells", + "ListCrossAccountAuthorizations", + "ListReadinessChecks", + "ListRecoveryGroups", + "ListResourceSets", + "ListRules", + "ListTagsForResources", + "TagResource", + "UntagResource", + "UpdateCell", + "UpdateReadinessCheck", + "UpdateRecoveryGroup", + "UpdateResourceSet" + ], "route53domains": [ + "AcceptDomainTransferFromAnotherAwsAccount", + "CancelDomainTransferToAnotherAwsAccount", "CheckDomainAvailability", + "CheckDomainTransferability", "DeleteTagsForDomain", "DisableDomainAutoRenew", "DisableDomainTransferLock", @@ -7785,10 +8593,12 @@ "ListOperations", "ListTagsForDomain", "RegisterDomain", + "RejectDomainTransferFromAnotherAwsAccount", "RenewDomain", "ResendContactReachabilityEmail", "RetrieveDomainAuthCode", "TransferDomain", + "TransferDomainToAnotherAwsAccount", "UpdateDomainContact", "UpdateDomainContactPrivacy", "UpdateDomainNameservers", @@ -7980,19 +8790,27 @@ "AbortMultipartUpload", "DeleteObject", "DeleteObjectTagging", + "DeleteObjectVersion", + "DeleteObjectVersionTagging", "GetObject", "GetObjectAcl", "GetObjectLegalHold", "GetObjectRetention", "GetObjectTagging", "GetObjectVersion", + "GetObjectVersionAcl", + "GetObjectVersionTagging", "ListBucket", + "ListBucketMultipartUploads", + "ListBucketVersions", "ListMultipartUploadParts", "PutObject", "PutObjectAcl", "PutObjectLegalHold", "PutObjectRetention", "PutObjectTagging", + "PutObjectVersionAcl", + "PutObjectVersionTagging", "RestoreObject", "WriteGetObjectResponse" ], @@ -8035,6 +8853,7 @@ "AddTags", "AssociateTrialComponent", "BatchGetMetrics", + "BatchGetRecord", "BatchPutMetrics", "CreateAction", "CreateAlgorithm", @@ -8097,6 +8916,7 @@ "DeleteFeatureGroup", "DeleteFlowDefinition", "DeleteHumanLoop", + "DeleteHumanTaskUi", "DeleteImage", "DeleteImageVersion", "DeleteModel", @@ -8236,6 +9056,8 @@ "RenderUiTemplate", "Search", "SendHeartbeat", + "SendPipelineExecutionStepFailure", + "SendPipelineExecutionStepSuccess", "StartHumanLoop", "StartMonitoringSchedule", "StartNotebookInstance", @@ -8346,8 +9168,11 @@ "ListSecrets", "PutResourcePolicy", "PutSecretValue", + "RemoveRegionsFromReplication", + "ReplicateSecretToRegions", "RestoreSecret", "RotateSecret", + "StopReplicationToReplica", "TagResource", "UntagResource", "UpdateSecret", @@ -8355,6 +9180,7 @@ "ValidateResourcePolicy" ], "securityhub": [ + "AcceptAdministratorInvitation", "AcceptInvitation", "BatchDisableStandards", "BatchEnableStandards", @@ -8377,12 +9203,15 @@ "DisableImportFindingsForProduct", "DisableOrganizationAdminAccount", "DisableSecurityHub", + "DisassociateFromAdministratorAccount", "DisassociateFromMasterAccount", "DisassociateMembers", "EnableImportFindingsForProduct", "EnableOrganizationAdminAccount", "EnableSecurityHub", "GetAdhocInsightResults", + "GetAdministratorAccount", + "GetControlFindingSummary", "GetEnabledStandards", "GetFindings", "GetFreeTrialEndDate", @@ -8395,6 +9224,7 @@ "GetMembers", "GetUsage", "InviteMembers", + "ListControlEvaluationSummaries", "ListEnabledProductsForImport", "ListInvitations", "ListMembers", @@ -8464,6 +9294,7 @@ "DescribeCopyProductStatus", "DescribePortfolio", "DescribePortfolioShareStatus", + "DescribePortfolioShares", "DescribeProduct", "DescribeProductAsAdmin", "DescribeProductView", @@ -8488,7 +9319,9 @@ "ExecuteProvisionedProductServiceAction", "GetAWSOrganizationsAccessStatus", "GetApplication", + "GetAssociatedResource", "GetAttributeGroup", + "GetProvisionedProductOutputs", "ImportAsProvisionedProduct", "ListAcceptedPortfolioShares", "ListApplications", @@ -8527,6 +9360,7 @@ "UpdateAttributeGroup", "UpdateConstraint", "UpdatePortfolio", + "UpdatePortfolioShare", "UpdateProduct", "UpdateProvisionedProduct", "UpdateProvisionedProductProperties", @@ -8585,7 +9419,15 @@ "CreateConfigurationSet", "CreateConfigurationSetEventDestination", "CreateConfigurationSetTrackingOptions", + "CreateContact", + "CreateContactList", "CreateCustomVerificationEmailTemplate", + "CreateDedicatedIpPool", + "CreateDeliverabilityTestReport", + "CreateEmailIdentity", + "CreateEmailIdentityPolicy", + "CreateEmailTemplate", + "CreateImportJob", "CreateReceiptFilter", "CreateReceiptRule", "CreateReceiptRuleSet", @@ -8593,39 +9435,92 @@ "DeleteConfigurationSet", "DeleteConfigurationSetEventDestination", "DeleteConfigurationSetTrackingOptions", + "DeleteContact", + "DeleteContactList", "DeleteCustomVerificationEmailTemplate", + "DeleteDedicatedIpPool", + "DeleteEmailIdentity", + "DeleteEmailIdentityPolicy", + "DeleteEmailTemplate", "DeleteIdentity", "DeleteIdentityPolicy", "DeleteReceiptFilter", "DeleteReceiptRule", "DeleteReceiptRuleSet", + "DeleteSuppressedDestination", "DeleteTemplate", "DeleteVerifiedEmailAddress", "DescribeActiveReceiptRuleSet", "DescribeConfigurationSet", "DescribeReceiptRule", "DescribeReceiptRuleSet", + "GetAccount", "GetAccountSendingEnabled", + "GetBlacklistReports", + "GetConfigurationSet", + "GetConfigurationSetEventDestinations", + "GetContact", + "GetContactList", "GetCustomVerificationEmailTemplate", + "GetDedicatedIp", + "GetDedicatedIps", + "GetDeliverabilityDashboardOptions", + "GetDeliverabilityTestReport", + "GetDomainDeliverabilityCampaign", + "GetDomainStatisticsReport", + "GetEmailIdentity", + "GetEmailIdentityPolicies", + "GetEmailTemplate", "GetIdentityDkimAttributes", "GetIdentityMailFromDomainAttributes", "GetIdentityNotificationAttributes", "GetIdentityPolicies", "GetIdentityVerificationAttributes", + "GetImportJob", "GetSendQuota", "GetSendStatistics", + "GetSuppressedDestination", "GetTemplate", "ListConfigurationSets", + "ListContactLists", + "ListContacts", "ListCustomVerificationEmailTemplates", + "ListDedicatedIpPools", + "ListDeliverabilityTestReports", + "ListDomainDeliverabilityCampaigns", + "ListEmailIdentities", + "ListEmailTemplates", "ListIdentities", "ListIdentityPolicies", + "ListImportJobs", "ListReceiptFilters", "ListReceiptRuleSets", + "ListSuppressedDestinations", + "ListTagsForResource", "ListTemplates", "ListVerifiedEmailAddresses", + "PutAccountDedicatedIpWarmupAttributes", + "PutAccountDetails", + "PutAccountSendingAttributes", + "PutAccountSuppressionAttributes", + "PutConfigurationSetDeliveryOptions", + "PutConfigurationSetReputationOptions", + "PutConfigurationSetSendingOptions", + "PutConfigurationSetSuppressionOptions", + "PutConfigurationSetTrackingOptions", + "PutDedicatedIpInPool", + "PutDedicatedIpWarmupAttributes", + "PutDeliverabilityDashboardOption", + "PutEmailIdentityConfigurationSetAttributes", + "PutEmailIdentityDkimAttributes", + "PutEmailIdentityDkimSigningAttributes", + "PutEmailIdentityFeedbackAttributes", + "PutEmailIdentityMailFromAttributes", "PutIdentityPolicy", + "PutSuppressedDestination", "ReorderReceiptRuleSet", "SendBounce", + "SendBulkEmail", "SendBulkTemplatedEmail", "SendCustomVerificationEmail", "SendEmail", @@ -8638,13 +9533,20 @@ "SetIdentityMailFromDomain", "SetIdentityNotificationTopic", "SetReceiptRulePosition", + "TagResource", + "TestRenderEmailTemplate", "TestRenderTemplate", + "UntagResource", "UpdateAccountSendingEnabled", "UpdateConfigurationSetEventDestination", "UpdateConfigurationSetReputationMetricsEnabled", "UpdateConfigurationSetSendingEnabled", "UpdateConfigurationSetTrackingOptions", + "UpdateContact", + "UpdateContactList", "UpdateCustomVerificationEmailTemplate", + "UpdateEmailIdentityPolicy", + "UpdateEmailTemplate", "UpdateReceiptRule", "UpdateTemplate", "VerifyDomainDkim", @@ -8655,21 +9557,36 @@ "shield": [ "AssociateDRTLogBucket", "AssociateDRTRole", + "AssociateHealthCheck", + "AssociateProactiveEngagementDetails", "CreateProtection", + "CreateProtectionGroup", "CreateSubscription", "DeleteProtection", + "DeleteProtectionGroup", "DeleteSubscription", "DescribeAttack", + "DescribeAttackStatistics", "DescribeDRTAccess", "DescribeEmergencyContactSettings", "DescribeProtection", + "DescribeProtectionGroup", "DescribeSubscription", + "DisableProactiveEngagement", "DisassociateDRTLogBucket", "DisassociateDRTRole", + "DisassociateHealthCheck", + "EnableProactiveEngagement", "GetSubscriptionState", "ListAttacks", + "ListProtectionGroups", "ListProtections", + "ListResourcesInProtectionGroup", + "ListTagsForResource", + "TagResource", + "UntagResource", "UpdateEmergencyContactSettings", + "UpdateProtectionGroup", "UpdateSubscription" ], "signer": [ @@ -8746,18 +9663,23 @@ "CreateAddress", "CreateCluster", "CreateJob", + "CreateReturnShippingLabel", "DescribeAddress", "DescribeAddresses", "DescribeCluster", "DescribeJob", + "DescribeReturnShippingLabel", "GetJobManifest", "GetJobUnlockCode", "GetSnowballUsage", + "GetSoftwareUpdates", "ListClusterJobs", "ListClusters", + "ListCompatibleImages", "ListJobs", "UpdateCluster", - "UpdateJob" + "UpdateJob", + "UpdateJobShipmentState" ], "sns": [ "AddPermission", @@ -8765,18 +9687,23 @@ "ConfirmSubscription", "CreatePlatformApplication", "CreatePlatformEndpoint", + "CreateSMSSandboxPhoneNumber", "CreateTopic", "DeleteEndpoint", "DeletePlatformApplication", + "DeleteSMSSandboxPhoneNumber", "DeleteTopic", "GetEndpointAttributes", "GetPlatformApplicationAttributes", "GetSMSAttributes", + "GetSMSSandboxAccountStatus", "GetSubscriptionAttributes", "GetTopicAttributes", "ListEndpointsByPlatformApplication", + "ListOriginationNumbers", "ListPhoneNumbersOptedOut", "ListPlatformApplications", + "ListSMSSandboxPhoneNumbers", "ListSubscriptions", "ListSubscriptionsByTopic", "ListTagsForResource", @@ -8792,7 +9719,8 @@ "Subscribe", "TagResource", "Unsubscribe", - "UntagResource" + "UntagResource", + "VerifySMSSandboxPhoneNumber" ], "sqs": [ "AddPermission", @@ -8818,6 +9746,7 @@ ], "ssm": [ "AddTagsToResource", + "AssociateOpsItemRelatedItem", "CancelCommand", "CancelMaintenanceWindowExecution", "CreateActivation", @@ -8877,6 +9806,7 @@ "DescribePatchGroups", "DescribePatchProperties", "DescribeSessions", + "DisassociateOpsItemRelatedItem", "GetAutomationExecution", "GetCalendarState", "GetCommandInvocation", @@ -8915,6 +9845,7 @@ "ListInstanceAssociations", "ListInventoryEntries", "ListOpsItemEvents", + "ListOpsItemRelatedItems", "ListOpsMetadata", "ListResourceComplianceSummaries", "ListResourceDataSync", @@ -8956,6 +9887,65 @@ "UpdateResourceDataSync", "UpdateServiceSetting" ], + "ssm-contacts": [ + "AcceptPage", + "ActivateContactChannel", + "AssociateContact", + "CreateContact", + "CreateContactChannel", + "DeactivateContactChannel", + "DeleteContact", + "DeleteContactChannel", + "DeleteContactPolicy", + "DescribeEngagement", + "DescribePage", + "GetContact", + "GetContactChannel", + "ListContactChannels", + "ListContacts", + "ListEngagements", + "ListPageReceipts", + "ListPagesByContact", + "ListPagesByEngagement", + "PutContactPolicy", + "SendActivationCode", + "StartEngagement", + "StopEngagement", + "UpdateContact", + "UpdateContactChannel", + "UpdateContactPolicy" + ], + "ssm-incidents": [ + "CreateReplicationSet", + "CreateResponsePlan", + "CreateTimelineEvent", + "DeleteIncidentRecord", + "DeleteReplicationSet", + "DeleteResourcePolicy", + "DeleteResponsePlan", + "DeleteTimelineEvent", + "GetIncidentRecord", + "GetReplicationSet", + "GetResourcePolicies", + "GetResponsePlan", + "GetTimelineEvent", + "ListIncidentRecords", + "ListRelatedItems", + "ListReplicationSets", + "ListResponsePlans", + "ListTagsForResource", + "ListTimelineEvents", + "PutResourcePolicy", + "StartIncident", + "TagResource", + "UntagResource", + "UpdateDeletionProtection", + "UpdateIncidentRecord", + "UpdateRelatedItems", + "UpdateReplicationSet", + "UpdateResponsePlan", + "UpdateTimelineEvent" + ], "ssmmessages": [ "CreateControlChannel", "CreateDataChannel", @@ -9228,6 +10218,7 @@ "GetFederationToken", "GetServiceBearerToken", "GetSessionToken", + "SetSourceIdentity", "TagSession" ], "sumerian": [ @@ -9304,6 +10295,9 @@ "StartWorkflowExecution", "TagResource", "TerminateWorkflowExecution", + "UndeprecateActivityType", + "UndeprecateDomain", + "UndeprecateWorkflowType", "UntagResource" ], "synthetics": [ @@ -9311,6 +10305,8 @@ "DeleteCanary", "DescribeCanaries", "DescribeCanariesLastRun", + "DescribeRuntimeVersions", + "GetCanary", "GetCanaryRuns", "ListTagsForResource", "StartCanary", @@ -9364,10 +10360,13 @@ "GetQueryExplanation" ], "transcribe": [ + "CreateCallAnalyticsCategory", "CreateLanguageModel", "CreateMedicalVocabulary", "CreateVocabulary", "CreateVocabularyFilter", + "DeleteCallAnalyticsCategory", + "DeleteCallAnalyticsJob", "DeleteLanguageModel", "DeleteMedicalTranscriptionJob", "DeleteMedicalVocabulary", @@ -9375,23 +10374,29 @@ "DeleteVocabulary", "DeleteVocabularyFilter", "DescribeLanguageModel", + "GetCallAnalyticsCategory", + "GetCallAnalyticsJob", "GetMedicalTranscriptionJob", "GetMedicalVocabulary", "GetTranscriptionJob", "GetVocabulary", "GetVocabularyFilter", + "ListCallAnalyticsCategories", + "ListCallAnalyticsJobs", "ListLanguageModels", "ListMedicalTranscriptionJobs", "ListMedicalVocabularies", "ListTranscriptionJobs", "ListVocabularies", "ListVocabularyFilters", + "StartCallAnalyticsJob", "StartMedicalStreamTranscription", "StartMedicalStreamTranscriptionWebSocket", "StartMedicalTranscriptionJob", "StartStreamTranscription", "StartStreamTranscriptionWebSocket", "StartTranscriptionJob", + "UpdateCallAnalyticsCategory", "UpdateMedicalVocabulary", "UpdateVocabulary", "UpdateVocabularyFilter" @@ -9741,6 +10746,7 @@ "GetDocumentVersion", "GetFolder", "GetFolderPath", + "GetGroup", "GetResources", "InitiateDocumentVersionUpload", "RegisterDirectory", @@ -9798,6 +10804,7 @@ "CreateInboundMailFlowRule", "CreateMailDomain", "CreateMailUser", + "CreateMobileDeviceAccessRule", "CreateOrganization", "CreateOutboundMailFlowRule", "CreateResource", @@ -9810,6 +10817,7 @@ "DeleteMailDomain", "DeleteMailboxPermissions", "DeleteMobileDevice", + "DeleteMobileDeviceAccessRule", "DeleteOrganization", "DeleteOutboundMailFlowRule", "DeleteResource", @@ -9845,6 +10853,7 @@ "GetMailGroupDetails", "GetMailUserDetails", "GetMailboxDetails", + "GetMobileDeviceAccessEffect", "GetMobileDeviceDetails", "GetMobileDevicesForUser", "GetMobilePolicyDetails", @@ -9856,6 +10865,7 @@ "ListMailboxExportJobs", "ListMailboxPermissions", "ListMembersInMailGroup", + "ListMobileDeviceAccessRules", "ListOrganizations", "ListOutboundMailFlowRules", "ListResourceDelegates", @@ -9884,6 +10894,7 @@ "UntagResource", "UpdateInboundMailFlowRule", "UpdateMailboxQuota", + "UpdateMobileDeviceAccessRule", "UpdateOutboundMailFlowRule", "UpdatePrimaryEmailAddress", "UpdateResource", @@ -9894,38 +10905,59 @@ "GetRawMessageContent" ], "workspaces": [ + "AssociateConnectionAlias", "AssociateIpGroups", "AuthorizeIpRules", + "CopyWorkspaceImage", + "CreateConnectionAlias", "CreateIpGroup", "CreateTags", + "CreateWorkspaceBundle", "CreateWorkspaces", + "DeleteConnectionAlias", "DeleteIpGroup", "DeleteTags", + "DeleteWorkspaceBundle", "DeleteWorkspaceImage", + "DeregisterWorkspaceDirectory", "DescribeAccount", "DescribeAccountModifications", "DescribeClientProperties", + "DescribeConnectionAliasPermissions", + "DescribeConnectionAliases", "DescribeIpGroups", "DescribeTags", "DescribeWorkspaceBundles", "DescribeWorkspaceDirectories", + "DescribeWorkspaceImagePermissions", "DescribeWorkspaceImages", + "DescribeWorkspaceSnapshots", "DescribeWorkspaces", "DescribeWorkspacesConnectionStatus", + "DisassociateConnectionAlias", "DisassociateIpGroups", "ImportWorkspaceImage", "ListAvailableManagementCidrRanges", + "MigrateWorkspace", "ModifyAccount", "ModifyClientProperties", + "ModifySelfservicePermissions", + "ModifyWorkspaceAccessProperties", + "ModifyWorkspaceCreationProperties", "ModifyWorkspaceProperties", "ModifyWorkspaceState", "RebootWorkspaces", "RebuildWorkspaces", + "RegisterWorkspaceDirectory", + "RestoreWorkspace", "RevokeIpRules", "StartWorkspaces", "StopWorkspaces", "TerminateWorkspaces", - "UpdateRulesOfIpGroup" + "UpdateConnectionAliasPermission", + "UpdateRulesOfIpGroup", + "UpdateWorkspaceBundle", + "UpdateWorkspaceImagePermission" ], "xray": [ "BatchGetTraces", diff --git a/tests/data/placebo/test_airflow_environment_kms_filter/airflow.GetEnvironment_1.json b/tests/data/placebo/test_airflow_environment_kms_filter/airflow.GetEnvironment_1.json new file mode 100644 index 00000000000..bcbfaab5d3b --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_kms_filter/airflow.GetEnvironment_1.json @@ -0,0 +1,81 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environment": { + "AirflowConfigurationOptions": {}, + "AirflowVersion": "2.0.2", + "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/testEnvironment", + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "DagS3Path": "DAGs", + "EnvironmentClass": "mw1.small", + "ExecutionRoleArn": "arn:aws:iam::644160558196:role/service-role/AmazonMWAA-testEnvironment-8hhxpU", + "KmsKey": "arn:aws:kms:us-east-1:644160558196:key/f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "LastUpdate": { + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "Status": "SUCCESS" + }, + "LoggingConfiguration": { + "DagProcessingLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "SchedulerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "TaskLogs": { + "Enabled": false, + "LogLevel": "INFO" + }, + "WebserverLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "WorkerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + } + }, + "MaxWorkers": 10, + "MinWorkers": 1, + "Name": "testEnvironment", + "NetworkConfiguration": { + "SecurityGroupIds": [ + "sg-0566a027c6af2731f", + "sg-0d30141b566cfa039" + ], + "SubnetIds": [ + "subnet-068dfbf3f275a6ae8", + "subnet-03ec1a55eadb55221" + ] + }, + "Schedulers": 2, + "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA", + "SourceBucketArn": "arn:aws:s3:::airflow-test-c7n", + "Status": "AVAILABLE", + "Tags": {}, + "WebserverAccessMode": "PRIVATE_ONLY", + "WebserverUrl": "74b5c399-66b1-40ea-b332-dc50ecf8c560-vpce.c36.us-east-1.airflow.amazonaws.com", + "WeeklyMaintenanceWindowStart": "SUN:14:00" + } + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_kms_filter/airflow.ListEnvironments_1.json b/tests/data/placebo/test_airflow_environment_kms_filter/airflow.ListEnvironments_1.json new file mode 100644 index 00000000000..2d11f914fb0 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_kms_filter/airflow.ListEnvironments_1.json @@ -0,0 +1,9 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environments": [ + "testEnvironment" + ] + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_kms_filter/kms.DescribeKey_1.json b/tests/data/placebo/test_airflow_environment_kms_filter/kms.DescribeKey_1.json new file mode 100644 index 00000000000..7566165ea72 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_kms_filter/kms.DescribeKey_1.json @@ -0,0 +1,31 @@ +{ + "status_code": 200, + "data": { + "KeyMetadata": { + "KeyId": "f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "Arn": "arn:aws:kms:us-east-1:644160558196:key/f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "CreationDate": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 11, + "minute": 44, + "second": 43, + "microsecond": 48000 + }, + "Enabled": true, + "Description": "", + "KeyUsage": "ENCRYPT_DECRYPT", + "KeyState": "Enabled", + "Origin": "AWS_KMS", + "KeyManager": "CUSTOMER", + "CustomerMasterKeySpec": "SYMMETRIC_DEFAULT", + "EncryptionAlgorithms": [ + "SYMMETRIC_DEFAULT" + ], + "MultiRegion": false + }, + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_kms_filter/kms.ListAliases_1.json b/tests/data/placebo/test_airflow_environment_kms_filter/kms.ListAliases_1.json new file mode 100644 index 00000000000..89cf0395baf --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_kms_filter/kms.ListAliases_1.json @@ -0,0 +1,1113 @@ +{ + "status_code": 200, + "data": { + "Aliases": [ + { + "AliasName": "alias/BlockStorageKey", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/BlockStorageKey", + "TargetKeyId": "82645407-2faa-4d93-be71-7d6a8d59a5fc", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 6, + "day": 26, + "hour": 17, + "minute": 14, + "second": 50, + "microsecond": 36000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 6, + "day": 26, + "hour": 17, + "minute": 14, + "second": 50, + "microsecond": 36000 + } + }, + { + "AliasName": "alias/CMK-Rotation", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/CMK-Rotation", + "TargetKeyId": "a476e533-b970-4c74-a341-707420ecf59b", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 3, + "day": 15, + "hour": 14, + "minute": 28, + "second": 7, + "microsecond": 116000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 3, + "day": 15, + "hour": 14, + "minute": 28, + "second": 7, + "microsecond": 116000 + } + }, + { + "AliasName": "alias/alias/aws/lambda", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/alias/aws/lambda", + "TargetKeyId": "0d543df5-915c-42a1-afa1-c9c5f1f97955", + "CreationDate": { + "__class__": "datetime", + "year": 2020, + "month": 4, + "day": 20, + "hour": 18, + "minute": 57, + "second": 40, + "microsecond": 152000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2020, + "month": 4, + "day": 20, + "hour": 18, + "minute": 57, + "second": 40, + "microsecond": 152000 + } + }, + { + "AliasName": "alias/alias/skunk/glue/encrypted", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/alias/skunk/glue/encrypted", + "TargetKeyId": "358f7699-4ea5-455a-9c78-1c868301e5a8", + "CreationDate": { + "__class__": "datetime", + "year": 2019, + "month": 4, + "day": 9, + "hour": 16, + "minute": 14, + "second": 58, + "microsecond": 29000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2019, + "month": 4, + "day": 9, + "hour": 16, + "minute": 14, + "second": 58, + "microsecond": 29000 + } + }, + { + "AliasName": "alias/aws/acm", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/acm", + "TargetKeyId": "7efe5f36-5599-4a81-97b9-4c4aa4b64f93", + "CreationDate": { + "__class__": "datetime", + "year": 2017, + "month": 8, + "day": 2, + "hour": 11, + "minute": 37, + "second": 58, + "microsecond": 193000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2017, + "month": 8, + "day": 2, + "hour": 11, + "minute": 37, + "second": 58, + "microsecond": 193000 + } + }, + { + "AliasName": "alias/aws/backup", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/backup", + "TargetKeyId": "5d97ffc0-5842-49ce-9daf-6d0a129bf6c8", + "CreationDate": { + "__class__": "datetime", + "year": 2019, + "month": 1, + "day": 17, + "hour": 8, + "minute": 59, + "second": 50, + "microsecond": 308000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2019, + "month": 1, + "day": 17, + "hour": 8, + "minute": 59, + "second": 50, + "microsecond": 308000 + } + }, + { + "AliasName": "alias/aws/cloud9", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/cloud9", + "TargetKeyId": "0c34a807-a390-4128-ba02-463ccd3d8850", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 5, + "day": 16, + "hour": 11, + "minute": 27, + "second": 50, + "microsecond": 152000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 5, + "day": 16, + "hour": 11, + "minute": 27, + "second": 50, + "microsecond": 152000 + } + }, + { + "AliasName": "alias/aws/codeartifact", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/codeartifact", + "TargetKeyId": "a46cfc7a-5490-42d3-95b4-4e1b2f2de3c8", + "CreationDate": { + "__class__": "datetime", + "year": 2020, + "month": 9, + "day": 11, + "hour": 7, + "minute": 13, + "second": 29, + "microsecond": 5000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2020, + "month": 9, + "day": 11, + "hour": 7, + "minute": 13, + "second": 29, + "microsecond": 5000 + } + }, + { + "AliasName": "alias/aws/codecommit", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/codecommit", + "TargetKeyId": "aaac6583-1d5f-44a2-b535-0823b47ed00e", + "CreationDate": { + "__class__": "datetime", + "year": 2017, + "month": 4, + "day": 28, + "hour": 8, + "minute": 24, + "second": 26, + "microsecond": 660000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2017, + "month": 4, + "day": 28, + "hour": 8, + "minute": 24, + "second": 26, + "microsecond": 660000 + } + }, + { + "AliasName": "alias/aws/dax", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/dax", + "TargetKeyId": "41d914ce-35d9-472a-a41c-c76ae199698f", + "CreationDate": { + "__class__": "datetime", + "year": 2019, + "month": 3, + "day": 4, + "hour": 0, + "minute": 23, + "second": 18, + "microsecond": 491000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2019, + "month": 3, + "day": 4, + "hour": 0, + "minute": 23, + "second": 18, + "microsecond": 491000 + } + }, + { + "AliasName": "alias/aws/dms", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/dms", + "TargetKeyId": "f1f33a6b-91aa-4b0a-904c-f2a0378277f0", + "CreationDate": { + "__class__": "datetime", + "year": 2017, + "month": 10, + "day": 31, + "hour": 5, + "minute": 2, + "second": 54, + "microsecond": 343000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2017, + "month": 10, + "day": 31, + "hour": 5, + "minute": 2, + "second": 54, + "microsecond": 343000 + } + }, + { + "AliasName": "alias/aws/dynamodb", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/dynamodb", + "TargetKeyId": "8785aeb9-a616-4e2b-bbd3-df3cde76bcc5", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 30, + "hour": 15, + "minute": 56, + "second": 54, + "microsecond": 712000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 30, + "hour": 15, + "minute": 56, + "second": 54, + "microsecond": 712000 + } + }, + { + "AliasName": "alias/aws/ebs", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/ebs", + "TargetKeyId": "798bc4bb-3079-4a9a-bc27-2c7f2b6c91d0", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 6, + "day": 27, + "hour": 7, + "minute": 15, + "second": 48, + "microsecond": 408000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 6, + "day": 27, + "hour": 7, + "minute": 15, + "second": 48, + "microsecond": 408000 + } + }, + { + "AliasName": "alias/aws/elasticfilesystem", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/elasticfilesystem", + "TargetKeyId": "d38e6df4-3a19-4516-9f4b-ab568e9bccc5", + "CreationDate": { + "__class__": "datetime", + "year": 2017, + "month": 8, + "day": 19, + "hour": 8, + "minute": 18, + "second": 50, + "microsecond": 180000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2017, + "month": 8, + "day": 19, + "hour": 8, + "minute": 18, + "second": 50, + "microsecond": 180000 + } + }, + { + "AliasName": "alias/aws/es", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/es", + "TargetKeyId": "6917a312-adce-4bbc-8202-958f2db490fa", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 5, + "hour": 11, + "minute": 18, + "second": 17, + "microsecond": 948000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 5, + "hour": 11, + "minute": 18, + "second": 17, + "microsecond": 948000 + } + }, + { + "AliasName": "alias/aws/fsx", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/fsx", + "TargetKeyId": "7d30a034-2787-478a-85e7-1a2b85205fbc", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 12, + "day": 1, + "hour": 10, + "minute": 29, + "second": 19, + "microsecond": 589000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 12, + "day": 1, + "hour": 10, + "minute": 29, + "second": 19, + "microsecond": 589000 + } + }, + { + "AliasName": "alias/aws/glue", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/glue", + "TargetKeyId": "d12e743c-a297-447c-9c13-8f3c08f4161c", + "CreationDate": { + "__class__": "datetime", + "year": 2019, + "month": 2, + "day": 7, + "hour": 14, + "minute": 48, + "second": 17, + "microsecond": 804000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2019, + "month": 2, + "day": 7, + "hour": 14, + "minute": 48, + "second": 17, + "microsecond": 804000 + } + }, + { + "AliasName": "alias/aws/kafka", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/kafka", + "TargetKeyId": "133b4e81-8447-4c40-83cd-1db75d52b106", + "CreationDate": { + "__class__": "datetime", + "year": 2019, + "month": 1, + "day": 30, + "hour": 10, + "minute": 11, + "second": 4, + "microsecond": 839000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2019, + "month": 1, + "day": 30, + "hour": 10, + "minute": 11, + "second": 4, + "microsecond": 839000 + } + }, + { + "AliasName": "alias/aws/kinesis", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/kinesis", + "TargetKeyId": "f0108d2e-e1df-4a94-b1b6-9144085093cb", + "CreationDate": { + "__class__": "datetime", + "year": 2017, + "month": 7, + "day": 18, + "hour": 11, + "minute": 12, + "second": 2, + "microsecond": 439000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2017, + "month": 7, + "day": 18, + "hour": 11, + "minute": 12, + "second": 2, + "microsecond": 439000 + } + }, + { + "AliasName": "alias/aws/kinesisvideo", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/kinesisvideo", + "TargetKeyId": "d551d66a-1396-4c94-a6b7-e2edf550510c", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 30, + "hour": 15, + "minute": 56, + "second": 55, + "microsecond": 506000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 30, + "hour": 15, + "minute": 56, + "second": 55, + "microsecond": 506000 + } + }, + { + "AliasName": "alias/aws/lambda", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/lambda", + "TargetKeyId": "f4441361-1c8d-4710-8d6d-0b6d7cd0be11", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 20, + "hour": 7, + "minute": 36, + "second": 5, + "microsecond": 506000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 20, + "hour": 7, + "minute": 36, + "second": 5, + "microsecond": 506000 + } + }, + { + "AliasName": "alias/aws/lex", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/lex", + "TargetKeyId": "9835c962-ea8a-41ba-ab9e-32547228571d", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 26, + "hour": 11, + "minute": 15, + "second": 24, + "microsecond": 829000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 26, + "hour": 11, + "minute": 15, + "second": 24, + "microsecond": 829000 + } + }, + { + "AliasName": "alias/aws/lightsail", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/lightsail", + "TargetKeyId": "7147f795-71ee-4b59-8dd1-2fa32a55423c", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 1, + "hour": 14, + "minute": 10, + "second": 14, + "microsecond": 250000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 1, + "hour": 14, + "minute": 10, + "second": 14, + "microsecond": 250000 + } + }, + { + "AliasName": "alias/aws/rds", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/rds", + "TargetKeyId": "b10f842a-feb7-4318-92d5-0640a75b7688", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 22, + "hour": 3, + "minute": 35, + "second": 19, + "microsecond": 360000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 22, + "hour": 3, + "minute": 35, + "second": 19, + "microsecond": 360000 + } + }, + { + "AliasName": "alias/aws/redshift", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/redshift", + "TargetKeyId": "e39ed135-2a46-4d5e-8c05-41b8d900d0c7", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 9, + "day": 16, + "hour": 14, + "minute": 24, + "second": 39, + "microsecond": 392000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 9, + "day": 16, + "hour": 14, + "minute": 24, + "second": 39, + "microsecond": 392000 + } + }, + { + "AliasName": "alias/aws/s3", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/s3", + "TargetKeyId": "d1305425-4cde-46ee-be31-e2043dd4df39", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 20, + "hour": 15, + "minute": 7, + "second": 27, + "microsecond": 827000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 12, + "day": 20, + "hour": 15, + "minute": 7, + "second": 27, + "microsecond": 827000 + } + }, + { + "AliasName": "alias/aws/secretsmanager", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/secretsmanager", + "TargetKeyId": "19135ee1-cd2b-4553-a719-a960edf22ae4", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 5, + "day": 14, + "hour": 12, + "minute": 30, + "second": 11, + "microsecond": 456000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 5, + "day": 14, + "hour": 12, + "minute": 30, + "second": 11, + "microsecond": 456000 + } + }, + { + "AliasName": "alias/aws/sns", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/sns", + "TargetKeyId": "84c99eaf-7284-4645-bfe9-f627251e142d", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 12, + "day": 11, + "hour": 9, + "minute": 40, + "second": 55, + "microsecond": 580000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 12, + "day": 11, + "hour": 9, + "minute": 40, + "second": 55, + "microsecond": 580000 + } + }, + { + "AliasName": "alias/aws/sqs", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/sqs", + "TargetKeyId": "f38bfb26-b216-44eb-966e-0895978ad7ff", + "CreationDate": { + "__class__": "datetime", + "year": 2020, + "month": 6, + "day": 24, + "hour": 9, + "minute": 16, + "second": 54, + "microsecond": 813000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2020, + "month": 6, + "day": 24, + "hour": 9, + "minute": 16, + "second": 54, + "microsecond": 813000 + } + }, + { + "AliasName": "alias/aws/ssm", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/ssm", + "TargetKeyId": "13121aca-ffd6-45af-b640-4eb89f6d8fbd", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 30, + "hour": 15, + "minute": 56, + "second": 57, + "microsecond": 119000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 30, + "hour": 15, + "minute": 56, + "second": 57, + "microsecond": 119000 + } + }, + { + "AliasName": "alias/aws/workspaces", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/workspaces", + "TargetKeyId": "9a428455-22a2-45ba-bc56-173cb6bae1af", + "CreationDate": { + "__class__": "datetime", + "year": 2020, + "month": 7, + "day": 9, + "hour": 18, + "minute": 34, + "second": 24, + "microsecond": 951000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2020, + "month": 7, + "day": 9, + "hour": 18, + "minute": 34, + "second": 24, + "microsecond": 951000 + } + }, + { + "AliasName": "alias/aws/xray", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/aws/xray" + }, + { + "AliasName": "alias/cofxraytest", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/cofxraytest", + "TargetKeyId": "70b96f94-38b3-4a1f-96ad-7fe04b197e33", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 10, + "day": 3, + "hour": 11, + "minute": 33, + "second": 35, + "microsecond": 462000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 10, + "day": 3, + "hour": 11, + "minute": 33, + "second": 35, + "microsecond": 462000 + } + }, + { + "AliasName": "alias/cw", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/cw", + "TargetKeyId": "beedfd51-5158-44ae-a95f-d514f61abfb3", + "CreationDate": { + "__class__": "datetime", + "year": 2021, + "month": 2, + "day": 5, + "hour": 13, + "minute": 51, + "second": 16, + "microsecond": 35000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2021, + "month": 2, + "day": 5, + "hour": 13, + "minute": 51, + "second": 16, + "microsecond": 35000 + } + }, + { + "AliasName": "alias/data-sync-kms-key", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/data-sync-kms-key", + "TargetKeyId": "7d9388c0-8c78-4acb-ad3c-b9d1764522b2", + "CreationDate": { + "__class__": "datetime", + "year": 2021, + "month": 4, + "day": 8, + "hour": 16, + "minute": 3, + "second": 41, + "microsecond": 753000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2021, + "month": 4, + "day": 8, + "hour": 16, + "minute": 3, + "second": 41, + "microsecond": 753000 + } + }, + { + "AliasName": "alias/dynamo", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/dynamo", + "TargetKeyId": "8b71b4bf-c55c-4f67-9b19-47b2535b6512", + "CreationDate": { + "__class__": "datetime", + "year": 2019, + "month": 1, + "day": 15, + "hour": 17, + "minute": 52, + "second": 8, + "microsecond": 330000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2019, + "month": 1, + "day": 15, + "hour": 17, + "minute": 52, + "second": 8, + "microsecond": 330000 + } + }, + { + "AliasName": "alias/lambda", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/lambda", + "TargetKeyId": "a69548f6-9637-4325-b511-ac59056e7302", + "CreationDate": { + "__class__": "datetime", + "year": 2020, + "month": 4, + "day": 20, + "hour": 19, + "minute": 13, + "second": 47, + "microsecond": 644000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2020, + "month": 4, + "day": 20, + "hour": 19, + "minute": 13, + "second": 47, + "microsecond": 644000 + } + }, + { + "AliasName": "alias/mwaa", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/mwaa", + "TargetKeyId": "f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "CreationDate": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 14, + "minute": 12, + "second": 28, + "microsecond": 168000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 14, + "minute": 12, + "second": 28, + "microsecond": 168000 + } + }, + { + "AliasName": "alias/s3-custom", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/s3-custom", + "TargetKeyId": "3f2ab3af-cc4e-427b-b96d-d4356f9764c4", + "CreationDate": { + "__class__": "datetime", + "year": 2017, + "month": 8, + "day": 10, + "hour": 6, + "minute": 52, + "second": 52, + "microsecond": 363000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2017, + "month": 8, + "day": 10, + "hour": 6, + "minute": 52, + "second": 52, + "microsecond": 363000 + } + }, + { + "AliasName": "alias/sagemaker", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/sagemaker", + "TargetKeyId": "75d1e7ba-f9c5-46b9-97bc-28e6c834aa49", + "CreationDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 18, + "hour": 10, + "minute": 59, + "second": 7, + "microsecond": 315000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2018, + "month": 1, + "day": 18, + "hour": 10, + "minute": 59, + "second": 7, + "microsecond": 315000 + } + }, + { + "AliasName": "alias/skeezy", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/skeezy", + "TargetKeyId": "012af1cd-bef1-4ed5-b893-8b8d263ae6a4", + "CreationDate": { + "__class__": "datetime", + "year": 2020, + "month": 12, + "day": 9, + "hour": 15, + "minute": 31, + "second": 21, + "microsecond": 931000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2020, + "month": 12, + "day": 9, + "hour": 15, + "minute": 31, + "second": 21, + "microsecond": 931000 + } + }, + { + "AliasName": "alias/skunk-s3", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/skunk-s3", + "TargetKeyId": "845ab6f1-744c-4edc-b702-efae6836818a", + "CreationDate": { + "__class__": "datetime", + "year": 2017, + "month": 2, + "day": 18, + "hour": 21, + "minute": 9, + "second": 50, + "microsecond": 668000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2017, + "month": 2, + "day": 18, + "hour": 21, + "minute": 9, + "second": 50, + "microsecond": 668000 + } + }, + { + "AliasName": "alias/skunk/glue/encrypted", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/skunk/glue/encrypted", + "TargetKeyId": "ec3b9189-1247-4ecc-8bfd-c492f07621db", + "CreationDate": { + "__class__": "datetime", + "year": 2019, + "month": 4, + "day": 9, + "hour": 16, + "minute": 42, + "second": 46, + "microsecond": 643000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2019, + "month": 4, + "day": 9, + "hour": 16, + "minute": 42, + "second": 46, + "microsecond": 643000 + } + }, + { + "AliasName": "alias/skunk/trails", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/skunk/trails", + "TargetKeyId": "36812ccf-daaf-49b1-a24b-0eef254ffe41", + "CreationDate": { + "__class__": "datetime", + "year": 2016, + "month": 7, + "day": 24, + "hour": 4, + "minute": 51, + "second": 26, + "microsecond": 482000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2016, + "month": 7, + "day": 24, + "hour": 4, + "minute": 51, + "second": 26, + "microsecond": 482000 + } + }, + { + "AliasName": "alias/tes/pratyush", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/tes/pratyush", + "TargetKeyId": "082cd05f-96d1-49f6-a5ac-32093d2cfe38", + "CreationDate": { + "__class__": "datetime", + "year": 2021, + "month": 5, + "day": 13, + "hour": 13, + "minute": 2, + "second": 58, + "microsecond": 537000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2021, + "month": 5, + "day": 13, + "hour": 13, + "minute": 2, + "second": 58, + "microsecond": 537000 + } + } + ], + "Truncated": false, + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_kms_filter/kms.ListAliases_2.json b/tests/data/placebo/test_airflow_environment_kms_filter/kms.ListAliases_2.json new file mode 100644 index 00000000000..43f085eba20 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_kms_filter/kms.ListAliases_2.json @@ -0,0 +1,34 @@ +{ + "status_code": 200, + "data": { + "Aliases": [ + { + "AliasName": "alias/mwaa", + "AliasArn": "arn:aws:kms:us-east-1:644160558196:alias/mwaa", + "TargetKeyId": "f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "CreationDate": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 14, + "minute": 12, + "second": 28, + "microsecond": 168000 + }, + "LastUpdatedDate": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 14, + "minute": 12, + "second": 28, + "microsecond": 168000 + } + } + ], + "Truncated": false, + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_kms_filter/tagging.GetResources_1.json b/tests/data/placebo/test_airflow_environment_kms_filter/tagging.GetResources_1.json new file mode 100644 index 00000000000..8b704d1852a --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_kms_filter/tagging.GetResources_1.json @@ -0,0 +1,8 @@ +{ + "status_code": 200, + "data": { + "PaginationToken": "", + "ResourceTagMappingList": [], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_tag/airflow.GetEnvironment_1.json b/tests/data/placebo/test_airflow_environment_tag/airflow.GetEnvironment_1.json new file mode 100644 index 00000000000..bcbfaab5d3b --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_tag/airflow.GetEnvironment_1.json @@ -0,0 +1,81 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environment": { + "AirflowConfigurationOptions": {}, + "AirflowVersion": "2.0.2", + "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/testEnvironment", + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "DagS3Path": "DAGs", + "EnvironmentClass": "mw1.small", + "ExecutionRoleArn": "arn:aws:iam::644160558196:role/service-role/AmazonMWAA-testEnvironment-8hhxpU", + "KmsKey": "arn:aws:kms:us-east-1:644160558196:key/f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "LastUpdate": { + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "Status": "SUCCESS" + }, + "LoggingConfiguration": { + "DagProcessingLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "SchedulerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "TaskLogs": { + "Enabled": false, + "LogLevel": "INFO" + }, + "WebserverLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "WorkerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + } + }, + "MaxWorkers": 10, + "MinWorkers": 1, + "Name": "testEnvironment", + "NetworkConfiguration": { + "SecurityGroupIds": [ + "sg-0566a027c6af2731f", + "sg-0d30141b566cfa039" + ], + "SubnetIds": [ + "subnet-068dfbf3f275a6ae8", + "subnet-03ec1a55eadb55221" + ] + }, + "Schedulers": 2, + "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA", + "SourceBucketArn": "arn:aws:s3:::airflow-test-c7n", + "Status": "AVAILABLE", + "Tags": {}, + "WebserverAccessMode": "PRIVATE_ONLY", + "WebserverUrl": "74b5c399-66b1-40ea-b332-dc50ecf8c560-vpce.c36.us-east-1.airflow.amazonaws.com", + "WeeklyMaintenanceWindowStart": "SUN:14:00" + } + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_tag/airflow.GetEnvironment_2.json b/tests/data/placebo/test_airflow_environment_tag/airflow.GetEnvironment_2.json new file mode 100644 index 00000000000..7ce96ef88d0 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_tag/airflow.GetEnvironment_2.json @@ -0,0 +1,83 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environment": { + "AirflowConfigurationOptions": {}, + "AirflowVersion": "2.0.2", + "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/testEnvironment", + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "DagS3Path": "DAGs", + "EnvironmentClass": "mw1.small", + "ExecutionRoleArn": "arn:aws:iam::644160558196:role/service-role/AmazonMWAA-testEnvironment-8hhxpU", + "KmsKey": "arn:aws:kms:us-east-1:644160558196:key/f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "LastUpdate": { + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "Status": "SUCCESS" + }, + "LoggingConfiguration": { + "DagProcessingLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "SchedulerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "TaskLogs": { + "Enabled": false, + "LogLevel": "INFO" + }, + "WebserverLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "WorkerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + } + }, + "MaxWorkers": 10, + "MinWorkers": 1, + "Name": "testEnvironment", + "NetworkConfiguration": { + "SecurityGroupIds": [ + "sg-0566a027c6af2731f", + "sg-0d30141b566cfa039" + ], + "SubnetIds": [ + "subnet-068dfbf3f275a6ae8", + "subnet-03ec1a55eadb55221" + ] + }, + "Schedulers": 2, + "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA", + "SourceBucketArn": "arn:aws:s3:::airflow-test-c7n", + "Status": "AVAILABLE", + "Tags": { + "env": "dev" + }, + "WebserverAccessMode": "PRIVATE_ONLY", + "WebserverUrl": "74b5c399-66b1-40ea-b332-dc50ecf8c560-vpce.c36.us-east-1.airflow.amazonaws.com", + "WeeklyMaintenanceWindowStart": "SUN:14:00" + } + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_tag/airflow.ListEnvironments_1.json b/tests/data/placebo/test_airflow_environment_tag/airflow.ListEnvironments_1.json new file mode 100644 index 00000000000..2d11f914fb0 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_tag/airflow.ListEnvironments_1.json @@ -0,0 +1,9 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environments": [ + "testEnvironment" + ] + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_tag/airflow.TagResource_1.json b/tests/data/placebo/test_airflow_environment_tag/airflow.TagResource_1.json new file mode 100644 index 00000000000..4636bf11195 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_tag/airflow.TagResource_1.json @@ -0,0 +1,6 @@ +{ + "status_code": 204, + "data": { + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_untag/airflow.GetEnvironment_1.json b/tests/data/placebo/test_airflow_environment_untag/airflow.GetEnvironment_1.json new file mode 100644 index 00000000000..7ce96ef88d0 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_untag/airflow.GetEnvironment_1.json @@ -0,0 +1,83 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environment": { + "AirflowConfigurationOptions": {}, + "AirflowVersion": "2.0.2", + "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/testEnvironment", + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "DagS3Path": "DAGs", + "EnvironmentClass": "mw1.small", + "ExecutionRoleArn": "arn:aws:iam::644160558196:role/service-role/AmazonMWAA-testEnvironment-8hhxpU", + "KmsKey": "arn:aws:kms:us-east-1:644160558196:key/f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "LastUpdate": { + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "Status": "SUCCESS" + }, + "LoggingConfiguration": { + "DagProcessingLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "SchedulerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "TaskLogs": { + "Enabled": false, + "LogLevel": "INFO" + }, + "WebserverLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "WorkerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + } + }, + "MaxWorkers": 10, + "MinWorkers": 1, + "Name": "testEnvironment", + "NetworkConfiguration": { + "SecurityGroupIds": [ + "sg-0566a027c6af2731f", + "sg-0d30141b566cfa039" + ], + "SubnetIds": [ + "subnet-068dfbf3f275a6ae8", + "subnet-03ec1a55eadb55221" + ] + }, + "Schedulers": 2, + "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA", + "SourceBucketArn": "arn:aws:s3:::airflow-test-c7n", + "Status": "AVAILABLE", + "Tags": { + "env": "dev" + }, + "WebserverAccessMode": "PRIVATE_ONLY", + "WebserverUrl": "74b5c399-66b1-40ea-b332-dc50ecf8c560-vpce.c36.us-east-1.airflow.amazonaws.com", + "WeeklyMaintenanceWindowStart": "SUN:14:00" + } + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_untag/airflow.GetEnvironment_2.json b/tests/data/placebo/test_airflow_environment_untag/airflow.GetEnvironment_2.json new file mode 100644 index 00000000000..bcbfaab5d3b --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_untag/airflow.GetEnvironment_2.json @@ -0,0 +1,81 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environment": { + "AirflowConfigurationOptions": {}, + "AirflowVersion": "2.0.2", + "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/testEnvironment", + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "DagS3Path": "DAGs", + "EnvironmentClass": "mw1.small", + "ExecutionRoleArn": "arn:aws:iam::644160558196:role/service-role/AmazonMWAA-testEnvironment-8hhxpU", + "KmsKey": "arn:aws:kms:us-east-1:644160558196:key/f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "LastUpdate": { + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "Status": "SUCCESS" + }, + "LoggingConfiguration": { + "DagProcessingLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "SchedulerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "TaskLogs": { + "Enabled": false, + "LogLevel": "INFO" + }, + "WebserverLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "WorkerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + } + }, + "MaxWorkers": 10, + "MinWorkers": 1, + "Name": "testEnvironment", + "NetworkConfiguration": { + "SecurityGroupIds": [ + "sg-0566a027c6af2731f", + "sg-0d30141b566cfa039" + ], + "SubnetIds": [ + "subnet-068dfbf3f275a6ae8", + "subnet-03ec1a55eadb55221" + ] + }, + "Schedulers": 2, + "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA", + "SourceBucketArn": "arn:aws:s3:::airflow-test-c7n", + "Status": "AVAILABLE", + "Tags": {}, + "WebserverAccessMode": "PRIVATE_ONLY", + "WebserverUrl": "74b5c399-66b1-40ea-b332-dc50ecf8c560-vpce.c36.us-east-1.airflow.amazonaws.com", + "WeeklyMaintenanceWindowStart": "SUN:14:00" + } + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_untag/airflow.ListEnvironments_1.json b/tests/data/placebo/test_airflow_environment_untag/airflow.ListEnvironments_1.json new file mode 100644 index 00000000000..2d11f914fb0 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_untag/airflow.ListEnvironments_1.json @@ -0,0 +1,9 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environments": [ + "testEnvironment" + ] + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_untag/airflow.UntagResource_1.json b/tests/data/placebo/test_airflow_environment_untag/airflow.UntagResource_1.json new file mode 100644 index 00000000000..4636bf11195 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_untag/airflow.UntagResource_1.json @@ -0,0 +1,6 @@ +{ + "status_code": 204, + "data": { + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_value_filter/airflow.GetEnvironment_1.json b/tests/data/placebo/test_airflow_environment_value_filter/airflow.GetEnvironment_1.json new file mode 100644 index 00000000000..bcbfaab5d3b --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_value_filter/airflow.GetEnvironment_1.json @@ -0,0 +1,81 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environment": { + "AirflowConfigurationOptions": {}, + "AirflowVersion": "2.0.2", + "Arn": "arn:aws:airflow:us-east-1:644160558196:environment/testEnvironment", + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "DagS3Path": "DAGs", + "EnvironmentClass": "mw1.small", + "ExecutionRoleArn": "arn:aws:iam::644160558196:role/service-role/AmazonMWAA-testEnvironment-8hhxpU", + "KmsKey": "arn:aws:kms:us-east-1:644160558196:key/f9ee2a11-fe4a-4d98-a611-3621e71fd212", + "LastUpdate": { + "CreatedAt": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 14, + "hour": 13, + "minute": 53, + "second": 4, + "microsecond": 0 + }, + "Status": "SUCCESS" + }, + "LoggingConfiguration": { + "DagProcessingLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "SchedulerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "TaskLogs": { + "Enabled": false, + "LogLevel": "INFO" + }, + "WebserverLogs": { + "Enabled": false, + "LogLevel": "WARNING" + }, + "WorkerLogs": { + "Enabled": false, + "LogLevel": "WARNING" + } + }, + "MaxWorkers": 10, + "MinWorkers": 1, + "Name": "testEnvironment", + "NetworkConfiguration": { + "SecurityGroupIds": [ + "sg-0566a027c6af2731f", + "sg-0d30141b566cfa039" + ], + "SubnetIds": [ + "subnet-068dfbf3f275a6ae8", + "subnet-03ec1a55eadb55221" + ] + }, + "Schedulers": 2, + "ServiceRoleArn": "arn:aws:iam::644160558196:role/aws-service-role/airflow.amazonaws.com/AWSServiceRoleForAmazonMWAA", + "SourceBucketArn": "arn:aws:s3:::airflow-test-c7n", + "Status": "AVAILABLE", + "Tags": {}, + "WebserverAccessMode": "PRIVATE_ONLY", + "WebserverUrl": "74b5c399-66b1-40ea-b332-dc50ecf8c560-vpce.c36.us-east-1.airflow.amazonaws.com", + "WeeklyMaintenanceWindowStart": "SUN:14:00" + } + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_airflow_environment_value_filter/airflow.ListEnvironments_1.json b/tests/data/placebo/test_airflow_environment_value_filter/airflow.ListEnvironments_1.json new file mode 100644 index 00000000000..2d11f914fb0 --- /dev/null +++ b/tests/data/placebo/test_airflow_environment_value_filter/airflow.ListEnvironments_1.json @@ -0,0 +1,9 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {}, + "Environments": [ + "testEnvironment" + ] + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.DeleteDeploymentGroup_1.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.DeleteDeploymentGroup_1.json new file mode 100644 index 00000000000..9a55dbd99ff --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.DeleteDeploymentGroup_1.json @@ -0,0 +1,7 @@ +{ + "status_code": 200, + "data": { + "hooksNotCleanedUp": [], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_1.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_1.json new file mode 100644 index 00000000000..ee439cb18e8 --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_1.json @@ -0,0 +1,84 @@ +{ + "status_code": 200, + "data": { + "deploymentGroupInfo": { + "applicationName": "c7n-abc", + "deploymentGroupId": "d247ae32-3a87-4bbb-8aef-1986aca70a1e", + "deploymentGroupName": "World", + "deploymentConfigName": "CodeDeployDefault.LambdaAllAtOnce", + "ec2TagFilters": [], + "onPremisesInstanceTagFilters": [], + "autoScalingGroups": [], + "serviceRoleArn": "arn:aws:iam::644160558196:role/custodian-codebuild", + "targetRevision": { + "revisionType": "S3", + "s3Location": { + "bucket": "reboot-s3-bad-01", + "key": "appspec.yml", + "bundleType": "YAML" + } + }, + "triggerConfigurations": [], + "alarmConfiguration": { + "enabled": false, + "ignorePollAlarmFailure": false, + "alarms": [] + }, + "deploymentStyle": { + "deploymentType": "BLUE_GREEN", + "deploymentOption": "WITH_TRAFFIC_CONTROL" + }, + "outdatedInstancesStrategy": "UPDATE", + "lastSuccessfulDeployment": { + "deploymentId": "d-Y7J3BCY5C", + "status": "Succeeded", + "endTime": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 22, + "hour": 1, + "minute": 41, + "second": 3, + "microsecond": 69000 + }, + "createTime": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 22, + "hour": 1, + "minute": 40, + "second": 59, + "microsecond": 647000 + } + }, + "lastAttemptedDeployment": { + "deploymentId": "d-Y7J3BCY5C", + "status": "Succeeded", + "endTime": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 22, + "hour": 1, + "minute": 41, + "second": 3, + "microsecond": 69000 + }, + "createTime": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 22, + "hour": 1, + "minute": 40, + "second": 59, + "microsecond": 647000 + } + }, + "computePlatform": "Lambda" + }, + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_2.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_2.json new file mode 100644 index 00000000000..a8dabc1b36c --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_2.json @@ -0,0 +1,28 @@ +{ + "status_code": 200, + "data": { + "deploymentGroupInfo": { + "applicationName": "test", + "deploymentGroupId": "653b64f1-6194-4dfa-96b7-58634abeff3c", + "deploymentGroupName": "test", + "deploymentConfigName": "CodeDeployDefault.LambdaAllAtOnce", + "ec2TagFilters": [], + "onPremisesInstanceTagFilters": [], + "autoScalingGroups": [], + "serviceRoleArn": "arn:aws:iam::644160558196:role/custodian-codebuild", + "triggerConfigurations": [], + "alarmConfiguration": { + "enabled": false, + "ignorePollAlarmFailure": false, + "alarms": [] + }, + "deploymentStyle": { + "deploymentType": "BLUE_GREEN", + "deploymentOption": "WITH_TRAFFIC_CONTROL" + }, + "outdatedInstancesStrategy": "UPDATE", + "computePlatform": "Lambda" + }, + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_3.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_3.json new file mode 100644 index 00000000000..c89dda3947f --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.GetDeploymentGroup_3.json @@ -0,0 +1,10 @@ +{ + "status_code": 400, + "data": { + "Error": { + "Message": "No Deployment Group found for name: World", + "Code": "DeploymentGroupDoesNotExistException" + }, + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListApplications_1.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListApplications_1.json new file mode 100644 index 00000000000..724d1541079 --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListApplications_1.json @@ -0,0 +1,10 @@ +{ + "status_code": 200, + "data": { + "applications": [ + "c7n-abc", + "test" + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListDeploymentGroups_1.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListDeploymentGroups_1.json new file mode 100644 index 00000000000..8380b6f5bfb --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListDeploymentGroups_1.json @@ -0,0 +1,10 @@ +{ + "status_code": 200, + "data": { + "applicationName": "c7n-abc", + "deploymentGroups": [ + "World" + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListDeploymentGroups_2.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListDeploymentGroups_2.json new file mode 100644 index 00000000000..aacb2679173 --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListDeploymentGroups_2.json @@ -0,0 +1,10 @@ +{ + "status_code": 200, + "data": { + "applicationName": "test", + "deploymentGroups": [ + "test" + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListTagsForResource_1.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListTagsForResource_1.json new file mode 100644 index 00000000000..e41b16b3e98 --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListTagsForResource_1.json @@ -0,0 +1,7 @@ +{ + "status_code": 200, + "data": { + "Tags": [], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListTagsForResource_2.json b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListTagsForResource_2.json new file mode 100644 index 00000000000..e41b16b3e98 --- /dev/null +++ b/tests/data/placebo/test_codedeploy_deploymentgroup_delete/codedeploy.ListTagsForResource_2.json @@ -0,0 +1,7 @@ +{ + "status_code": 200, + "data": { + "Tags": [], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_delete_codedeploy_application/codedeploy.BatchGetApplications_1.json b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.BatchGetApplications_1.json new file mode 100644 index 00000000000..70f527c2f5a --- /dev/null +++ b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.BatchGetApplications_1.json @@ -0,0 +1,24 @@ +{ + "status_code": 200, + "data": { + "applicationsInfo": [ + { + "applicationId": "38b7c7b7-2fbd-46a9-a7ef-8233d81a462f", + "applicationName": "HelloWorld", + "createTime": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 12, + "hour": 16, + "minute": 37, + "second": 50, + "microsecond": 963000 + }, + "linkedToGitHub": false, + "computePlatform": "Lambda" + } + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_delete_codedeploy_application/codedeploy.DeleteApplication_1.json b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.DeleteApplication_1.json new file mode 100644 index 00000000000..5b2170a073c --- /dev/null +++ b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.DeleteApplication_1.json @@ -0,0 +1,6 @@ +{ + "status_code": 200, + "data": { + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListApplications_1.json b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListApplications_1.json new file mode 100644 index 00000000000..d6b1eb409f4 --- /dev/null +++ b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListApplications_1.json @@ -0,0 +1,9 @@ +{ + "status_code": 200, + "data": { + "applications": [ + "HelloWorld" + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListApplications_2.json b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListApplications_2.json new file mode 100644 index 00000000000..90211ee78f5 --- /dev/null +++ b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListApplications_2.json @@ -0,0 +1,7 @@ +{ + "status_code": 200, + "data": { + "applications": [], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListTagsForResource_1.json b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListTagsForResource_1.json new file mode 100644 index 00000000000..4b22ba61636 --- /dev/null +++ b/tests/data/placebo/test_delete_codedeploy_application/codedeploy.ListTagsForResource_1.json @@ -0,0 +1,12 @@ +{ + "status_code": 200, + "data": { + "Tags": [ + { + "Key": "c7n", + "Value": "test" + } + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.BatchGetApplications_1.json b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.BatchGetApplications_1.json new file mode 100644 index 00000000000..0f3fd63bd7b --- /dev/null +++ b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.BatchGetApplications_1.json @@ -0,0 +1,40 @@ +{ + "status_code": 200, + "data": { + "applicationsInfo": [ + { + "applicationId": "38b7c7b7-2fbd-46a9-a7ef-8233d81a462f", + "applicationName": "HelloWorld", + "createTime": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 12, + "hour": 16, + "minute": 37, + "second": 50, + "microsecond": 963000 + }, + "linkedToGitHub": false, + "computePlatform": "Lambda" + }, + { + "applicationId": "be5890f2-5437-409b-9633-4fc105fcb922", + "applicationName": "cloud-custodian", + "createTime": { + "__class__": "datetime", + "year": 2021, + "month": 7, + "day": 19, + "hour": 10, + "minute": 42, + "second": 29, + "microsecond": 520000 + }, + "linkedToGitHub": false, + "computePlatform": "Lambda" + } + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListApplications_1.json b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListApplications_1.json new file mode 100644 index 00000000000..2c6ff70fb6e --- /dev/null +++ b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListApplications_1.json @@ -0,0 +1,10 @@ +{ + "status_code": 200, + "data": { + "applications": [ + "HelloWorld", + "cloud-custodian" + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_1.json b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_1.json new file mode 100644 index 00000000000..4b22ba61636 --- /dev/null +++ b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_1.json @@ -0,0 +1,12 @@ +{ + "status_code": 200, + "data": { + "Tags": [ + { + "Key": "c7n", + "Value": "test" + } + ], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_2.json b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_2.json new file mode 100644 index 00000000000..e41b16b3e98 --- /dev/null +++ b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_2.json @@ -0,0 +1,7 @@ +{ + "status_code": 200, + "data": { + "Tags": [], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_3.json b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_3.json new file mode 100644 index 00000000000..e41b16b3e98 --- /dev/null +++ b/tests/data/placebo/test_tag_untag_codedeploy_application/codedeploy.ListTagsForResource_3.json @@ -0,0 +1,7 @@ +{ + "status_code": 200, + "data": { + "Tags": [], + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/data/placebo/test_tag_untag_codedeploy_application/tagging.UntagResources_1.json b/tests/data/placebo/test_tag_untag_codedeploy_application/tagging.UntagResources_1.json new file mode 100644 index 00000000000..bd2dead8598 --- /dev/null +++ b/tests/data/placebo/test_tag_untag_codedeploy_application/tagging.UntagResources_1.json @@ -0,0 +1,7 @@ +{ + "status_code": 200, + "data": { + "FailedResourcesMap": {}, + "ResponseMetadata": {} + } +} \ No newline at end of file diff --git a/tests/test_airflow.py b/tests/test_airflow.py new file mode 100644 index 00000000000..aa974cbc9cd --- /dev/null +++ b/tests/test_airflow.py @@ -0,0 +1,98 @@ +# Copyright The Cloud Custodian Authors. +# SPDX-License-Identifier: Apache-2.0 +from .common import BaseTest +import jmespath + + +class TestApacheAirflow(BaseTest): + def test_airflow_environment_value_filter(self): + session_factory = self.replay_flight_data('test_airflow_environment_value_filter') + p = self.load_policy( + { + "name": "airflow-name-filter", + "resource": "airflow", + "filters": [ + { + "type": "value", + "key": "Name", + "op": "eq", + "value": "testEnvironment", + } + ] + }, + session_factory=session_factory, + ) + resources = p.run() + self.assertEqual(len(resources), 1) + self.assertEqual(resources[0]['Name'], 'testEnvironment') + self.assertEqual(resources[0]['c7n:MatchedFilters'], ['Name']) + + def test_airflow_environment_kms_filter(self): + session_factory = self.replay_flight_data('test_airflow_environment_kms_filter') + kms = session_factory().client('kms') + expression = 'KmsKey' + p = self.load_policy( + { + "name": "airflow-kms-filter", + "resource": "airflow", + "filters": [ + { + "type": "kms-key", + "key": "c7n:AliasName", + "value": "alias/mwaa", + } + ] + }, + session_factory=session_factory, + ) + resources = p.run() + self.assertTrue(len(resources), 1) + aliases = kms.list_aliases(KeyId=(jmespath.search(expression, resources[0]))) + self.assertEqual(aliases['Aliases'][0]['AliasName'], 'alias/mwaa') + + def test_airflow_environment_tag(self): + session_factory = self.replay_flight_data('test_airflow_environment_tag') + new_tag = {'env': 'dev'} + p = self.load_policy( + { + 'name': 'airflow-tag', + 'resource': 'airflow', + 'filters': [{ + 'tag:env': 'absent' + }], + 'actions': [{ + 'type': 'tag', + 'tags': new_tag + }] + }, + session_factory=session_factory + ) + resources = p.run() + self.assertEqual(1, len(resources)) + name = resources[0].get('Name') + airflow = session_factory().client('mwaa') + call = airflow.get_environment(Name=name) + self.assertEqual(new_tag, call['Environment'].get('Tags')) + + def test_airflow_environment_untag(self): + session_factory = self.replay_flight_data('test_airflow_environment_untag') + p = self.load_policy( + { + 'name': 'airflow-untag', + 'resource': 'airflow', + 'filters': [{ + 'tag:env': 'dev' + }], + 'actions': [{ + 'type': 'remove-tag', + 'tags': ['env'] + }] + }, + session_factory=session_factory + ) + resources = p.run() + self.assertEqual(1, len(resources)) + name = resources[0].get('Name') + airflow = session_factory().client('mwaa') + call = airflow.get_environment(Name=name) + self.assertEqual({}, call['Environment'].get('Tags')) diff --git a/tests/test_code.py b/tests/test_code.py index f1820e0d4be..863fca2ed10 100644 --- a/tests/test_code.py +++ b/tests/test_code.py @@ -4,6 +4,7 @@ from .common import BaseTest, event_data from c7n.resources.aws import shape_validate +from botocore.exceptions import ClientError class CodeArtifact(BaseTest): @@ -215,3 +216,64 @@ def test_delete_pipeline(self): if self.recording: time.sleep(2) self.assertFalse(client.list_pipelines().get('pipelines')) + + +class CodeDeploy(BaseTest): + + def test_delete_codedeploy_application(self): + factory = self.replay_flight_data('test_delete_codedeploy_application') + p = self.load_policy( + { + "name": "codedeploy-delete-application", + "resource": "codedeploy-app", + "filters": [{"linkedToGitHub": False}], + "actions": ["delete"], + }, + session_factory=factory) + resources = p.run() + self.assertEqual(len(resources), 1) + client = factory().client('codedeploy') + if self.recording: + time.sleep(2) + self.assertFalse(client.list_applications().get('applications')) + + def test_tag_untag_codedeploy_application(self): + factory = self.replay_flight_data('test_tag_untag_codedeploy_application') + p = self.load_policy( + { + "name": "codedeploy-tag-application", + "resource": "codedeploy-app", + "filters": [{"tag:c7n": "test"}], + "actions": [{"type": "remove-tag", "tags": ["c7n"]}], + }, + session_factory=factory) + resources = p.run() + self.assertEqual(len(resources), 1) + client = factory().client('codedeploy') + arn = p.resource_manager.generate_arn(resources[0]["applicationName"]) + self.assertEqual(len(client.list_tags_for_resource(ResourceArn=arn).get('Tags')), 0) + + def test_codedeploy_deploymentgroup_delete(self): + factory = self.replay_flight_data('test_codedeploy_deploymentgroup_delete') + p = self.load_policy( + { + "name": "codedeploy-delete-deploymentgroup", + "resource": "codedeploy-group", + "filters": [ + { + "type": "value", + "key": "targetRevision.revisionType", + "value": "S3" + } + ], + "actions": [{"type": "delete"}], + }, + session_factory=factory) + resources = p.run() + self.assertEqual(len(resources), 1) + client = factory().client('codedeploy') + with self.assertRaises(ClientError) as e: + client.get_deployment_group(applicationName=resources[0]['applicationName'], + deploymentGroupName=resources[0]['deploymentGroupName']) + self.assertEqual( + e.exception.response['Error']['Code'], 'DeploymentGroupDoesNotExistException') diff --git a/tests/test_iamgen.py b/tests/test_iamgen.py index b0700dbd794..37a27242adf 100644 --- a/tests/test_iamgen.py +++ b/tests/test_iamgen.py @@ -32,7 +32,7 @@ def check_permissions(self, perm_db, perm_set, path): def test_iam_permissions_validity(self): cfg = Config.empty() missing = set() - all_invalid = [] + invalid = [] perms = load_data('iam-actions.json') resources.load_available() @@ -41,7 +41,6 @@ def test_iam_permissions_validity(self): p = Bag({'name': 'permcheck', 'resource': k, 'provider_name': 'aws'}) ctx = self.get_context(config=cfg, policy=p) mgr = v(ctx, p) - invalid = [] # if getattr(mgr, 'permissions', None): # print(mgr) @@ -71,17 +70,10 @@ def test_iam_permissions_validity(self): perms, f({}, mgr).get_permissions(), "{k}.filters.{n}".format(k=k, n=n))) - if invalid: - for k, perm_set in invalid: - perm_set = [i for i in perm_set - if not i.startswith('elasticloadbalancing')] - if perm_set: - all_invalid.append((k, perm_set)) - if missing: raise ValueError( "resources missing service %s" % ('\n'.join(sorted(missing)))) - if all_invalid: + if invalid: raise ValueError( - "invalid permissions \n %s" % ('\n'.join(sorted(map(str, all_invalid))))) + "invalid permissions \n %s" % ('\n'.join(sorted(map(str, invalid))))) diff --git a/tests/test_policy.py b/tests/test_policy.py index 6119d4c70a5..2cda20a40ff 100644 --- a/tests/test_policy.py +++ b/tests/test_policy.py @@ -188,7 +188,7 @@ def test_resource_arn_override_generator(self): overrides = overrides.difference( {'account', 's3', 'hostedzone', 'log-group', 'rest-api', 'redshift-snapshot', - 'rest-stage'}) + 'rest-stage', 'codedeploy-app', 'codedeploy-group'}) if overrides: raise ValueError("unknown arn overrides in %s" % (", ".join(overrides))) @@ -247,6 +247,9 @@ def test_securityhub_resource_support(self): whitelist = set(('AwsS3Object', 'Container')) todo = set(( + # q3 2021 + 'AwsEcsService', + 'AwsRdsEventSubscription', # q2 2021 'AwsEcsTaskDefinition', 'AwsEcsCluster', @@ -378,7 +381,7 @@ def test_resource_meta_with_class(self): def test_resource_type_empty_metadata(self): empty = set() for k, v in manager.resources.items(): - if k in ('rest-account', 'account'): + if k in ('rest-account', 'account', 'codedeploy-deployment'): continue for rk, rv in v.resource_type.__dict__.items(): if rk[0].isalnum() and rv is None: diff --git a/tools/c7n_azure/poetry.lock b/tools/c7n_azure/poetry.lock index 36ae91e07bf..dbb32cf41c9 100644 --- a/tools/c7n_azure/poetry.lock +++ b/tools/c7n_azure/poetry.lock @@ -84,7 +84,7 @@ python-versions = "*" [[package]] name = "azure-core" -version = "1.15.0" +version = "1.17.0" description = "Microsoft Azure Core Library for Python" category = "main" optional = false @@ -357,14 +357,14 @@ msrest = ">=0.6.21" [[package]] name = "azure-mgmt-core" -version = "1.2.2" +version = "1.3.0" description = "Microsoft Azure Management Core Library for Python" category = "main" optional = false python-versions = "*" [package.dependencies] -azure-core = ">=1.9.0,<2.0.0" +azure-core = ">=1.15.0,<2.0.0" [[package]] name = "azure-mgmt-cosmosdb" @@ -818,24 +818,27 @@ msrest = ">=0.6.18" [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -847,7 +850,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -877,7 +880,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.5" +version = "1.14.6" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -887,12 +890,15 @@ python-versions = "*" pycparser = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "click" @@ -931,15 +937,15 @@ python-versions = "*" [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -956,7 +962,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [[package]] name = "importlib-resources" -version = "5.2.0" +version = "5.2.2" description = "Read resources from Python packages" category = "main" optional = false @@ -1008,7 +1014,7 @@ format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator [[package]] name = "msal" -version = "1.12.0" +version = "1.13.0" description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect." category = "main" optional = false @@ -1156,7 +1162,7 @@ python-versions = ">=3.6" [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "main" optional = false @@ -1191,21 +1197,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "requests-oauthlib" @@ -1224,11 +1230,11 @@ rsa = ["oauthlib[signedtoken] (>=3.0.0)"] [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -1335,7 +1341,7 @@ typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false @@ -1343,7 +1349,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -1376,8 +1382,8 @@ azure-common = [ {file = "azure_common-1.1.27-py2.py3-none-any.whl", hash = "sha256:426673962740dbe9aab052a4b52df39c07767decd3f25fdc87c9d4c566a04934"}, ] azure-core = [ - {file = "azure-core-1.15.0.zip", hash = "sha256:197917b98fec661c35392e32abec4f690ac2117371a814e25e57c224ce23cf1f"}, - {file = "azure_core-1.15.0-py2.py3-none-any.whl", hash = "sha256:74631dff314fd44419ac6a3a38e8af68418b08a1b6e6793128555db20501dd07"}, + {file = "azure-core-1.17.0.zip", hash = "sha256:25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46"}, + {file = "azure_core-1.17.0-py2.py3-none-any.whl", hash = "sha256:906e031a8241fe0794ec4137aca77a1aeab2ebde5cd6049c377d05cb6b87b691"}, ] azure-cosmos = [ {file = "azure-cosmos-3.2.0.tar.gz", hash = "sha256:4f77cc558fecffac04377ba758ac4e23f076dc1c54e2cf2515f85bc15cbde5c6"}, @@ -1460,8 +1466,8 @@ azure-mgmt-containerservice = [ {file = "azure_mgmt_containerservice-15.1.0-py2.py3-none-any.whl", hash = "sha256:bdf45e58cb2f25d015837abe8935baedc09d1c2cee278d9827ecbdd4daf45470"}, ] azure-mgmt-core = [ - {file = "azure-mgmt-core-1.2.2.zip", hash = "sha256:4246810996107f72482a9351cf918d380c257e90942144ec9c0c2abda1d0a312"}, - {file = "azure_mgmt_core-1.2.2-py2.py3-none-any.whl", hash = "sha256:d36bd595dff6a1509ed52a89ee8dd88b83200320a6afa60fb4186afcb8978ce5"}, + {file = "azure-mgmt-core-1.3.0.zip", hash = "sha256:3ffb7352b39e5495dccc2d2b47254f4d82747aff4735e8bf3267c335b0c9bb40"}, + {file = "azure_mgmt_core-1.3.0-py2.py3-none-any.whl", hash = "sha256:7b7fa952aeb9d3eaa13eff905880f3d3b62200f7be7a8ba5a50c8b2e7295322a"}, ] azure-mgmt-cosmosdb = [ {file = "azure-mgmt-cosmosdb-6.4.0.zip", hash = "sha256:fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"}, @@ -1605,12 +1611,12 @@ azure-storage-queue = [ {file = "azure_storage_queue-12.1.6-py2.py3-none-any.whl", hash = "sha256:54435c14278118275e4fc17989a1005b02d5ccb662b112ac8699eab4e5a8fc89"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] certifi = [ @@ -1618,47 +1624,55 @@ certifi = [ {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] cffi = [ - {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, - {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, - {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, - {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, - {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, - {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, - {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, - {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, - {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, - {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, - {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, - {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, - {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, - {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, - {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, - {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, - {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, - {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, - {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, -] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, + {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, + {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, + {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, + {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, + {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, + {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, + {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, + {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, + {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, + {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, + {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, + {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, + {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, + {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, + {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, + {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, + {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, + {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, + {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, +] +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] click = [ {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, @@ -1683,16 +1697,16 @@ distlib = [ {file = "distlib-0.3.2.zip", hash = "sha256:106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] importlib-resources = [ - {file = "importlib_resources-5.2.0-py3-none-any.whl", hash = "sha256:a0143290bef3cbc99de9e40176e4987780939a955b8632f02ce6c935f42e9bfc"}, - {file = "importlib_resources-5.2.0.tar.gz", hash = "sha256:22a2c42d8c6a1d30aa8a0e1f57293725bfd5c013d562585e46aff469e0ff78b3"}, + {file = "importlib_resources-5.2.2-py3-none-any.whl", hash = "sha256:2480d8e07d1890056cb53c96e3de44fead9c62f2ba949b0f2e4c4345f4afa977"}, + {file = "importlib_resources-5.2.2.tar.gz", hash = "sha256:a65882a4d0fe5fbf702273456ba2ce74fe44892c25e42e057aca526b702a6d4b"}, ] isodate = [ {file = "isodate-0.6.0-py2.py3-none-any.whl", hash = "sha256:aa4d33c06640f5352aca96e4b81afd8ab3b47337cc12089822d6f322ac772c81"}, @@ -1707,8 +1721,8 @@ jsonschema = [ {file = "jsonschema-3.2.0.tar.gz", hash = "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"}, ] msal = [ - {file = "msal-1.12.0-py2.py3-none-any.whl", hash = "sha256:c7550f960916a9fb0bed6ebd23b73432415f81eeb3469264ab26c511d53b2652"}, - {file = "msal-1.12.0.tar.gz", hash = "sha256:5cc93f09523c703d4e00a901cf719ade4faf2c3d14961ba52060ae78d5b25327"}, + {file = "msal-1.13.0-py2.py3-none-any.whl", hash = "sha256:08f61506d78042f2b5d25915acea609c0c176ee7addbe835edac8f6135548446"}, + {file = "msal-1.13.0.tar.gz", hash = "sha256:1ab72dbb623fb8663e8fdefc052b1f9d4ae0951ea872f5f488dad58f3618c89d"}, ] msal-extensions = [ {file = "msal-extensions-0.3.0.tar.gz", hash = "sha256:5523dfa15da88297e90d2e73486c8ef875a17f61ea7b7e2953a300432c2e7861"}, @@ -1809,8 +1823,8 @@ pyrsistent = [ {file = "pyrsistent-0.18.0.tar.gz", hash = "sha256:773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pytz = [ {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, @@ -1852,8 +1866,8 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] requests-oauthlib = [ {file = "requests-oauthlib-1.3.0.tar.gz", hash = "sha256:b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a"}, @@ -1861,8 +1875,8 @@ requests-oauthlib = [ {file = "requests_oauthlib-1.3.0-py3.7.egg", hash = "sha256:fa6c47b933f01060936d87ae9327fead68768b69c6c9ea2109c48be30f2d4dbc"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -1936,6 +1950,6 @@ yarl = [ {file = "yarl-1.6.3.tar.gz", hash = "sha256:8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_azure/pyproject.toml b/tools/c7n_azure/pyproject.toml index 5e92d79abaa..3ddb5925813 100644 --- a/tools/c7n_azure/pyproject.toml +++ b/tools/c7n_azure/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_azure" -version = "0.7.12" +version = "0.7.13" description = "Cloud Custodian - Azure Support" readme = "readme.md" homepage="https://cloudcustodian.io" diff --git a/tools/c7n_azure/requirements.txt b/tools/c7n_azure/requirements.txt index 78a079e5b9d..2f440a7722f 100644 --- a/tools/c7n_azure/requirements.txt +++ b/tools/c7n_azure/requirements.txt @@ -2,7 +2,7 @@ adal==1.2.7 applicationinsights==0.11.10 apscheduler==3.7.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0" and python_version < "4") azure-common==1.1.27 -azure-core==1.15.0 +azure-core==1.17.0 azure-cosmos==3.2.0 azure-cosmosdb-nspkg==2.0.2 azure-cosmosdb-table==1.0.6 @@ -23,7 +23,7 @@ azure-mgmt-compute==19.0.0 azure-mgmt-containerinstance==7.0.0 azure-mgmt-containerregistry==8.0.0b1 azure-mgmt-containerservice==15.1.0 -azure-mgmt-core==1.2.2 +azure-mgmt-core==1.3.0 azure-mgmt-cosmosdb==6.4.0 azure-mgmt-costmanagement==1.0.0 azure-mgmt-databricks==1.0.0b1 @@ -59,18 +59,18 @@ azure-storage-common==2.1.0 azure-storage-file-share==12.5.0 azure-storage-file==2.1.0 azure-storage-queue==12.1.6 -certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -cffi==1.14.5; python_version >= "3.6" -chardet==4.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" +certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +cffi==1.14.6; python_version >= "3.6" +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3" click==7.1.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") cryptography==3.4.7; python_version >= "3.6" distlib==0.3.2 -idna==2.10; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -importlib-resources==5.2.0; python_version >= "3.6" and python_version < "3.7" +idna==3.2; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" +importlib-resources==5.2.2; python_version >= "3.6" and python_version < "3.7" isodate==0.6.0 jmespath==0.10.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") msal-extensions==0.3.0 -msal==1.12.0 +msal==1.13.0 msrest==0.6.21 msrestazure==0.6.4 netaddr==0.7.20 @@ -78,11 +78,11 @@ oauthlib==3.1.1; python_version >= "3.6" and python_full_version < "3.0.0" or py portalocker==1.7.1 pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" pyjwt==1.7.1 -python-dateutil==2.8.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" +python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" pytz==2021.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" requests-oauthlib==1.3.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" -requests==2.25.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") +requests==2.26.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" tzlocal==2.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" -urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" -zipp==3.4.1; python_version >= "3.6" and python_version < "3.7" +urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" +zipp==3.5.0; python_version >= "3.6" and python_version < "3.7" diff --git a/tools/c7n_azure/setup.py b/tools/c7n_azure/setup.py index 4133fe15739..596ca43d138 100644 --- a/tools/c7n_azure/setup.py +++ b/tools/c7n_azure/setup.py @@ -71,34 +71,34 @@ 'azure-storage-file-share>=12.4.1,<13.0.0', 'azure-storage-file>=2.1.0,<3.0.0', 'azure-storage-queue>=12.1.5,<13.0.0', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', 'click>=7.0,<8.0', 'cryptography>=3.4.6,<4.0.0', 'distlib>=0.3.0,<0.4.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jmespath>=0.10.0,<0.11.0', 'jsonschema (>=3.2.0,<4.0.0)', 'netaddr>=0.7.19,<0.8.0', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', 'requests>=2.22.0,<3.0.0', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] extras_require = \ {':python_version >= "3" and python_version < "4"': ['azure-functions>=1.0.8,<2.0.0']} setup_kwargs = { 'name': 'c7n-azure', - 'version': '0.7.12', + 'version': '0.7.13', 'description': 'Cloud Custodian - Azure Support', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_gcp/poetry.lock b/tools/c7n_gcp/poetry.lock index 77be604fa40..f0ef9bdc1f7 100644 --- a/tools/c7n_gcp/poetry.lock +++ b/tools/c7n_gcp/poetry.lock @@ -36,24 +36,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -65,7 +68,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -103,7 +106,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.5" +version = "1.14.6" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -113,12 +116,15 @@ python-versions = "*" pycparser = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "colorama" @@ -130,7 +136,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "google-api-core" -version = "1.30.0" +version = "1.31.1" description = "Google API client core library" category = "main" optional = false @@ -169,7 +175,7 @@ uritemplate = ">=3.0.0,<4dev" [[package]] name = "google-auth" -version = "1.32.0" +version = "1.34.0" description = "Google Authentication Library" category = "main" optional = false @@ -201,7 +207,7 @@ six = "*" [[package]] name = "google-cloud-core" -version = "1.7.1" +version = "1.7.2" description = "Google Cloud API client core library" category = "main" optional = false @@ -243,16 +249,17 @@ pandas = ["pandas (>=0.17.1)"] [[package]] name = "google-cloud-storage" -version = "1.40.0" +version = "1.42.0" description = "Google Cloud Storage API client library" category = "main" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" [package.dependencies] -google-auth = ">=1.11.0,<2.0dev" -google-cloud-core = ">=1.4.1,<2.0dev" -google-resumable-media = ">=1.3.0,<2.0dev" +google-api-core = {version = ">=1.29.0,<3.0dev", markers = "python_version >= \"3.6\""} +google-auth = {version = ">=1.25.0,<3.0dev", markers = "python_version >= \"3.6\""} +google-cloud-core = {version = ">=1.6.0,<3.0dev", markers = "python_version >= \"3.6\""} +google-resumable-media = {version = ">=1.3.0,<3.0dev", markers = "python_version >= \"3.6\""} requests = ">=2.18.0,<3.0.0dev" [[package]] @@ -271,7 +278,7 @@ testing = ["pytest"] [[package]] name = "google-resumable-media" -version = "1.3.1" +version = "1.3.3" description = "Utilities for Google Media Downloads and Resumable Uploads" category = "main" optional = false @@ -301,7 +308,7 @@ grpc = ["grpcio (>=1.0.0)"] [[package]] name = "grpcio" -version = "1.38.1" +version = "1.39.0" description = "HTTP/2-based RPC framework" category = "main" optional = false @@ -311,7 +318,7 @@ python-versions = "*" six = ">=1.5.2" [package.extras] -protobuf = ["grpcio-tools (>=1.38.1)"] +protobuf = ["grpcio-tools (>=1.39.0)"] [[package]] name = "httplib2" @@ -326,15 +333,15 @@ pyparsing = ">=2.4.2,<3" [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -385,11 +392,11 @@ format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -494,7 +501,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "dev" optional = false @@ -532,21 +539,21 @@ test = ["pytest (>=3.0)", "pytest-asyncio"] [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "retrying" @@ -572,11 +579,11 @@ pyasn1 = ">=0.1.3" [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -642,7 +649,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -650,7 +657,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -671,12 +678,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] cachetools = [ @@ -688,71 +695,79 @@ certifi = [ {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] cffi = [ - {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, - {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, - {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, - {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, - {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, - {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, - {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, - {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, - {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, - {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, - {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, - {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, - {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, - {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, - {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, - {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, - {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, - {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, - {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, + {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, + {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, + {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, + {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, + {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, + {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, + {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, + {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, + {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, + {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, + {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, + {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, + {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, + {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, + {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, + {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, + {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, + {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, + {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, ] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] google-api-core = [ - {file = "google-api-core-1.30.0.tar.gz", hash = "sha256:0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c"}, - {file = "google_api_core-1.30.0-py2.py3-none-any.whl", hash = "sha256:92cd9e9f366e84bfcf2524e34d2dc244906c645e731962617ba620da1620a1e0"}, + {file = "google-api-core-1.31.1.tar.gz", hash = "sha256:108cf94336aed7e614eafc53933ef02adf63b9f0fd87e8f8212acaa09eaca456"}, + {file = "google_api_core-1.31.1-py2.py3-none-any.whl", hash = "sha256:1d63e2b28057d79d64795c9a70abcecb5b7e96da732d011abf09606a39b48701"}, ] google-api-python-client = [ {file = "google-api-python-client-1.12.8.tar.gz", hash = "sha256:f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb"}, {file = "google_api_python_client-1.12.8-py2.py3-none-any.whl", hash = "sha256:3c4c4ca46b5c21196bec7ee93453443e477d82cbfa79234d1ce0645f81170eaf"}, ] google-auth = [ - {file = "google-auth-1.32.0.tar.gz", hash = "sha256:e34e5f5de5610b202f9b40ebd9f8b27571d5c5537db9afed3a72b2db5a345039"}, - {file = "google_auth-1.32.0-py2.py3-none-any.whl", hash = "sha256:b3a67fa9ba5b768861dacf374c2135eb09fa14a0e40c851c3b8ea7abe6fc8fef"}, + {file = "google-auth-1.34.0.tar.gz", hash = "sha256:f1094088bae046fb06f3d1a3d7df14717e8d959e9105b79c57725bd4e17597a2"}, + {file = "google_auth-1.34.0-py2.py3-none-any.whl", hash = "sha256:bd6aa5916970a823e76ffb3d5c3ad3f0bedafca0a7fa53bc15149ab21cb71e05"}, ] google-auth-httplib2 = [ {file = "google-auth-httplib2-0.1.0.tar.gz", hash = "sha256:a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac"}, {file = "google_auth_httplib2-0.1.0-py2.py3-none-any.whl", hash = "sha256:31e49c36c6b5643b57e82617cb3e021e3e1d2df9da63af67252c02fa9c1f4a10"}, ] google-cloud-core = [ - {file = "google-cloud-core-1.7.1.tar.gz", hash = "sha256:3bd1e679a3d38b9da93c5919ae56239dda91fb32a2d954b2cd830392337c1cc9"}, - {file = "google_cloud_core-1.7.1-py2.py3-none-any.whl", hash = "sha256:31e8c8596d3fbe2ecbe8708572b48741f8b247a78740aebfaf4da445487a1af5"}, + {file = "google-cloud-core-1.7.2.tar.gz", hash = "sha256:b1030aadcbb2aeb4ee51475426351af83c1072456b918fb8fdb80666c4bb63b5"}, + {file = "google_cloud_core-1.7.2-py2.py3-none-any.whl", hash = "sha256:5b77935f3d9573e27007749a3b522f08d764c5b5930ff1527b2ab2743e9f0c15"}, ] google-cloud-logging = [ {file = "google-cloud-logging-1.15.1.tar.gz", hash = "sha256:cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90"}, @@ -763,8 +778,8 @@ google-cloud-monitoring = [ {file = "google_cloud_monitoring-0.34.0-py2.py3-none-any.whl", hash = "sha256:0f9dea65e4b82c426dc9700cb6011ab4eac43394b38c4fd0b7045735ddb4a760"}, ] google-cloud-storage = [ - {file = "google-cloud-storage-1.40.0.tar.gz", hash = "sha256:560f7d112dce319a39b06c35cf53ae156ef42dfb213fc633c09aefaae7c060ec"}, - {file = "google_cloud_storage-1.40.0-py2.py3-none-any.whl", hash = "sha256:620ce1a7369e109515d5cf4c6e783afcb321f2d3a14faff394c929e00f5a35ca"}, + {file = "google-cloud-storage-1.42.0.tar.gz", hash = "sha256:c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae"}, + {file = "google_cloud_storage-1.42.0-py2.py3-none-any.whl", hash = "sha256:92a9c8b1a6a278c5c12877fe1a966ecd0cae327cf98c6ae50deedf1a32d6cf2b"}, ] google-crc32c = [ {file = "google-crc32c-1.1.2.tar.gz", hash = "sha256:dff5bd1236737f66950999d25de7a78144548ebac7788d30ada8c1b6ead60b27"}, @@ -798,77 +813,77 @@ google-crc32c = [ {file = "google_crc32c-1.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:78cf5b1bd30f3a6033b41aa4ce8c796870bc4645a15d3ef47a4b05d31b0a6dc1"}, ] google-resumable-media = [ - {file = "google-resumable-media-1.3.1.tar.gz", hash = "sha256:1a1eb743d13f782d1405437c266b2c815ef13c2b141ba40835c74a3317539d01"}, - {file = "google_resumable_media-1.3.1-py2.py3-none-any.whl", hash = "sha256:106db689574283a7d9d154d5a97ab384153c55a1195cecb8c01cad9e6e827628"}, + {file = "google-resumable-media-1.3.3.tar.gz", hash = "sha256:ce38555d250bd70b0c2598bf61e99003cb8c569b0176ec0e3f38b86f9ffff581"}, + {file = "google_resumable_media-1.3.3-py2.py3-none-any.whl", hash = "sha256:092f39153cd67a4e409924edf08129f43cc72e630a1eb22abec93e80155df4ba"}, ] googleapis-common-protos = [ {file = "googleapis-common-protos-1.53.0.tar.gz", hash = "sha256:a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4"}, {file = "googleapis_common_protos-1.53.0-py2.py3-none-any.whl", hash = "sha256:f6d561ab8fb16b30020b940e2dd01cd80082f4762fa9f3ee670f4419b4b8dbd0"}, ] grpcio = [ - {file = "grpcio-1.38.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:118479436bda25b369e2dc1cd0921790fbfaea1ec663e4ee7095c4c325694495"}, - {file = "grpcio-1.38.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:7adfbd4e22647f880c9ed86b2be7f6d7a7dbbb8adc09395808cc7a4d021bc328"}, - {file = "grpcio-1.38.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:87b4b1977b52d5e0873a5e396340d2443640ba760f4fa23e93a38997ecfbcd5b"}, - {file = "grpcio-1.38.1-cp27-cp27m-win32.whl", hash = "sha256:3a25e1a46f51c80d06b66223f61938b9ffda37f2824ca65749c49b758137fac2"}, - {file = "grpcio-1.38.1-cp27-cp27m-win_amd64.whl", hash = "sha256:b5ea9902fc2990af993b74862282b49ae0b8de8a64ca3b4a8dda26a3163c3bb4"}, - {file = "grpcio-1.38.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:8ccde1df51eeaddf5515edc41bde2ea43a834a288914eae9ce4287399be108f5"}, - {file = "grpcio-1.38.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:0e193feaf4ebc72f6af57d7b8a08c0b8e43ebbd76f81c6f1e55d013557602dfd"}, - {file = "grpcio-1.38.1-cp35-cp35m-macosx_10_10_intel.whl", hash = "sha256:b16e1967709392a0ec4b10b4374a72eb062c47c168a189606c9a7ea7b36593a8"}, - {file = "grpcio-1.38.1-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:4bc60f8372c3ab06f41279163c5d558bf95195bb3f68e35ed19f95d4fbd53d71"}, - {file = "grpcio-1.38.1-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:a433d3740a9ef7bc34a18e2b12bf72b25e618facdfd09871167b30fd8e955fed"}, - {file = "grpcio-1.38.1-cp35-cp35m-manylinux2014_i686.whl", hash = "sha256:d49f250c3ffbe83ba2d03e3500e03505576a985f7c5f77172a9531058347aa68"}, - {file = "grpcio-1.38.1-cp35-cp35m-manylinux2014_x86_64.whl", hash = "sha256:6e137d014cf4162e5a796777012452516d92547717c1b4914fb71ce4e41817b5"}, - {file = "grpcio-1.38.1-cp35-cp35m-win32.whl", hash = "sha256:5ff4802d9b3704e680454289587e1cc146bb0d953cf3c9296e2d96441a6a8e88"}, - {file = "grpcio-1.38.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4c19578b35715e110c324b27c18ab54a56fccc4c41b8f651b1d1da5a64e0d605"}, - {file = "grpcio-1.38.1-cp36-cp36m-linux_armv7l.whl", hash = "sha256:6edf68d4305e08f6f8c45bfaa9dc04d527ab5a1562aaf0c452fa921fbe90eb23"}, - {file = "grpcio-1.38.1-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:ddd33c90b0c95eca737c9f6db7e969a48d23aed72cecb23f3b8aac009ca2cfb4"}, - {file = "grpcio-1.38.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:c83481501533824fe341c17d297bbec1ec584ec46b352f98ce12bf16740615c4"}, - {file = "grpcio-1.38.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:3e85bba6f0e0c454a90b8fea16b59db9c6d19ddf9cc95052b2d4ca77b22d46d6"}, - {file = "grpcio-1.38.1-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:dcfcb147c18272a22a592251a49830b3c7abc82385ffff34916c2534175d885e"}, - {file = "grpcio-1.38.1-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:419af4f577a3d5d9f386aeacf4c4992f90016f84cbceb11ecd832101b1f7f9c9"}, - {file = "grpcio-1.38.1-cp36-cp36m-manylinux_2_24_aarch64.whl", hash = "sha256:cd7ddb5b6ffcbd3691990df20f260a888c8bd770d57480a97da1b756fb1be5c0"}, - {file = "grpcio-1.38.1-cp36-cp36m-win32.whl", hash = "sha256:d4179d96b0ce27602756185c1a00d088c9c1feb0cc17a36f8a66eec6ddddbc0c"}, - {file = "grpcio-1.38.1-cp36-cp36m-win_amd64.whl", hash = "sha256:96d78d9edf3070770cefd1822bc220d8cccad049b818a70a3c630052e9f15490"}, - {file = "grpcio-1.38.1-cp37-cp37m-linux_armv7l.whl", hash = "sha256:8ab27a6626c2038e13c1b250c5cd22da578f182364134620ec298b4ccfc85722"}, - {file = "grpcio-1.38.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:532ab738351aad2cdad80f4355123652e08b207281f3923ce51fb2b58692dd4c"}, - {file = "grpcio-1.38.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:e4a8a371ad02bf31576bcd99093cea3849e19ca1e9eb63fc0b2c0f1db1132f7d"}, - {file = "grpcio-1.38.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:89af675d38bf490384dae85151768b8434e997cece98e5d1eb6fcb3c16d6af12"}, - {file = "grpcio-1.38.1-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ff9ebc416e815161d89d2fd22d1a91acf3b810ef800dae38c402d19d203590bf"}, - {file = "grpcio-1.38.1-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:3db0680fee9e55022677abda186e73e3c019c59ed83e1550519250dc97cf6793"}, - {file = "grpcio-1.38.1-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:a77d1f47e5e82504c531bc9dd22c093ff093b6706ec8bcdad228464ef3a5dd54"}, - {file = "grpcio-1.38.1-cp37-cp37m-win32.whl", hash = "sha256:549beb5646137b78534a312a3b80b2b8b1ea01058b38a711d42d6b54b20b6c2b"}, - {file = "grpcio-1.38.1-cp37-cp37m-win_amd64.whl", hash = "sha256:3eb960c2f9e031f0643b53bab67733a9544d82f42d0714338183d14993d2a23c"}, - {file = "grpcio-1.38.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:e90cda2ccd4bdb89a3cd5dc11771c3b8394817d5caaa1ae36042bc96a428c10e"}, - {file = "grpcio-1.38.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:26af85ae0a7ff8e8f8f550255bf85551df86a89883c11721c0756b71bc1019be"}, - {file = "grpcio-1.38.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:947bdba3ebcd93a7cef537d6405bc5667d1caf818fa8bbd2e2cc952ec8f97e09"}, - {file = "grpcio-1.38.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:6d898441ada374f76e0b5354d7e240e1c0e905a1ebcb1e95d9ffd99c88f63700"}, - {file = "grpcio-1.38.1-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:59f5fb4ba219a11fdc1c23e17c93ca3090480a8cde4370c980908546ffc091e6"}, - {file = "grpcio-1.38.1-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:cddd61bff66e42ef334f8cb9e719951e479b5ad2cb75c00338aac8de28e17484"}, - {file = "grpcio-1.38.1-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:c323265a4f18f586e8de84fda12b48eb3bd48395294aa2b8c05307ac1680299d"}, - {file = "grpcio-1.38.1-cp38-cp38-win32.whl", hash = "sha256:72e8358c751da9ab4f8653a3b67b2a3bb7e330ee57cb26439c6af358d6eac032"}, - {file = "grpcio-1.38.1-cp38-cp38-win_amd64.whl", hash = "sha256:278e131bfbc57bab112359b98930b0fdbf81aa0ba2cdfc6555c7a5119d7e2117"}, - {file = "grpcio-1.38.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:44efa41ac36f6bcbf4f64d6479b3031cceea28cf6892a77f15bd1c22611bff9d"}, - {file = "grpcio-1.38.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:cf6c3bfa403e055380fe90844beb4fe8e9448edab5d2bf40d37d208dbb2f768c"}, - {file = "grpcio-1.38.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:5efa68fc3fe0c439e2858215f2224bfb7242c35079538d58063f68a0d5d5ec33"}, - {file = "grpcio-1.38.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:2a179b2565fa85a134933acc7845f9d4c12e742c802b4f50bf2fd208bf8b741e"}, - {file = "grpcio-1.38.1-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:b1624123710fa701988a8a43994de78416e5010ac1508f64ed41e2577358604a"}, - {file = "grpcio-1.38.1-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:6a225440015db88ec4625a2a41c21582a50cce7ffbe38dcbbb416c7180352516"}, - {file = "grpcio-1.38.1-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:e891b0936aab73550d673dd3bbf89fa9577b3db1a61baecea480afd36fdb1852"}, - {file = "grpcio-1.38.1-cp39-cp39-win32.whl", hash = "sha256:889518ce7c2a0609a3cffb7b667669a39b3410e869ff38e087bf7eeadad62e5d"}, - {file = "grpcio-1.38.1-cp39-cp39-win_amd64.whl", hash = "sha256:77054f24d46498d9696c809da7810b67bccf6153f9848ea48331708841926d82"}, - {file = "grpcio-1.38.1.tar.gz", hash = "sha256:1f79d8a24261e3c12ec3a6c25945ff799ae09874fd24815bc17c2dc37715ef6c"}, + {file = "grpcio-1.39.0-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:4163e022f365406be2da78db890035463371effea172300ce5af8a768142baf3"}, + {file = "grpcio-1.39.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:02e8a8b41db8e13df53078355b439363e4ac46d0ac9a8a461a39e42829e2bcf8"}, + {file = "grpcio-1.39.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:050901a5baa6c4ca445e1781ef4c32d864f965ccec70c46cd5ad92d15e282c6a"}, + {file = "grpcio-1.39.0-cp27-cp27m-win32.whl", hash = "sha256:1ab44dde4e1b225d3fc873535ca6e642444433131dd2891a601b75fb46c87c11"}, + {file = "grpcio-1.39.0-cp27-cp27m-win_amd64.whl", hash = "sha256:25731b2c20a4ed51bea7e3952d5e83d408a5df32d03c7553457b2e6eb8bcb16c"}, + {file = "grpcio-1.39.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:a2733994b05ee5382da1d0378f6312b72c5cb202930c7fa20c794a24e96a1a34"}, + {file = "grpcio-1.39.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:4039645b8b5d19064766f3a6fa535f1db52a61c4d4de97a6a8945331a354d527"}, + {file = "grpcio-1.39.0-cp35-cp35m-macosx_10_10_intel.whl", hash = "sha256:7b95b3329446408e2fe6db9b310d263303fa1a94649d08ec1e1cc12506743d26"}, + {file = "grpcio-1.39.0-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:2a4308875b9b986000513c6b04c2e7424f436a127f15547036c42d3cf8289374"}, + {file = "grpcio-1.39.0-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:4b3fcc1878a1a5b71e1ecdfe82c74f7cd9eadaa43e25be0d67676dcec0c9d39f"}, + {file = "grpcio-1.39.0-cp35-cp35m-manylinux2014_i686.whl", hash = "sha256:6d51be522b573cec14798d4742efaa69d234bedabce122fec2d5489abb3724d4"}, + {file = "grpcio-1.39.0-cp35-cp35m-manylinux2014_x86_64.whl", hash = "sha256:43c57987e526d1b893b85099424387b22de6e3eee4ea7188443de8d657d11cc0"}, + {file = "grpcio-1.39.0-cp35-cp35m-win32.whl", hash = "sha256:cd2e39a199bcbefb3f4b9fa6677c72b0e67332915550fed3bd7c28b454bf917d"}, + {file = "grpcio-1.39.0-cp35-cp35m-win_amd64.whl", hash = "sha256:5628e7cc69079159f9465388ff21fde1e1a780139f76dd99d319119d45156f45"}, + {file = "grpcio-1.39.0-cp36-cp36m-linux_armv7l.whl", hash = "sha256:3c14e2087f809973d5ee8ca64f772a089ead0167286f3f21fdda8b6029b50abb"}, + {file = "grpcio-1.39.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:d5a105f5a595b89a0e394e5b147430b115333d07c55efb0c0eddc96055f0d951"}, + {file = "grpcio-1.39.0-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:366b6b35b3719c5570588e21d866460c5666ae74e3509c2a5a73ca79997abdaf"}, + {file = "grpcio-1.39.0-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:544e1c1a133b43893e03e828c8325be5b82e20d3b0ef0ee3942d32553052a1b5"}, + {file = "grpcio-1.39.0-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a659f7c634cacfcf14657687a9fa3265b0a1844b1c19d140f3b66aebfba1a66b"}, + {file = "grpcio-1.39.0-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:b0ff14dd872030e6b2fce8a6811642bd30d93833f794d3782c7e9eb2f01234cc"}, + {file = "grpcio-1.39.0-cp36-cp36m-manylinux_2_24_aarch64.whl", hash = "sha256:2a958ad794292e12d8738a06754ebaf71662e635a89098916c18715b27ca2b5b"}, + {file = "grpcio-1.39.0-cp36-cp36m-win32.whl", hash = "sha256:ed845ba6253c4032d5a01b7fb9db8fe80299e9a437e695a698751b0b191174be"}, + {file = "grpcio-1.39.0-cp36-cp36m-win_amd64.whl", hash = "sha256:b236eb4b50d83754184b248b8b1041bb1546287fff7618c4b7001b9f257bb903"}, + {file = "grpcio-1.39.0-cp37-cp37m-linux_armv7l.whl", hash = "sha256:27e2c6213fc04e71a862bacccb51f3c8e722255933f01736ace183e92d860ee6"}, + {file = "grpcio-1.39.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:5127f4ba1f52fda28037ae465cf4b0e5fabe89d5ac1d64d15b073b46b7db5e16"}, + {file = "grpcio-1.39.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:a6211150765cc2343e69879dfb856718b0f7477a4618b5f9a8f6c3ee84c047c0"}, + {file = "grpcio-1.39.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:691f5b3a75f072dfb7b093f46303f493b885b7a42f25a831868ffaa22ee85f9d"}, + {file = "grpcio-1.39.0-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:c8fe430add656b92419f6cd0680b64fbe6347c831d89a7788324f5037dfb3359"}, + {file = "grpcio-1.39.0-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:3cccf470fcaab65a1b0a826ff34bd7c0861eb82ed957a83c6647a983459e4ecd"}, + {file = "grpcio-1.39.0-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:2bc7eebb405aac2d7eecfaa881fd73b489f99c01470d7193b4431a6ce199b9c3"}, + {file = "grpcio-1.39.0-cp37-cp37m-win32.whl", hash = "sha256:52100d800390d58492ed1093de6faccd957de6fc29b1a0e5948c84f275d9228f"}, + {file = "grpcio-1.39.0-cp37-cp37m-win_amd64.whl", hash = "sha256:20f57c5d09a36e0d0c8fe16ee1905f4307edb1d04f6034b56320f7fbc1a1071a"}, + {file = "grpcio-1.39.0-cp38-cp38-linux_armv7l.whl", hash = "sha256:6ba6ad60009da2258cf15a72c51b7e0c2f58c8da517e97550881e488839e56c6"}, + {file = "grpcio-1.39.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:a1fb9936b86b5efdea417fe159934bcad82a6f8c6ab7d1beec4bf3a78324d975"}, + {file = "grpcio-1.39.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:46cfb0f2b757673bfd36ab4b0e3d61988cc1a0d47e0597e91462dcbef7528f35"}, + {file = "grpcio-1.39.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:f2621c82fbbff1496993aa5fbf60e235583c7f970506e818671ad52000b6f310"}, + {file = "grpcio-1.39.0-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:e98aca5cfe05ca29950b3d99006b9ddb54fde6451cd12cb2db1443ae3b9fa076"}, + {file = "grpcio-1.39.0-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:8ed1e52ad507a54d20e6aaedf4b3edcab18cc12031eafe6de898f97513d8997b"}, + {file = "grpcio-1.39.0-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:3c57fa7fec932767bc553bfb956759f45026890255bd232b2f797c3bc4dfeba2"}, + {file = "grpcio-1.39.0-cp38-cp38-win32.whl", hash = "sha256:88dbef504b491b96e3238a6d5360b04508c34c62286080060c85fddd3caf7137"}, + {file = "grpcio-1.39.0-cp38-cp38-win_amd64.whl", hash = "sha256:cffdccc94e63710dd6ead01849443390632c8e0fec52dc26e4fddf9f28ac9280"}, + {file = "grpcio-1.39.0-cp39-cp39-linux_armv7l.whl", hash = "sha256:43e0f5c49f985c94332794aa6c4f15f3a1ced336f0c6a6c8946c67b5ab111ae9"}, + {file = "grpcio-1.39.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:dc3a24022a90c1754e54315009da6f949b48862c1d06daa54f9a28f89a5efacb"}, + {file = "grpcio-1.39.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:476fa94ba8efb09213baabd757f6f93e839794d8ae0eaa371347d6899e8f57a0"}, + {file = "grpcio-1.39.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:46d510a7af777d2f38ef4c1d25491add37cad24143012f3eebe72dc5c6d0fc4c"}, + {file = "grpcio-1.39.0-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:5091b4a5ee8454a8f0c8ac45946ca25d6142c3be4b1fba141f1d62a6e0b5c696"}, + {file = "grpcio-1.39.0-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:de83a045005703e7b9e67b61c38bb72cd49f68d9d2780d2c675353a3a3f2816f"}, + {file = "grpcio-1.39.0-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:4258b778ce09ffa3b7c9a26971c216a34369e786771afbf4f98afe223f27d248"}, + {file = "grpcio-1.39.0-cp39-cp39-win32.whl", hash = "sha256:c44958a24559f875d902d5c1acb0ae43faa5a84f6120d1d0d800acb52f96516e"}, + {file = "grpcio-1.39.0-cp39-cp39-win_amd64.whl", hash = "sha256:2068a2b896ac67103c4a5453d5435fafcbb1a2f41eaf25148d08780096935cee"}, + {file = "grpcio-1.39.0.tar.gz", hash = "sha256:57974361a459d6fe04c9ae0af1845974606612249f467bbd2062d963cb90f407"}, ] httplib2 = [ {file = "httplib2-0.19.1-py3-none-any.whl", hash = "sha256:2ad195faf9faf079723f6714926e9a9061f694d07724b846658ce08d40f522b4"}, {file = "httplib2-0.19.1.tar.gz", hash = "sha256:0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -883,8 +898,8 @@ jsonschema = [ {file = "jsonschema-3.2.0.tar.gz", hash = "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -985,8 +1000,8 @@ pytest = [ {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pytz = [ {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, @@ -1020,8 +1035,8 @@ ratelimiter = [ {file = "ratelimiter-1.2.0.post0.tar.gz", hash = "sha256:5c395dcabdbbde2e5178ef3f89b568a3066454a6ddc223b76473dac22f89b4f7"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] retrying = [ {file = "retrying-1.3.3.tar.gz", hash = "sha256:08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b"}, @@ -1031,8 +1046,8 @@ rsa = [ {file = "rsa-4.7.2.tar.gz", hash = "sha256:9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -1060,6 +1075,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_gcp/pyproject.toml b/tools/c7n_gcp/pyproject.toml index 966826a0247..005f50fdbe6 100644 --- a/tools/c7n_gcp/pyproject.toml +++ b/tools/c7n_gcp/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_gcp" -version = "0.4.12" +version = "0.4.13" description = "Cloud Custodian - Google Cloud Provider" readme = "readme.md" homepage = "https://cloudcustodian.io" diff --git a/tools/c7n_gcp/requirements.txt b/tools/c7n_gcp/requirements.txt index 979f3a282e3..2fa6b0c501f 100644 --- a/tools/c7n_gcp/requirements.txt +++ b/tools/c7n_gcp/requirements.txt @@ -1,32 +1,32 @@ cachetools==4.2.2; python_version >= "3.5" and python_version < "4.0" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -cffi==1.14.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" -chardet==4.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -google-api-core==1.30.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +cffi==1.14.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3" +google-api-core==1.31.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" google-api-python-client==1.12.8; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") google-auth-httplib2==0.1.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" -google-auth==1.32.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -google-cloud-core==1.7.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +google-auth==1.34.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") +google-cloud-core==1.7.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" google-cloud-logging==1.15.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") google-cloud-monitoring==0.34.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") -google-cloud-storage==1.40.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") +google-cloud-storage==1.42.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") google-crc32c==1.1.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" -google-resumable-media==1.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +google-resumable-media==1.3.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" googleapis-common-protos==1.53.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" -grpcio==1.38.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +grpcio==1.39.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" httplib2==0.19.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" -idna==2.10; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -packaging==20.9; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +idna==3.2; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" +packaging==21.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" protobuf==3.17.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" pyasn1-modules==0.2.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" pyasn1==0.4.8; python_version >= "3.5" and python_full_version < "3.0.0" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6") or python_version >= "3.5" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6") and python_full_version >= "3.6.0" pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" -pyparsing==2.4.7; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +pyparsing==2.4.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" pytz==2021.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" ratelimiter==1.2.0.post0 -requests==2.25.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +requests==2.26.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" retrying==1.3.3 rsa==4.7.2; python_version >= "3.5" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6") -six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" uritemplate==3.0.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" diff --git a/tools/c7n_gcp/setup.py b/tools/c7n_gcp/setup.py index 302a9122faf..696b21a5215 100644 --- a/tools/c7n_gcp/setup.py +++ b/tools/c7n_gcp/setup.py @@ -12,32 +12,32 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', 'google-api-python-client>=1.7,<2.0', 'google-auth>=1.11.0,<2.0.0', 'google-cloud-logging>=1.14,<2.0', 'google-cloud-monitoring>=0.34.0,<0.35.0', 'google-cloud-storage>=1.28.1,<2.0.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', 'ratelimiter>=1.2.0,<2.0.0', 'retrying>=1.3.3,<2.0.0', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] setup_kwargs = { 'name': 'c7n-gcp', - 'version': '0.4.12', + 'version': '0.4.13', 'description': 'Cloud Custodian - Google Cloud Provider', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_kube/poetry.lock b/tools/c7n_kube/poetry.lock index f35717168c0..1c69709a615 100644 --- a/tools/c7n_kube/poetry.lock +++ b/tools/c7n_kube/poetry.lock @@ -36,24 +36,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -65,7 +68,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -102,12 +105,15 @@ optional = false python-versions = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "colorama" @@ -119,7 +125,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "google-auth" -version = "1.32.0" +version = "1.34.0" description = "Google Authentication Library" category = "main" optional = false @@ -138,15 +144,15 @@ reauth = ["pyu2f (>=0.1.5)"] [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -240,11 +246,11 @@ signedtoken = ["cryptography (>=3.0.0,<4)", "pyjwt (>=2.0.0,<3)"] [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -330,7 +336,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "main" optional = false @@ -349,21 +355,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "requests-oauthlib" @@ -393,11 +399,11 @@ pyasn1 = ">=0.1.3" [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -469,12 +475,16 @@ yarl = {version = "*", markers = "python_version >= \"3.6\""} [[package]] name = "websocket-client" -version = "1.1.0" +version = "1.2.1" description = "WebSocket client for Python with low level API options" category = "main" optional = false python-versions = ">=3.6" +[package.extras] +optional = ["python-socks", "wsaccel"] +test = ["websockets"] + [[package]] name = "wrapt" version = "1.12.1" @@ -498,7 +508,7 @@ typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -506,7 +516,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -527,12 +537,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] cachetools = [ @@ -543,25 +553,25 @@ certifi = [ {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] google-auth = [ - {file = "google-auth-1.32.0.tar.gz", hash = "sha256:e34e5f5de5610b202f9b40ebd9f8b27571d5c5537db9afed3a72b2db5a345039"}, - {file = "google_auth-1.32.0-py2.py3-none-any.whl", hash = "sha256:b3a67fa9ba5b768861dacf374c2135eb09fa14a0e40c851c3b8ea7abe6fc8fef"}, + {file = "google-auth-1.34.0.tar.gz", hash = "sha256:f1094088bae046fb06f3d1a3d7df14717e8d959e9105b79c57725bd4e17597a2"}, + {file = "google_auth-1.34.0-py2.py3-none-any.whl", hash = "sha256:bd6aa5916970a823e76ffb3d5c3ad3f0bedafca0a7fa53bc15149ab21cb71e05"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -623,8 +633,8 @@ oauthlib = [ {file = "oauthlib-3.1.1.tar.gz", hash = "sha256:8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -696,8 +706,8 @@ pytest = [ {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, @@ -723,8 +733,8 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] requests-oauthlib = [ {file = "requests-oauthlib-1.3.0.tar.gz", hash = "sha256:b4261601a71fd721a8bd6d7aa1cc1d6a8a93b4a9f5e96626f8e4d91e8beeaa6a"}, @@ -736,8 +746,8 @@ rsa = [ {file = "rsa-4.7.2.tar.gz", hash = "sha256:9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -765,8 +775,8 @@ vcrpy = [ {file = "vcrpy-4.1.1.tar.gz", hash = "sha256:57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599"}, ] websocket-client = [ - {file = "websocket-client-1.1.0.tar.gz", hash = "sha256:b68e4959d704768fa20e35c9d508c8dc2bbc041fd8d267c0d7345cffe2824568"}, - {file = "websocket_client-1.1.0-py2.py3-none-any.whl", hash = "sha256:e5c333bfa9fa739538b652b6f8c8fc2559f1d364243c8a689d7c0e1d41c2e611"}, + {file = "websocket-client-1.2.1.tar.gz", hash = "sha256:8dfb715d8a992f5712fff8c843adae94e22b22a99b2c5e6b0ec4a1a981cc4e0d"}, + {file = "websocket_client-1.2.1-py2.py3-none-any.whl", hash = "sha256:0133d2f784858e59959ce82ddac316634229da55b498aac311f1620567a710ec"}, ] wrapt = [ {file = "wrapt-1.12.1.tar.gz", hash = "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"}, @@ -811,6 +821,6 @@ yarl = [ {file = "yarl-1.6.3.tar.gz", hash = "sha256:8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_kube/pyproject.toml b/tools/c7n_kube/pyproject.toml index 7e9129bbbd0..c516e8d3ac3 100644 --- a/tools/c7n_kube/pyproject.toml +++ b/tools/c7n_kube/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_kube" -version = "0.2.12" +version = "0.2.13" description = "Cloud Custodian - Kubernetes Provider" readme = "readme.md" homepage = "https://cloudcustodian.io" diff --git a/tools/c7n_kube/requirements.txt b/tools/c7n_kube/requirements.txt index c7c7d3faf8b..4ba93a2b534 100644 --- a/tools/c7n_kube/requirements.txt +++ b/tools/c7n_kube/requirements.txt @@ -1,17 +1,17 @@ cachetools==4.2.2; python_version >= "3.5" and python_version < "4.0" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0") -certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -chardet==4.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -google-auth==1.32.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -idna==2.10; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" +certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3" +google-auth==1.34.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +idna==3.2; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" kubernetes==10.0.1 oauthlib==3.1.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" pyasn1-modules==0.2.8; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" pyasn1==0.4.8; python_version >= "3.5" and python_full_version < "3.0.0" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6") or python_version >= "3.5" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6") and python_full_version >= "3.6.0" -python-dateutil==2.8.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" +python-dateutil==2.8.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" pyyaml==5.4.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" requests-oauthlib==1.3.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" -requests==2.25.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" +requests==2.26.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" rsa==4.7.2; python_version >= "3.5" and python_version < "4" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6") six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" -websocket-client==1.1.0; python_version >= "3.6" +urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" +websocket-client==1.2.1; python_version >= "3.6" diff --git a/tools/c7n_kube/setup.py b/tools/c7n_kube/setup.py index 79549d84e39..1aef9a85868 100644 --- a/tools/c7n_kube/setup.py +++ b/tools/c7n_kube/setup.py @@ -16,26 +16,26 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'kubernetes>=10.0.1,<11.0.0', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] setup_kwargs = { 'name': 'c7n-kube', - 'version': '0.2.12', + 'version': '0.2.13', 'description': 'Cloud Custodian - Kubernetes Provider', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_logexporter/poetry.lock b/tools/c7n_logexporter/poetry.lock index 67621d83632..6d3d2f3a7cb 100644 --- a/tools/c7n_logexporter/poetry.lock +++ b/tools/c7n_logexporter/poetry.lock @@ -28,24 +28,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -57,7 +60,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -87,7 +90,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -138,7 +141,7 @@ python-versions = ">=3.6" [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "dev" optional = false @@ -157,11 +160,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -211,7 +214,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -219,7 +222,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -236,12 +239,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] click = [ @@ -249,8 +252,8 @@ click = [ {file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, @@ -284,8 +287,8 @@ pyrsistent = [ {file = "pyrsistent-0.18.0.tar.gz", hash = "sha256:773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, @@ -311,8 +314,8 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -332,6 +335,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_logexporter/pyproject.toml b/tools/c7n_logexporter/pyproject.toml index 0880ed601d8..e87fc285e14 100644 --- a/tools/c7n_logexporter/pyproject.toml +++ b/tools/c7n_logexporter/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_logexporter" -version = "0.4.12" +version = "0.4.13" description = "Cloud Custodian - Cloud Watch Log S3 exporter" readme = "README.md" homepage = "https://cloudcustodian.io" diff --git a/tools/c7n_logexporter/setup.py b/tools/c7n_logexporter/setup.py index 8fc1f79119f..7af96157db4 100644 --- a/tools/c7n_logexporter/setup.py +++ b/tools/c7n_logexporter/setup.py @@ -12,29 +12,29 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', 'click>=7.0,<8.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] entry_points = \ {'console_scripts': ['c7n-log-exporter = c7n_logexporter.exporter:cli']} setup_kwargs = { 'name': 'c7n-logexporter', - 'version': '0.4.12', + 'version': '0.4.13', 'description': 'Cloud Custodian - Cloud Watch Log S3 exporter', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_mailer/c7n_mailer/deploy.py b/tools/c7n_mailer/c7n_mailer/deploy.py index d74d3a7bde3..5a56d0bad68 100644 --- a/tools/c7n_mailer/c7n_mailer/deploy.py +++ b/tools/c7n_mailer/c7n_mailer/deploy.py @@ -36,7 +36,7 @@ def dispatch(event, context): # transport datadog - recursive deps 'datadog', 'decorator', # requests (recursive deps), needed by datadog, slackclient, splunk - 'requests', 'urllib3', 'idna', 'chardet', 'certifi', + 'requests', 'urllib3', 'idna', 'charset_normalizer', 'certifi', # used by splunk mailer transport 'jsonpointer', 'jsonpatch', # sendgrid dependencies diff --git a/tools/c7n_mailer/poetry.lock b/tools/c7n_mailer/poetry.lock index 1aab2fec6a2..70dd4fe869c 100644 --- a/tools/c7n_mailer/poetry.lock +++ b/tools/c7n_mailer/poetry.lock @@ -22,24 +22,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -58,12 +61,15 @@ optional = false python-versions = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "colorama" @@ -112,15 +118,15 @@ lua = ["lupa"] [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "main" optional = false @@ -204,7 +210,7 @@ format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator [[package]] name = "ldap3" -version = "2.9" +version = "2.9.1" description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library" category = "main" optional = false @@ -223,11 +229,11 @@ python-versions = ">=3.6" [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -302,7 +308,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "main" optional = false @@ -340,29 +346,29 @@ hiredis = ["hiredis (>=0.1.3)"] [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "main" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -372,7 +378,7 @@ crt = ["botocore[crt] (>=1.20.29,<2.0a.0)"] [[package]] name = "sendgrid" -version = "6.7.1" +version = "6.8.0" description = "Twilio SendGrid library for Python" category = "main" optional = false @@ -437,7 +443,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false @@ -445,7 +451,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -462,20 +468,20 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] certifi = [ {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -494,12 +500,12 @@ fakeredis = [ {file = "fakeredis-1.5.2.tar.gz", hash = "sha256:18fc1808d2ce72169d3f11acdb524a00ef96bd29970c6d34cfeb2edb3fc0c020"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -526,11 +532,11 @@ jsonschema = [ {file = "jsonschema-3.2.0.tar.gz", hash = "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"}, ] ldap3 = [ - {file = "ldap3-2.9-py2.6.egg", hash = "sha256:4139c91f0eef9782df7b77c8cbc6243086affcb6a8a249b768a9658438e5da59"}, - {file = "ldap3-2.9-py2.7.egg", hash = "sha256:afc6fc0d01f02af82cd7bfabd3bbfd5dc96a6ae91e97db0a2dab8a0f1b436056"}, - {file = "ldap3-2.9-py2.py3-none-any.whl", hash = "sha256:c1df41d89459be6f304e0ceec4b00fdea533dbbcd83c802b1272dcdb94620b57"}, - {file = "ldap3-2.9-py3.9.egg", hash = "sha256:8c949edbad2be8a03e719ba48bd6779f327ec156929562814b3e84ab56889c8c"}, - {file = "ldap3-2.9.tar.gz", hash = "sha256:18c3ee656a6775b9b0d60f7c6c5b094d878d1d90fc03d56731039f0a4b546a91"}, + {file = "ldap3-2.9.1-py2.6.egg", hash = "sha256:5ab7febc00689181375de40c396dcad4f2659cd260fc5e94c508b6d77c17e9d5"}, + {file = "ldap3-2.9.1-py2.7.egg", hash = "sha256:2bc966556fc4d4fa9f445a1c31dc484ee81d44a51ab0e2d0fd05b62cac75daa6"}, + {file = "ldap3-2.9.1-py2.py3-none-any.whl", hash = "sha256:5869596fc4948797020d3f03b7939da938778a0f9e2009f7a072ccf92b8e8d70"}, + {file = "ldap3-2.9.1-py3.9.egg", hash = "sha256:5630d1383e09ba94839e253e013f1aa1a2cf7a547628ba1265cb7b9a844b5687"}, + {file = "ldap3-2.9.1.tar.gz", hash = "sha256:f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f"}, ] markupsafe = [ {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, @@ -569,8 +575,8 @@ markupsafe = [ {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -627,8 +633,8 @@ pytest = [ {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] python-http-client = [ {file = "python_http_client-3.3.2.tar.gz", hash = "sha256:67e6a7bea19b03e14dc971480d3531b80becfc203d6c69478561bf7844d52661"}, @@ -661,16 +667,16 @@ redis = [ {file = "redis-3.5.3.tar.gz", hash = "sha256:0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] sendgrid = [ - {file = "sendgrid-6.7.1-py3-none-any.whl", hash = "sha256:2558a8b2cf12677ceb99f8b611d914af5b9a2fd7ff3c0578e8299b4224e10071"}, - {file = "sendgrid-6.7.1.tar.gz", hash = "sha256:1c1cca97ab968f81af43ddbbe44aade5a689da27e3e4975dc366042499620abe"}, + {file = "sendgrid-6.8.0-py3-none-any.whl", hash = "sha256:a991ec89e619fce9f89fa28d0e13d1673f336ff1e6333a4df591242f3134fe63"}, + {file = "sendgrid-6.8.0.tar.gz", hash = "sha256:0c500d53b2e7a4734bd978ebafcb43bc8be1b0cace5690a2324d6fab1806926a"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -697,6 +703,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_mailer/pyproject.toml b/tools/c7n_mailer/pyproject.toml index 60a35dfaf10..c2e3421bcc9 100644 --- a/tools/c7n_mailer/pyproject.toml +++ b/tools/c7n_mailer/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_mailer" -version = "0.6.12" +version = "0.6.13" description = "Cloud Custodian - Reference Mailer" authors = ["Cloud Custodian Project"] license = "Apache-2.0" diff --git a/tools/c7n_mailer/requirements.txt b/tools/c7n_mailer/requirements.txt index 6e0e0d10ac7..f5ff32f2d7a 100644 --- a/tools/c7n_mailer/requirements.txt +++ b/tools/c7n_mailer/requirements.txt @@ -1,30 +1,30 @@ attrs==21.2.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -boto3==1.17.102; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -botocore==1.20.102; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -chardet==4.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" +boto3==1.18.21; python_version >= "3.6" +botocore==1.21.21; python_version >= "3.6" +certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3" datadog==0.34.1 decorator==5.0.9; python_version >= "3.5" -idna==2.10; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -importlib-metadata==4.6.0; python_version >= "3.6" and python_version < "3.8" +idna==3.2; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" +importlib-metadata==4.6.4; python_version >= "3.6" and python_version < "3.8" jinja2==3.0.1; python_version >= "3.6" -jmespath==0.10.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +jmespath==0.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" jsonpatch==1.32; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") jsonpointer==2.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") jsonschema==3.2.0 -ldap3==2.9 +ldap3==2.9.1 markupsafe==2.0.1; python_version >= "3.6" pyasn1==0.4.8 pyrsistent==0.18.0; python_version >= "3.6" -python-dateutil==2.8.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") +python-dateutil==2.8.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") python-http-client==3.3.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" pyyaml==5.4.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") redis==3.5.3; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -requests==2.25.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -s3transfer==0.4.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -sendgrid==6.7.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +requests==2.26.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +s3transfer==0.5.0; python_version >= "3.6" +sendgrid==6.8.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") +six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" starkbank-ecdsa==1.1.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" typing-extensions==3.10.0.0; python_version >= "3.6" and python_version < "3.8" -urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" -zipp==3.4.1; python_version >= "3.6" and python_version < "3.8" +urllib3==1.26.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6" +zipp==3.5.0; python_version >= "3.6" and python_version < "3.8" diff --git a/tools/c7n_mailer/setup.py b/tools/c7n_mailer/setup.py index f74bc0b244b..6202e395b03 100644 --- a/tools/c7n_mailer/setup.py +++ b/tools/c7n_mailer/setup.py @@ -28,7 +28,7 @@ setup_kwargs = { 'name': 'c7n-mailer', - 'version': '0.6.12', + 'version': '0.6.13', 'description': 'Cloud Custodian - Reference Mailer', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_openstack/poetry.lock b/tools/c7n_openstack/poetry.lock index e9eb3897056..79ec730f64f 100644 --- a/tools/c7n_openstack/poetry.lock +++ b/tools/c7n_openstack/poetry.lock @@ -44,24 +44,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -73,7 +76,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -103,7 +106,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.5" +version = "1.14.6" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -113,12 +116,15 @@ python-versions = "*" pycparser = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "colorama" @@ -169,15 +175,15 @@ stevedore = ">=3.0.0" [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "main" optional = false @@ -202,7 +208,7 @@ python-versions = "*" [[package]] name = "iso8601" -version = "0.1.14" +version = "0.1.16" description = "Simple module to parse ISO 8601 dates" category = "main" optional = false @@ -345,11 +351,11 @@ pbr = ">=2.0.0,<2.1.0 || >2.1.0" [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -432,7 +438,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "dev" optional = false @@ -451,21 +457,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "requestsexceptions" @@ -477,11 +483,11 @@ python-versions = "*" [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -586,7 +592,7 @@ typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false @@ -594,7 +600,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -619,12 +625,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] certifi = [ @@ -632,47 +638,55 @@ certifi = [ {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] cffi = [ - {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, - {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, - {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, - {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, - {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, - {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, - {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, - {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, - {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, - {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, - {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, - {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, - {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, - {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, - {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, - {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, - {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, - {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, - {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, -] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, + {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, + {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, + {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, + {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, + {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, + {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, + {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, + {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, + {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, + {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, + {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, + {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, + {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, + {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, + {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, + {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, + {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, + {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, + {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, +] +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -701,20 +715,20 @@ decorator = [ {file = "dogpile.cache-1.1.3.tar.gz", hash = "sha256:6f0bcf97c73bfec1a7bf14e5a248488cee00c2d494bf63f3789ea6d95a57c1cf"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, ] iso8601 = [ - {file = "iso8601-0.1.14-py2.py3-none-any.whl", hash = "sha256:e7e1122f064d626e17d47cd5106bed2c620cb38fe464999e0ddae2b6d2de6004"}, - {file = "iso8601-0.1.14.tar.gz", hash = "sha256:8aafd56fa0290496c5edbb13c311f78fa3a241f0853540da09d9363eae3ebd79"}, + {file = "iso8601-0.1.16-py2.py3-none-any.whl", hash = "sha256:906714829fedbc89955d52806c903f2332e3948ed94e31e85037f9e0226b8376"}, + {file = "iso8601-0.1.16.tar.gz", hash = "sha256:36532f77cc800594e8f16641edae7f1baf7932f05d8e508545b95fc53c6dc85b"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, @@ -820,8 +834,8 @@ os-service-types = [ {file = "os_service_types-1.7.0-py2.py3-none-any.whl", hash = "sha256:0505c72205690910077fb72b88f2a1f07533c8d39f2fe75b29583481764965d6"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pbr = [ {file = "pbr-5.6.0-py2.py3-none-any.whl", hash = "sha256:c68c661ac5cc81058ac94247278eeda6d2e6aecb3e227b0387c30d277e7ef8d4"}, @@ -871,8 +885,8 @@ pytest = [ {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, @@ -898,16 +912,16 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] requestsexceptions = [ {file = "requestsexceptions-1.4.0-py2.py3-none-any.whl", hash = "sha256:3083d872b6e07dc5c323563ef37671d992214ad9a32b0ca4a3d7f5500bf38ce3"}, {file = "requestsexceptions-1.4.0.tar.gz", hash = "sha256:b095cbc77618f066d459a02b137b020c37da9f46d9b057704019c9f77dba3065"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -981,6 +995,6 @@ yarl = [ {file = "yarl-1.6.3.tar.gz", hash = "sha256:8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_openstack/pyproject.toml b/tools/c7n_openstack/pyproject.toml index e6c05009f65..e56da4c7d1b 100644 --- a/tools/c7n_openstack/pyproject.toml +++ b/tools/c7n_openstack/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_openstack" -version = "0.1.3" +version = "0.1.4" description = "Cloud Custodian - OpenStack Provider" readme = "readme.md" authors = ["Cloud Custodian Project"] diff --git a/tools/c7n_openstack/requirements.txt b/tools/c7n_openstack/requirements.txt index e767c806787..786893e8740 100644 --- a/tools/c7n_openstack/requirements.txt +++ b/tools/c7n_openstack/requirements.txt @@ -1,13 +1,13 @@ appdirs==1.4.4; python_version >= "3.6" -certifi==2021.5.30; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -cffi==1.14.5; python_version >= "3.6" -chardet==4.0.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" +certifi==2021.5.30; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" +cffi==1.14.6; python_version >= "3.6" +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3.6" cryptography==3.4.7; python_version >= "3.6" decorator==5.0.9; python_version >= "3.6" dogpile.cache==1.1.3; python_version >= "3.6" -idna==2.10; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" -importlib-metadata==4.6.0; python_version < "3.8" and python_version >= "3.6" -iso8601==0.1.14; python_version >= "3.6" +idna==3.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" +importlib-metadata==4.6.4; python_version < "3.8" and python_version >= "3.6" +iso8601==0.1.16; python_version >= "3.6" jmespath==0.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" jsonpatch==1.32; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" jsonpointer==2.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" @@ -19,10 +19,10 @@ os-service-types==1.7.0; python_version >= "3.6" pbr==5.6.0; python_version >= "3.6" pycparser==2.20; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" pyyaml==5.4.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" -requests==2.25.1; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.6" +requests==2.26.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" requestsexceptions==1.4.0; python_version >= "3.6" six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" stevedore==3.3.0; python_version >= "3.6" typing-extensions==3.10.0.0; python_version < "3.8" and python_version >= "3.6" -urllib3==1.26.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6" -zipp==3.4.1; python_version < "3.8" and python_version >= "3.6" +urllib3==1.26.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6" +zipp==3.5.0; python_version < "3.8" and python_version >= "3.6" diff --git a/tools/c7n_openstack/setup.py b/tools/c7n_openstack/setup.py index 16cad240c6a..bc0bb8ab0b4 100644 --- a/tools/c7n_openstack/setup.py +++ b/tools/c7n_openstack/setup.py @@ -12,26 +12,26 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'openstacksdk>=0.52.0,<0.53.0', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] setup_kwargs = { 'name': 'c7n-openstack', - 'version': '0.1.3', + 'version': '0.1.4', 'description': 'Cloud Custodian - OpenStack Provider', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_org/poetry.lock b/tools/c7n_org/poetry.lock index 4fa9b019d24..9b92b30573e 100644 --- a/tools/c7n_org/poetry.lock +++ b/tools/c7n_org/poetry.lock @@ -36,24 +36,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -65,7 +68,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -103,7 +106,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -154,11 +157,11 @@ format_nongpl = ["idna", "jsonpointer (>1.13)", "webcolors", "rfc3986-validator [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -225,7 +228,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "dev" optional = false @@ -244,11 +247,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -306,7 +309,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -314,7 +317,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -335,12 +338,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] click = [ @@ -352,8 +355,8 @@ colorama = [ {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -368,8 +371,8 @@ jsonschema = [ {file = "jsonschema-3.2.0.tar.gz", hash = "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -411,8 +414,8 @@ pytest = [ {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, @@ -438,8 +441,8 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -463,6 +466,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_org/pyproject.toml b/tools/c7n_org/pyproject.toml index 6899acb66ce..cde3f9211d7 100644 --- a/tools/c7n_org/pyproject.toml +++ b/tools/c7n_org/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_org" -version = "0.6.12" +version = "0.6.13" description = "Cloud Custodian - Parallel Execution" readme = "README.md" homepage = "https://cloudcustodian.io" diff --git a/tools/c7n_org/setup.py b/tools/c7n_org/setup.py index 19a1d82a046..acc17e30b39 100644 --- a/tools/c7n_org/setup.py +++ b/tools/c7n_org/setup.py @@ -12,29 +12,29 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', 'click>=7.0,<8.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] entry_points = \ {'console_scripts': ['c7n-org = c7n_org.cli:cli']} setup_kwargs = { 'name': 'c7n-org', - 'version': '0.6.12', + 'version': '0.6.13', 'description': 'Cloud Custodian - Parallel Execution', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_policystream/poetry.lock b/tools/c7n_policystream/poetry.lock index 57c4a6f63f0..eaae14c56bd 100644 --- a/tools/c7n_policystream/poetry.lock +++ b/tools/c7n_policystream/poetry.lock @@ -36,24 +36,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "main" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -65,7 +68,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -103,7 +106,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.5" +version = "1.14.6" description = "Foreign Function Interface for Python calling C code." category = "main" optional = false @@ -113,12 +116,15 @@ python-versions = "*" pycparser = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "click" @@ -138,15 +144,15 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -210,11 +216,11 @@ test = ["pytest (<5.4)", "pytest-cov"] [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -301,7 +307,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "main" optional = false @@ -320,29 +326,29 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "main" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -400,7 +406,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -408,7 +414,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -429,12 +435,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] cached-property = [ @@ -446,47 +452,55 @@ certifi = [ {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] cffi = [ - {file = "cffi-1.14.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1"}, - {file = "cffi-1.14.5-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa"}, - {file = "cffi-1.14.5-cp27-cp27m-win32.whl", hash = "sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3"}, - {file = "cffi-1.14.5-cp27-cp27m-win_amd64.whl", hash = "sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482"}, - {file = "cffi-1.14.5-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6"}, - {file = "cffi-1.14.5-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa"}, - {file = "cffi-1.14.5-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406"}, - {file = "cffi-1.14.5-cp35-cp35m-win32.whl", hash = "sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369"}, - {file = "cffi-1.14.5-cp35-cp35m-win_amd64.whl", hash = "sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315"}, - {file = "cffi-1.14.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5"}, - {file = "cffi-1.14.5-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132"}, - {file = "cffi-1.14.5-cp36-cp36m-win32.whl", hash = "sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53"}, - {file = "cffi-1.14.5-cp36-cp36m-win_amd64.whl", hash = "sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813"}, - {file = "cffi-1.14.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1"}, - {file = "cffi-1.14.5-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49"}, - {file = "cffi-1.14.5-cp37-cp37m-win32.whl", hash = "sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62"}, - {file = "cffi-1.14.5-cp37-cp37m-win_amd64.whl", hash = "sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4"}, - {file = "cffi-1.14.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_i686.whl", hash = "sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e"}, - {file = "cffi-1.14.5-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827"}, - {file = "cffi-1.14.5-cp38-cp38-win32.whl", hash = "sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e"}, - {file = "cffi-1.14.5-cp38-cp38-win_amd64.whl", hash = "sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396"}, - {file = "cffi-1.14.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c"}, - {file = "cffi-1.14.5-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee"}, - {file = "cffi-1.14.5-cp39-cp39-win32.whl", hash = "sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396"}, - {file = "cffi-1.14.5-cp39-cp39-win_amd64.whl", hash = "sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d"}, - {file = "cffi-1.14.5.tar.gz", hash = "sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"}, -] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, + {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, + {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, + {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, + {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, + {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, + {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, + {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, + {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, + {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, + {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, + {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, + {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, + {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, + {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, + {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, + {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, + {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, + {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, + {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, + {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, + {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, + {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, + {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, + {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, + {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, + {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, +] +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] click = [ {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, @@ -497,12 +511,12 @@ colorama = [ {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -521,8 +535,8 @@ mock = [ {file = "mock-4.0.3.tar.gz", hash = "sha256:7d3fbbde18228f4ff2f1f119a45cdffa458b4c0dee32eb4d2bb2f82554bac7bc"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -587,8 +601,8 @@ pytest = [ {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, @@ -614,12 +628,12 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -643,6 +657,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_policystream/pyproject.toml b/tools/c7n_policystream/pyproject.toml index d5f501cdfd2..565d3449571 100644 --- a/tools/c7n_policystream/pyproject.toml +++ b/tools/c7n_policystream/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_policystream" -version = "0.4.12" +version = "0.4.13" description = "Cloud Custodian - Git Commits as Logical Policy Changes" readme = "README.md" homepage = "https://cloudcustodian.io" diff --git a/tools/c7n_policystream/requirements.txt b/tools/c7n_policystream/requirements.txt index 8321c9aaf77..253464a89db 100644 --- a/tools/c7n_policystream/requirements.txt +++ b/tools/c7n_policystream/requirements.txt @@ -1,17 +1,17 @@ -boto3==1.17.102; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -botocore==1.20.102; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +boto3==1.18.21; python_version >= "3.6" +botocore==1.21.21; python_version >= "3.6" cached-property==1.5.2 -certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -cffi==1.14.5 -chardet==4.0.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" +certifi==2021.5.30; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +cffi==1.14.6 +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3" click==7.1.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -idna==2.10; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" -jmespath==0.10.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +idna==3.2; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" +jmespath==0.10.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" pycparser==2.20; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" pygit2==1.5.0 -python-dateutil==2.8.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" +python-dateutil==2.8.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" pyyaml==5.4.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -requests==2.25.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -s3transfer==0.4.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -six==1.16.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" -urllib3==1.26.6; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" +requests==2.26.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") +s3transfer==0.5.0; python_version >= "3.6" +six==1.16.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" +urllib3==1.26.6; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6" diff --git a/tools/c7n_policystream/setup.py b/tools/c7n_policystream/setup.py index 62d6e9841d8..ff38c4bb589 100644 --- a/tools/c7n_policystream/setup.py +++ b/tools/c7n_policystream/setup.py @@ -8,33 +8,33 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', + 'boto3 (>=1.18.21,<2.0.0)', 'boto3>=1.12.0,<2.0.0', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', 'click>=7.0,<8.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'pygit2>=1.5,<1.6', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', 'pyyaml>=5.3,<6.0', 'requests>=2.22.0,<3.0.0', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] entry_points = \ {'console_scripts': ['c7n-policystream = policystream:cli']} setup_kwargs = { 'name': 'c7n-policystream', - 'version': '0.4.12', + 'version': '0.4.13', 'description': 'Cloud Custodian - Git Commits as Logical Policy Changes', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_sphinxext/poetry.lock b/tools/c7n_sphinxext/poetry.lock index ca2b904b637..1d32dfb2bd7 100644 --- a/tools/c7n_sphinxext/poetry.lock +++ b/tools/c7n_sphinxext/poetry.lock @@ -47,24 +47,27 @@ pytz = ">=2015.7" [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -76,7 +79,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -105,12 +108,15 @@ optional = false python-versions = "*" [[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" +name = "charset-normalizer" +version = "2.0.4" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] [[package]] name = "click" @@ -149,11 +155,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "idna" -version = "2.10" +version = "3.2" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.5" [[package]] name = "imagesize" @@ -165,7 +171,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -238,11 +244,11 @@ python-versions = ">=3.6" [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -273,7 +279,7 @@ python-versions = ">=3.6" [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "dev" optional = false @@ -313,29 +319,29 @@ sphinx = ">=1.3.1" [[package]] name = "requests" -version = "2.25.1" +version = "2.26.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [package.dependencies] certifi = ">=2017.4.17" -chardet = ">=3.0.2,<5" -idna = ">=2.5,<3" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} urllib3 = ">=1.21.1,<1.27" [package.extras] -security = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)"] socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -517,7 +523,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -525,7 +531,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -550,21 +556,21 @@ babel = [ {file = "Babel-2.9.1.tar.gz", hash = "sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] certifi = [ {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, ] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, +charset-normalizer = [ + {file = "charset-normalizer-2.0.4.tar.gz", hash = "sha256:f23667ebe1084be45f6ae0538e4a5a865206544097e4e8bbcacf42cd02a348f3"}, + {file = "charset_normalizer-2.0.4-py3-none-any.whl", hash = "sha256:0c8911edd15d19223366a194a513099a302055a962bca2cec0f54b8b63175d8b"}, ] click = [ {file = "click-7.1.2-py2.py3-none-any.whl", hash = "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc"}, @@ -583,16 +589,16 @@ docutils = [ {file = "docutils-0.17.1.tar.gz", hash = "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"}, ] idna = [ - {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, - {file = "idna-2.10.tar.gz", hash = "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"}, + {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, + {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] imagesize = [ {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"}, {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] jinja2 = [ {file = "Jinja2-3.0.1-py3-none-any.whl", hash = "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4"}, @@ -647,8 +653,8 @@ markupsafe = [ {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pygments = [ {file = "Pygments-2.9.0-py3-none-any.whl", hash = "sha256:d66e804411278594d764fc69ec36ec13d9ae9147193a1740cd34d272ca383b8e"}, @@ -682,8 +688,8 @@ pyrsistent = [ {file = "pyrsistent-0.18.0.tar.gz", hash = "sha256:773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pytz = [ {file = "pytz-2021.1-py2.py3-none-any.whl", hash = "sha256:eb10ce3e7736052ed3623d49975ce333bcd712c7bb19a58b9e2089d4057d0798"}, @@ -717,12 +723,12 @@ recommonmark = [ {file = "recommonmark-0.6.0.tar.gz", hash = "sha256:29cd4faeb6c5268c633634f2d69aef9431e0f4d347f90659fd0aab20e541efeb"}, ] requests = [ - {file = "requests-2.25.1-py2.py3-none-any.whl", hash = "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"}, - {file = "requests-2.25.1.tar.gz", hash = "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804"}, + {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, + {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -782,6 +788,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_sphinxext/pyproject.toml b/tools/c7n_sphinxext/pyproject.toml index 5e457005b1e..d1c3a3c2ffd 100644 --- a/tools/c7n_sphinxext/pyproject.toml +++ b/tools/c7n_sphinxext/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_sphinxext" -version = "1.1.12" +version = "1.1.13" description = "Cloud Custodian - Sphinx Extensions" authors = ["Cloud Custodian Project"] license = "Apache-2.0" diff --git a/tools/c7n_sphinxext/requirements.txt b/tools/c7n_sphinxext/requirements.txt index d1bfb1628d5..5c008dfbcfe 100644 --- a/tools/c7n_sphinxext/requirements.txt +++ b/tools/c7n_sphinxext/requirements.txt @@ -1,22 +1,22 @@ alabaster==0.7.12; python_version >= "3.5" babel==2.9.1; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5" -certifi==2021.5.30; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5" -chardet==4.0.0; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5" +certifi==2021.5.30; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" +charset-normalizer==2.0.4; python_full_version >= "3.6.0" and python_version >= "3.5" click==7.1.2; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") colorama==0.4.4; python_version >= "3.5" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.5" and python_full_version >= "3.5.0" commonmark==0.9.1 docutils==0.17.1; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5" -idna==2.10; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5" +idna==3.2; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" imagesize==1.2.0; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5" jinja2==3.0.1; python_version >= "3.6" markdown==3.0.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" markupsafe==2.0.1; python_version >= "3.6" -packaging==20.9; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5" +packaging==21.0; python_version >= "3.6" pygments==2.9.0; python_version >= "3.5" -pyparsing==2.4.7; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5" +pyparsing==2.4.7; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.6" pytz==2021.1; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.5" recommonmark==0.6.0 -requests==2.25.1; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.5" +requests==2.26.0; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.5" snowballstemmer==2.1.0; python_version >= "3.5" sphinx-markdown-tables==0.0.12 sphinx-rtd-theme==0.4.3 @@ -28,4 +28,4 @@ sphinxcontrib-jsmath==1.0.1; python_version >= "3.5" sphinxcontrib-qthelp==1.0.3; python_version >= "3.5" sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.5" typing-extensions==3.10.0.0 -urllib3==1.26.6; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.5" +urllib3==1.26.6; python_version >= "3.5" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.5" diff --git a/tools/c7n_sphinxext/setup.py b/tools/c7n_sphinxext/setup.py index fb2f4c2999b..d1b08cf9539 100644 --- a/tools/c7n_sphinxext/setup.py +++ b/tools/c7n_sphinxext/setup.py @@ -14,18 +14,18 @@ 'Sphinx>=3.0,<3.1', 'argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', 'click>=7.1.2,<8.0.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', 'recommonmark>=0.6.0,<0.7.0', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'sphinx_markdown_tables>=0.0.12,<0.0.13', 'sphinx_rtd_theme>=0.4.3,<0.5.0', @@ -33,14 +33,14 @@ 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'typing-extensions>=3.7.4,<4.0.0', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] entry_points = \ {'console_scripts': ['c7n-sphinxext = c7n_sphinxext.docgen:main']} setup_kwargs = { 'name': 'c7n-sphinxext', - 'version': '1.1.12', + 'version': '1.1.13', 'description': 'Cloud Custodian - Sphinx Extensions', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_terraform/poetry.lock b/tools/c7n_terraform/poetry.lock index 139ef347223..b6f1ccfb8ce 100644 --- a/tools/c7n_terraform/poetry.lock +++ b/tools/c7n_terraform/poetry.lock @@ -36,24 +36,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -65,7 +68,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -114,7 +117,7 @@ test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"] [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -177,11 +180,11 @@ regex = ["regex"] [[package]] name = "packaging" -version = "20.9" +version = "21.0" description = "Core utilities for Python packages" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2" @@ -264,7 +267,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xm [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "dev" optional = false @@ -309,11 +312,11 @@ typing-extensions = ">=3.7.4,<4.0.0" [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -371,7 +374,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -379,7 +382,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -400,12 +403,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] click = [ @@ -421,8 +424,8 @@ commonmark = [ {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -440,8 +443,8 @@ lark-parser = [ {file = "lark-parser-0.10.1.tar.gz", hash = "sha256:42f367612a1bbc4cf9d8c8eb1b209d8a9b397d55af75620c9e6f53e502235996"}, ] packaging = [ - {file = "packaging-20.9-py2.py3-none-any.whl", hash = "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a"}, - {file = "packaging-20.9.tar.gz", hash = "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5"}, + {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, + {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, ] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, @@ -491,8 +494,8 @@ pytest = [ {file = "pytest-6.2.4.tar.gz", hash = "sha256:50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] python-hcl2 = [ {file = "python-hcl2-2.0.3.tar.gz", hash = "sha256:62bfe6a152e794700abd125bfb5c53913af8c8bc98eeef37bd30f87e3f19bfc2"}, @@ -525,8 +528,8 @@ rich = [ {file = "rich-1.3.1.tar.gz", hash = "sha256:6a6c338d5d015ca23e340fe8af5f0b9eedb527821c69c22b94acc76fe3cb2e51"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -550,6 +553,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_terraform/pyproject.toml b/tools/c7n_terraform/pyproject.toml index eb479528f88..98f16fdb54e 100644 --- a/tools/c7n_terraform/pyproject.toml +++ b/tools/c7n_terraform/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_terraform" -version = "0.1.3" +version = "0.1.4" readme = "readme.md" description = "Cloud Custodian Provider for evaluating Terraform" repository = "https://github.com/cloud-custodian/cloud-custodian" diff --git a/tools/c7n_terraform/setup.py b/tools/c7n_terraform/setup.py index dbd07be01bd..0a0807304f2 100644 --- a/tools/c7n_terraform/setup.py +++ b/tools/c7n_terraform/setup.py @@ -12,28 +12,28 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', 'click>=7.1.2,<8.0.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'python-hcl2>=2.0,<3.0', 'pyyaml (>=5.4.1,<6.0.0)', 'rich>=1.1.9,<2.0.0', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] setup_kwargs = { 'name': 'c7n-terraform', - 'version': '0.1.3', + 'version': '0.1.4', 'description': 'Cloud Custodian Provider for evaluating Terraform', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/c7n_trailcreator/poetry.lock b/tools/c7n_trailcreator/poetry.lock index 718c58368a9..88b8d999242 100644 --- a/tools/c7n_trailcreator/poetry.lock +++ b/tools/c7n_trailcreator/poetry.lock @@ -28,24 +28,27 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> [[package]] name = "boto3" -version = "1.17.102" +version = "1.18.21" description = "The AWS SDK for Python" category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.20.102,<1.21.0" +botocore = ">=1.21.21,<1.22.0" jmespath = ">=0.7.1,<1.0.0" -s3transfer = ">=0.4.0,<0.5.0" +s3transfer = ">=0.5.0,<0.6.0" + +[package.extras] +crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.20.102" +version = "1.21.21" description = "Low-level, data-driven core of boto 3." category = "dev" optional = false -python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">= 3.6" [package.dependencies] jmespath = ">=0.7.1,<1.0.0" @@ -57,7 +60,7 @@ crt = ["awscrt (==0.11.24)"] [[package]] name = "c7n" -version = "0.9.13" +version = "0.9.14" description = "Cloud Custodian - Policy Rules Engine" category = "dev" optional = false @@ -79,7 +82,7 @@ url = "../.." [[package]] name = "c7n-org" -version = "0.6.12" +version = "0.6.13" description = "Cloud Custodian - Parallel Execution" category = "dev" optional = false @@ -103,7 +106,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "importlib-metadata" -version = "4.6.0" +version = "4.6.4" description = "Read metadata from Python packages" category = "dev" optional = false @@ -154,7 +157,7 @@ python-versions = ">=3.6" [[package]] name = "python-dateutil" -version = "2.8.1" +version = "2.8.2" description = "Extensions to the standard Python datetime module" category = "dev" optional = false @@ -173,11 +176,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "s3transfer" -version = "0.4.2" +version = "0.5.0" description = "An Amazon S3 Transfer Manager" category = "dev" optional = false -python-versions = "*" +python-versions = ">= 3.6" [package.dependencies] botocore = ">=1.12.36,<2.0a.0" @@ -227,7 +230,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "zipp" -version = "3.4.1" +version = "3.5.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false @@ -235,7 +238,7 @@ python-versions = ">=3.6" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=1.2.3)", "pytest-flake8", "pytest-cov", "pytest-enabler", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [metadata] lock-version = "1.1" @@ -252,12 +255,12 @@ attrs = [ {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, ] boto3 = [ - {file = "boto3-1.17.102-py2.py3-none-any.whl", hash = "sha256:6300e9ee9a404038113250bd218e2c4827f5e676efb14e77de2ad2dcb67679bc"}, - {file = "boto3-1.17.102.tar.gz", hash = "sha256:be4714f0475c1f5183eea09ddbf568ced6fa41b0fc9976f2698b8442e1b17303"}, + {file = "boto3-1.18.21-py3-none-any.whl", hash = "sha256:59b6e8e79b2114e21388288a06a004f2a9378b1e0fc58466a35da8fb74fe2dd8"}, + {file = "boto3-1.18.21.tar.gz", hash = "sha256:00748c760dc30be61c6db4b092718f6a9f8d27c767da0e232695a65adb75cde8"}, ] botocore = [ - {file = "botocore-1.20.102-py2.py3-none-any.whl", hash = "sha256:bdf08a4f7f01ead00d386848f089c08270499711447569c18d0db60023619c06"}, - {file = "botocore-1.20.102.tar.gz", hash = "sha256:2f57f7ceed1598d96cc497aeb45317db5d3b21a5aafea4732d0e561d0fc2a8fa"}, + {file = "botocore-1.21.21-py3-none-any.whl", hash = "sha256:fa5ac13829d24fcdd385e82c3b6d78e22d93f427cca8dac38158cae84a8cc2f5"}, + {file = "botocore-1.21.21.tar.gz", hash = "sha256:12cfe74b0a5c44afb34bdd86c1f8ad74bc2ad9ec168eaed9040ef70cb3db944f"}, ] c7n = [] c7n-org = [] @@ -266,8 +269,8 @@ click = [ {file = "click-7.1.2.tar.gz", hash = "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.0-py3-none-any.whl", hash = "sha256:c6513572926a96458f8c8f725bf0e00108fba0c9583ade9bd15b869c9d726e33"}, - {file = "importlib_metadata-4.6.0.tar.gz", hash = "sha256:4a5611fea3768d3d967c447ab4e93f567d95db92225b43b7b238dbfb855d70bb"}, + {file = "importlib_metadata-4.6.4-py3-none-any.whl", hash = "sha256:ed5157fef23a4bc4594615a0dd8eba94b2bb36bf2a343fa3d8bb2fa0a62a99d5"}, + {file = "importlib_metadata-4.6.4.tar.gz", hash = "sha256:7b30a78db2922d78a6f47fb30683156a14f3c6aa5cc23f77cc8967e9ab2d002f"}, ] jmespath = [ {file = "jmespath-0.10.0-py2.py3-none-any.whl", hash = "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f"}, @@ -301,8 +304,8 @@ pyrsistent = [ {file = "pyrsistent-0.18.0.tar.gz", hash = "sha256:773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"}, ] python-dateutil = [ - {file = "python-dateutil-2.8.1.tar.gz", hash = "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c"}, - {file = "python_dateutil-2.8.1-py2.py3-none-any.whl", hash = "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a"}, + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, ] pyyaml = [ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, @@ -328,8 +331,8 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] s3transfer = [ - {file = "s3transfer-0.4.2-py2.py3-none-any.whl", hash = "sha256:9b3752887a2880690ce628bc263d6d13a3864083aeacff4890c1c9839a5eb0bc"}, - {file = "s3transfer-0.4.2.tar.gz", hash = "sha256:cb022f4b16551edebbb31a377d3f09600dbada7363d8c5db7976e7f47732e1b2"}, + {file = "s3transfer-0.5.0-py3-none-any.whl", hash = "sha256:9c1dc369814391a6bda20ebbf4b70a0f34630592c9aa520856bf384916af2803"}, + {file = "s3transfer-0.5.0.tar.gz", hash = "sha256:50ed823e1dc5868ad40c8dc92072f757aa0e653a192845c94a3b676f4a62da4c"}, ] six = [ {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, @@ -349,6 +352,6 @@ urllib3 = [ {file = "urllib3-1.26.6.tar.gz", hash = "sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f"}, ] zipp = [ - {file = "zipp-3.4.1-py3-none-any.whl", hash = "sha256:51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098"}, - {file = "zipp-3.4.1.tar.gz", hash = "sha256:3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"}, + {file = "zipp-3.5.0-py3-none-any.whl", hash = "sha256:957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3"}, + {file = "zipp-3.5.0.tar.gz", hash = "sha256:f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"}, ] diff --git a/tools/c7n_trailcreator/pyproject.toml b/tools/c7n_trailcreator/pyproject.toml index d8ea6cfadb3..f7b47a86fc8 100644 --- a/tools/c7n_trailcreator/pyproject.toml +++ b/tools/c7n_trailcreator/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "c7n_trailcreator" -version = "0.2.12" +version = "0.2.13" readme = "readme.md" homepage = "https://cloudcustodian.io" repository = "https://github.com/cloud-custodian/cloud-custodian" diff --git a/tools/c7n_trailcreator/setup.py b/tools/c7n_trailcreator/setup.py index ba1c716f933..84bce733b63 100644 --- a/tools/c7n_trailcreator/setup.py +++ b/tools/c7n_trailcreator/setup.py @@ -12,31 +12,31 @@ install_requires = \ ['argcomplete (>=1.12.3,<2.0.0)', 'attrs (>=21.2.0,<22.0.0)', - 'boto3 (>=1.17.102,<2.0.0)', - 'botocore (>=1.20.102,<2.0.0)', - 'c7n (>=0.9.13,<0.10.0)', - 'c7n-org (>=0.6.12,<0.7.0)', + 'boto3 (>=1.18.21,<2.0.0)', + 'botocore (>=1.21.21,<2.0.0)', + 'c7n (>=0.9.14,<0.10.0)', + 'c7n-org (>=0.6.13,<0.7.0)', 'click (>=7.1.2,<8.0.0)', 'click>=7.0,<8.0', - 'importlib-metadata (>=4.6.0,<5.0.0)', + 'importlib-metadata (>=4.6.4,<5.0.0)', 'jmespath (>=0.10.0,<0.11.0)', 'jsonschema (>=3.2.0,<4.0.0)', 'pyrsistent (>=0.18.0,<0.19.0)', - 'python-dateutil (>=2.8.1,<3.0.0)', + 'python-dateutil (>=2.8.2,<3.0.0)', 'pyyaml (>=5.4.1,<6.0.0)', - 's3transfer (>=0.4.2,<0.5.0)', + 's3transfer (>=0.5.0,<0.6.0)', 'six (>=1.16.0,<2.0.0)', 'tabulate (>=0.8.9,<0.9.0)', 'typing-extensions (>=3.10.0.0,<4.0.0.0)', 'urllib3 (>=1.26.6,<2.0.0)', - 'zipp (>=3.4.1,<4.0.0)'] + 'zipp (>=3.5.0,<4.0.0)'] entry_points = \ {'console_scripts': ['c7n-trailcreator = c7n_trailcreator.trailcreator:cli']} setup_kwargs = { 'name': 'c7n-trailcreator', - 'version': '0.2.12', + 'version': '0.2.13', 'description': 'Cloud Custodian - Retroactive Tag Resource Creators from CloudTrail', 'license': 'Apache-2.0', 'classifiers': [ diff --git a/tools/dev/iamdb.py b/tools/dev/iamdb.py index 6e903d73406..b9076315f37 100644 --- a/tools/dev/iamdb.py +++ b/tools/dev/iamdb.py @@ -4,6 +4,8 @@ import requests import json +from collections import defaultdict + URL = "https://awspolicygen.s3.amazonaws.com/js/policies.js" @@ -11,13 +13,13 @@ def main(): raw_data = requests.get(URL).text data = json.loads(raw_data[raw_data.find('=') + 1:]) - perms = {} + perms = defaultdict(list) for _, svc in data['serviceMap'].items(): - perms[svc['StringPrefix']] = svc['Actions'] + perms[svc['StringPrefix']].extend(svc['Actions']) sorted_perms = {} for k in sorted(perms): - sorted_perms[k] = sorted(perms[k]) + sorted_perms[k] = sorted(set(perms[k])) with open('iam-permissions.json', 'w') as fh: json.dump(sorted_perms, fp=fh, indent=2)