From d695107f7cfd4fb8e3812116be0a575e46e3cf28 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Fri, 9 Jun 2023 09:32:16 -0700 Subject: [PATCH] Simplify the deprecation decorator and deprecated dictionary and only use the version number. --- salt/modules/boto3_elasticache.py | 7 +------ salt/modules/boto3_elasticsearch.py | 7 +------ salt/modules/boto3_route53.py | 7 +------ salt/modules/boto3_sns.py | 7 +------ salt/modules/boto_apigateway.py | 8 ++------ salt/modules/boto_asg.py | 7 +------ salt/modules/boto_cfn.py | 7 +------ salt/modules/boto_cloudfront.py | 7 +------ salt/modules/boto_cloudtrail.py | 7 +------ salt/modules/boto_cloudwatch.py | 8 ++------ salt/modules/boto_cloudwatch_event.py | 7 +------ salt/modules/boto_cognitoidentity.py | 7 +------ salt/modules/boto_datapipeline.py | 7 +------ salt/modules/boto_dynamodb.py | 7 +------ salt/modules/boto_ec2.py | 7 +------ salt/modules/boto_efs.py | 8 ++------ salt/modules/boto_elasticache.py | 7 +------ salt/modules/boto_elasticsearch_domain.py | 7 +------ salt/modules/boto_elb.py | 7 +------ salt/modules/boto_elbv2.py | 7 +------ salt/modules/boto_iam.py | 7 +------ salt/modules/boto_iot.py | 8 ++------ salt/modules/boto_kinesis.py | 7 +------ salt/modules/boto_kms.py | 7 +------ salt/modules/boto_lambda.py | 7 +------ salt/modules/boto_rds.py | 8 ++------ salt/modules/boto_route53.py | 7 +------ salt/modules/boto_s3.py | 7 +------ salt/modules/boto_s3_bucket.py | 7 +------ salt/modules/boto_secgroup.py | 7 +------ salt/modules/boto_sns.py | 7 +------ salt/modules/boto_sqs.py | 8 ++------ salt/modules/boto_ssm.py | 7 +------ salt/modules/boto_vpc.py | 7 +------ 34 files changed, 40 insertions(+), 204 deletions(-) diff --git a/salt/modules/boto3_elasticache.py b/salt/modules/boto3_elasticache.py index a2f7bdf1c9c..ff61198deb3 100644 --- a/salt/modules/boto3_elasticache.py +++ b/salt/modules/boto3_elasticache.py @@ -66,12 +66,7 @@ try: except ImportError: HAS_BOTO3 = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto3_elasticsearch.py b/salt/modules/boto3_elasticsearch.py index 4fe77a2095d..1778cccd264 100644 --- a/salt/modules/boto3_elasticsearch.py +++ b/salt/modules/boto3_elasticsearch.py @@ -74,12 +74,7 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto3_route53.py b/salt/modules/boto3_route53.py index e1c2b873a91..23dd1914ecb 100644 --- a/salt/modules/boto3_route53.py +++ b/salt/modules/boto3_route53.py @@ -70,12 +70,7 @@ try: except ImportError: HAS_BOTO3 = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto3_sns.py b/salt/modules/boto3_sns.py index 49d784fa19f..380085e9f97 100644 --- a/salt/modules/boto3_sns.py +++ b/salt/modules/boto3_sns.py @@ -60,12 +60,7 @@ except ImportError: HAS_BOTO = False # pylint: enable=unused-import -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_apigateway.py b/salt/modules/boto_apigateway.py index 9f2463a708e..7682bb8e921 100644 --- a/salt/modules/boto_apigateway.py +++ b/salt/modules/boto_apigateway.py @@ -106,12 +106,8 @@ except ImportError: # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") + def __virtual__(): """ diff --git a/salt/modules/boto_asg.py b/salt/modules/boto_asg.py index 8980c5ecb58..410706fba18 100644 --- a/salt/modules/boto_asg.py +++ b/salt/modules/boto_asg.py @@ -76,12 +76,7 @@ try: except ImportError: HAS_BOTO = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_cfn.py b/salt/modules/boto_cfn.py index c3f2aacfbba..86ef9de7732 100644 --- a/salt/modules/boto_cfn.py +++ b/salt/modules/boto_cfn.py @@ -52,12 +52,7 @@ try: except ImportError: HAS_BOTO = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_cloudfront.py b/salt/modules/boto_cloudfront.py index 4587966a371..64b3fe23eb9 100644 --- a/salt/modules/boto_cloudfront.py +++ b/salt/modules/boto_cloudfront.py @@ -68,12 +68,7 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_cloudtrail.py b/salt/modules/boto_cloudtrail.py index 154d86880b5..ec3815dad28 100644 --- a/salt/modules/boto_cloudtrail.py +++ b/salt/modules/boto_cloudtrail.py @@ -72,12 +72,7 @@ except ImportError: HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_cloudwatch.py b/salt/modules/boto_cloudwatch.py index cdf9720c13e..9676d18d2bb 100644 --- a/salt/modules/boto_cloudwatch.py +++ b/salt/modules/boto_cloudwatch.py @@ -65,12 +65,8 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") + def __virtual__(): """ diff --git a/salt/modules/boto_cloudwatch_event.py b/salt/modules/boto_cloudwatch_event.py index 92091af075e..86b7c6cbbc6 100644 --- a/salt/modules/boto_cloudwatch_event.py +++ b/salt/modules/boto_cloudwatch_event.py @@ -67,12 +67,7 @@ except ImportError as e: HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_cognitoidentity.py b/salt/modules/boto_cognitoidentity.py index 9f2c05d773b..0b4699078e3 100644 --- a/salt/modules/boto_cognitoidentity.py +++ b/salt/modules/boto_cognitoidentity.py @@ -100,12 +100,7 @@ except ImportError: HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_datapipeline.py b/salt/modules/boto_datapipeline.py index 9bc1cfa8381..88959d71b60 100644 --- a/salt/modules/boto_datapipeline.py +++ b/salt/modules/boto_datapipeline.py @@ -23,12 +23,7 @@ try: except ImportError: HAS_BOTO3 = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_dynamodb.py b/salt/modules/boto_dynamodb.py index c696e2b638e..d62d27b2fa9 100644 --- a/salt/modules/boto_dynamodb.py +++ b/salt/modules/boto_dynamodb.py @@ -80,12 +80,7 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_ec2.py b/salt/modules/boto_ec2.py index f2a50003ff3..31e2cb4e043 100644 --- a/salt/modules/boto_ec2.py +++ b/salt/modules/boto_ec2.py @@ -71,12 +71,7 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_efs.py b/salt/modules/boto_efs.py index f091de16ee9..ec99ab8624d 100644 --- a/salt/modules/boto_efs.py +++ b/salt/modules/boto_efs.py @@ -63,12 +63,8 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") + def __virtual__(): """ diff --git a/salt/modules/boto_elasticache.py b/salt/modules/boto_elasticache.py index 155ce8c4f0d..3986a9389a3 100644 --- a/salt/modules/boto_elasticache.py +++ b/salt/modules/boto_elasticache.py @@ -66,12 +66,7 @@ try: except ImportError: HAS_BOTO = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_elasticsearch_domain.py b/salt/modules/boto_elasticsearch_domain.py index 7adf6d38ec8..42535d1a0b5 100644 --- a/salt/modules/boto_elasticsearch_domain.py +++ b/salt/modules/boto_elasticsearch_domain.py @@ -100,12 +100,7 @@ except ImportError: HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_elb.py b/salt/modules/boto_elb.py index 16dccbf9952..3b9e2690029 100644 --- a/salt/modules/boto_elb.py +++ b/salt/modules/boto_elb.py @@ -68,12 +68,7 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_elbv2.py b/salt/modules/boto_elbv2.py index 1ce1d5da9f4..90a888b2233 100644 --- a/salt/modules/boto_elbv2.py +++ b/salt/modules/boto_elbv2.py @@ -59,12 +59,7 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_iam.py b/salt/modules/boto_iam.py index 308b0511356..5ec99cdae7f 100644 --- a/salt/modules/boto_iam.py +++ b/salt/modules/boto_iam.py @@ -62,12 +62,7 @@ except ImportError: log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_iot.py b/salt/modules/boto_iot.py index 5c5dd07401e..a00ba03df15 100644 --- a/salt/modules/boto_iot.py +++ b/salt/modules/boto_iot.py @@ -76,12 +76,8 @@ except ImportError: # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") + def __virtual__(): """ diff --git a/salt/modules/boto_kinesis.py b/salt/modules/boto_kinesis.py index 07b0245c3ad..4db0c09492b 100644 --- a/salt/modules/boto_kinesis.py +++ b/salt/modules/boto_kinesis.py @@ -66,12 +66,7 @@ log = logging.getLogger(__name__) __virtualname__ = "boto_kinesis" -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_kms.py b/salt/modules/boto_kms.py index 02fdb86b59e..6d3eaffc777 100644 --- a/salt/modules/boto_kms.py +++ b/salt/modules/boto_kms.py @@ -56,12 +56,7 @@ try: except (ImportError, AttributeError): HAS_BOTO = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_lambda.py b/salt/modules/boto_lambda.py index 7b1ea276fed..f86a2d7f192 100644 --- a/salt/modules/boto_lambda.py +++ b/salt/modules/boto_lambda.py @@ -108,12 +108,7 @@ except ImportError: HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_rds.py b/salt/modules/boto_rds.py index 0122fe022a5..bbde061b530 100644 --- a/salt/modules/boto_rds.py +++ b/salt/modules/boto_rds.py @@ -127,12 +127,8 @@ def __virtual__(): return salt.utils.versions.check_boto_reqs(boto3_ver="1.3.1") -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") + def __init__(opts): if HAS_BOTO: diff --git a/salt/modules/boto_route53.py b/salt/modules/boto_route53.py index 48d19d0bd32..e3f2278e96f 100644 --- a/salt/modules/boto_route53.py +++ b/salt/modules/boto_route53.py @@ -68,12 +68,7 @@ try: except ImportError: HAS_BOTO = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_s3.py b/salt/modules/boto_s3.py index 1ae7936a57c..016b9908180 100644 --- a/salt/modules/boto_s3.py +++ b/salt/modules/boto_s3.py @@ -70,12 +70,7 @@ except ImportError: HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_s3_bucket.py b/salt/modules/boto_s3_bucket.py index b6382b4872a..bc6d0318a68 100644 --- a/salt/modules/boto_s3_bucket.py +++ b/salt/modules/boto_s3_bucket.py @@ -76,12 +76,7 @@ except ImportError: HAS_BOTO = False # pylint: enable=import-error -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_secgroup.py b/salt/modules/boto_secgroup.py index 635fa2c2541..79e21853b72 100644 --- a/salt/modules/boto_secgroup.py +++ b/salt/modules/boto_secgroup.py @@ -64,12 +64,7 @@ try: except ImportError: HAS_BOTO = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_sns.py b/salt/modules/boto_sns.py index 417eaa66484..fb64cced34c 100644 --- a/salt/modules/boto_sns.py +++ b/salt/modules/boto_sns.py @@ -59,12 +59,7 @@ try: except ImportError: HAS_BOTO = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_sqs.py b/salt/modules/boto_sqs.py index afb127b85ae..bcbd9444b3c 100644 --- a/salt/modules/boto_sqs.py +++ b/salt/modules/boto_sqs.py @@ -68,12 +68,8 @@ except ImportError: HAS_BOTO3 = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") + def __virtual__(): """ diff --git a/salt/modules/boto_ssm.py b/salt/modules/boto_ssm.py index 10c403d2df7..8722ef263cc 100644 --- a/salt/modules/boto_ssm.py +++ b/salt/modules/boto_ssm.py @@ -19,12 +19,7 @@ import salt.utils.versions log = logging.getLogger(__name__) -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__(): diff --git a/salt/modules/boto_vpc.py b/salt/modules/boto_vpc.py index cf712c9950e..63dc1f3120f 100644 --- a/salt/modules/boto_vpc.py +++ b/salt/modules/boto_vpc.py @@ -168,12 +168,7 @@ try: except ImportError: HAS_BOTO3 = False -__deprecated__ = ( - 3009, - "Potassium", - "boto", - "https://github.com/salt-extensions/saltext-boto" -) +__deprecated__ = (3009, "boto", "https://github.com/salt-extensions/saltext-boto") def __virtual__():