From 8774069f7d842492b015feefdef66b02b8c2c9d9 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 9 Jun 2023 14:12:44 -0700 Subject: [PATCH] fixing deprecated dict for states. --- salt/states/boto3_elasticache.py | 1 - salt/states/boto3_elasticsearch.py | 1 - salt/states/boto3_route53.py | 1 - salt/states/boto3_sns.py | 1 - salt/states/boto_apigateway.py | 1 - salt/states/boto_asg.py | 1 - salt/states/boto_cfn.py | 1 - salt/states/boto_cloudfront.py | 1 - salt/states/boto_cloudtrail.py | 1 - salt/states/boto_cloudwatch_alarm.py | 1 - salt/states/boto_cloudwatch_event.py | 1 - salt/states/boto_cognitoidentity.py | 1 - salt/states/boto_datapipeline.py | 1 - salt/states/boto_dynamodb.py | 1 - salt/states/boto_ec2.py | 1 - salt/states/boto_elasticache.py | 1 - salt/states/boto_elasticsearch_domain.py | 1 - salt/states/boto_elb.py | 1 - salt/states/boto_elbv2.py | 1 - salt/states/boto_iam.py | 1 - salt/states/boto_iam_role.py | 1 - salt/states/boto_iot.py | 1 - salt/states/boto_kinesis.py | 1 - salt/states/boto_kms.py | 6 ++++++ salt/states/boto_lambda.py | 1 - salt/states/boto_lc.py | 1 - salt/states/boto_rds.py | 1 - salt/states/boto_route53.py | 1 - salt/states/boto_s3.py | 1 - salt/states/boto_s3_bucket.py | 1 - salt/states/boto_secgroup.py | 1 - salt/states/boto_sns.py | 1 - salt/states/boto_sqs.py | 1 - salt/states/boto_vpc.py | 1 - 34 files changed, 6 insertions(+), 33 deletions(-) diff --git a/salt/states/boto3_elasticache.py b/salt/states/boto3_elasticache.py index 80198076c99..10989a8f1b8 100644 --- a/salt/states/boto3_elasticache.py +++ b/salt/states/boto3_elasticache.py @@ -89,7 +89,6 @@ passed in as a dict, or as a string to pull from pillars or minion config: __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto3_elasticsearch.py b/salt/states/boto3_elasticsearch.py index 92fcf6d073e..2b27080faea 100644 --- a/salt/states/boto3_elasticsearch.py +++ b/salt/states/boto3_elasticsearch.py @@ -53,7 +53,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto3_route53.py b/salt/states/boto3_route53.py index 39014b2931c..bbaf25e5148 100644 --- a/salt/states/boto3_route53.py +++ b/salt/states/boto3_route53.py @@ -75,7 +75,6 @@ log = logging.getLogger(__name__) # pylint: disable=W1699 __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto3_sns.py b/salt/states/boto3_sns.py index 6ead5f0e859..5f0b4a14148 100644 --- a/salt/states/boto3_sns.py +++ b/salt/states/boto3_sns.py @@ -72,7 +72,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_apigateway.py b/salt/states/boto_apigateway.py index 135513c513e..e96042d78fe 100644 --- a/salt/states/boto_apigateway.py +++ b/salt/states/boto_apigateway.py @@ -64,7 +64,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_asg.py b/salt/states/boto_asg.py index b92ec2f926e..5241d054d5a 100644 --- a/salt/states/boto_asg.py +++ b/salt/states/boto_asg.py @@ -204,7 +204,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_cfn.py b/salt/states/boto_cfn.py index 8aca0c2e104..d994752abc5 100644 --- a/salt/states/boto_cfn.py +++ b/salt/states/boto_cfn.py @@ -48,7 +48,6 @@ __virtualname__ = "boto_cfn" __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_cloudfront.py b/salt/states/boto_cloudfront.py index 63d446f9a87..71fe499a7d4 100644 --- a/salt/states/boto_cloudfront.py +++ b/salt/states/boto_cloudfront.py @@ -52,7 +52,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_cloudtrail.py b/salt/states/boto_cloudtrail.py index a157fce4778..d9fb63c5e33 100644 --- a/salt/states/boto_cloudtrail.py +++ b/salt/states/boto_cloudtrail.py @@ -63,7 +63,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_cloudwatch_alarm.py b/salt/states/boto_cloudwatch_alarm.py index 817bffc924c..b56074d4d78 100644 --- a/salt/states/boto_cloudwatch_alarm.py +++ b/salt/states/boto_cloudwatch_alarm.py @@ -57,7 +57,6 @@ import salt.utils.data __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_cloudwatch_event.py b/salt/states/boto_cloudwatch_event.py index 51d850215dc..2e956eaf235 100644 --- a/salt/states/boto_cloudwatch_event.py +++ b/salt/states/boto_cloudwatch_event.py @@ -61,7 +61,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_cognitoidentity.py b/salt/states/boto_cognitoidentity.py index 6ba21169365..c514a336dc7 100644 --- a/salt/states/boto_cognitoidentity.py +++ b/salt/states/boto_cognitoidentity.py @@ -52,7 +52,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_datapipeline.py b/salt/states/boto_datapipeline.py index 8c5a0d142f3..4401bc18893 100644 --- a/salt/states/boto_datapipeline.py +++ b/salt/states/boto_datapipeline.py @@ -58,7 +58,6 @@ import salt.utils.json __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_dynamodb.py b/salt/states/boto_dynamodb.py index 14e5422e80b..c296684a395 100644 --- a/salt/states/boto_dynamodb.py +++ b/salt/states/boto_dynamodb.py @@ -164,7 +164,6 @@ import salt.utils.dictupdate as dictupdate __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_ec2.py b/salt/states/boto_ec2.py index 995a706682f..ba3e0953c12 100644 --- a/salt/states/boto_ec2.py +++ b/salt/states/boto_ec2.py @@ -62,7 +62,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_elasticache.py b/salt/states/boto_elasticache.py index 6a36924227a..9e4cdbdab6d 100644 --- a/salt/states/boto_elasticache.py +++ b/salt/states/boto_elasticache.py @@ -83,7 +83,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_elasticsearch_domain.py b/salt/states/boto_elasticsearch_domain.py index ed5d4cbb534..c4a25e04f1e 100644 --- a/salt/states/boto_elasticsearch_domain.py +++ b/salt/states/boto_elasticsearch_domain.py @@ -87,7 +87,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_elb.py b/salt/states/boto_elb.py index 4e24c4237d7..e3c975f389c 100644 --- a/salt/states/boto_elb.py +++ b/salt/states/boto_elb.py @@ -248,7 +248,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_elbv2.py b/salt/states/boto_elbv2.py index d8069076b44..5f74fcbfeaa 100644 --- a/salt/states/boto_elbv2.py +++ b/salt/states/boto_elbv2.py @@ -41,7 +41,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_iam.py b/salt/states/boto_iam.py index 7a4a7f90bd4..841e02abf0c 100644 --- a/salt/states/boto_iam.py +++ b/salt/states/boto_iam.py @@ -148,7 +148,6 @@ __virtualname__ = "boto_iam" __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_iam_role.py b/salt/states/boto_iam_role.py index d4ccfe79789..63927a108be 100644 --- a/salt/states/boto_iam_role.py +++ b/salt/states/boto_iam_role.py @@ -96,7 +96,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_iot.py b/salt/states/boto_iot.py index 9fb044cb92a..53a86b45a93 100644 --- a/salt/states/boto_iot.py +++ b/salt/states/boto_iot.py @@ -82,7 +82,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_kinesis.py b/salt/states/boto_kinesis.py index b3bdb607750..27fed723496 100644 --- a/salt/states/boto_kinesis.py +++ b/salt/states/boto_kinesis.py @@ -67,7 +67,6 @@ __virtualname__ = "boto_kinesis" __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_kms.py b/salt/states/boto_kms.py index aadc02093e8..26826d15ee6 100644 --- a/salt/states/boto_kms.py +++ b/salt/states/boto_kms.py @@ -59,6 +59,12 @@ config: import salt.utils.dictupdate as dictupdate from salt.exceptions import SaltInvocationError +__deprecated__ = ( + 3009, + "boto", + "https://github.com/salt-extensions/saltext-boto", +) + def __virtual__(): """ diff --git a/salt/states/boto_lambda.py b/salt/states/boto_lambda.py index ea8b500aec8..92453ddb289 100644 --- a/salt/states/boto_lambda.py +++ b/salt/states/boto_lambda.py @@ -74,7 +74,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_lc.py b/salt/states/boto_lc.py index 3f7744a482d..1a0c4d9cd11 100644 --- a/salt/states/boto_lc.py +++ b/salt/states/boto_lc.py @@ -102,7 +102,6 @@ from salt.exceptions import SaltInvocationError __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_rds.py b/salt/states/boto_rds.py index 1e607171064..c254a6c5bb1 100644 --- a/salt/states/boto_rds.py +++ b/salt/states/boto_rds.py @@ -79,7 +79,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_route53.py b/salt/states/boto_route53.py index 4cbef9d2f2c..ebd6d2194b0 100644 --- a/salt/states/boto_route53.py +++ b/salt/states/boto_route53.py @@ -82,7 +82,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_s3.py b/salt/states/boto_s3.py index 31880282272..864a899b8c4 100644 --- a/salt/states/boto_s3.py +++ b/salt/states/boto_s3.py @@ -59,7 +59,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_s3_bucket.py b/salt/states/boto_s3_bucket.py index e874c3548a8..cf8166fe8bd 100644 --- a/salt/states/boto_s3_bucket.py +++ b/salt/states/boto_s3_bucket.py @@ -147,7 +147,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_secgroup.py b/salt/states/boto_secgroup.py index 7f734e23429..ef73d7d2147 100644 --- a/salt/states/boto_secgroup.py +++ b/salt/states/boto_secgroup.py @@ -113,7 +113,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_sns.py b/salt/states/boto_sns.py index 0c8c6689f41..674268c5927 100644 --- a/salt/states/boto_sns.py +++ b/salt/states/boto_sns.py @@ -60,7 +60,6 @@ import re __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_sqs.py b/salt/states/boto_sqs.py index 2ec4eb80304..a8455d38a6f 100644 --- a/salt/states/boto_sqs.py +++ b/salt/states/boto_sqs.py @@ -67,7 +67,6 @@ log = logging.getLogger(__name__) __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" ) diff --git a/salt/states/boto_vpc.py b/salt/states/boto_vpc.py index f036be63622..669b97ef37f 100644 --- a/salt/states/boto_vpc.py +++ b/salt/states/boto_vpc.py @@ -153,7 +153,6 @@ __virtualname__ = "boto_vpc" __deprecated__ = ( 3009, - "Potassium", "boto", "https://github.com/salt-extensions/saltext-boto" )