Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix autoscaling policy ARN (#6209)

Browse Source
This commit is contained in:
Viren Nadkarni 2023-04-13 21:47:52 +05:30 committed by GitHub
parent 4ef076341d
commit 7a74df0426
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moto/applicationautoscaling/models.py
View File

@ -180,6 +180,7 @@ class ApplicationAutoscalingBackend(BaseBackend):
if policy_key in self.policies: if policy_key in self.policies:
old_policy = self.policies[policy_key] old_policy = self.policies[policy_key]
policy = FakeApplicationAutoscalingPolicy( policy = FakeApplicationAutoscalingPolicy(
account_id=self.account_id,
region_name=self.region_name, region_name=self.region_name,
policy_name=policy_name, policy_name=policy_name,
service_namespace=service_namespace, service_namespace=service_namespace,
@ -190,6 +191,7 @@ class ApplicationAutoscalingBackend(BaseBackend):
) )
else: else:
policy = FakeApplicationAutoscalingPolicy( policy = FakeApplicationAutoscalingPolicy(
account_id=self.account_id,
region_name=self.region_name, region_name=self.region_name,
policy_name=policy_name, policy_name=policy_name,
service_namespace=service_namespace, service_namespace=service_namespace,
@ -435,6 +437,7 @@ class FakeScalableTarget(BaseModel):
class FakeApplicationAutoscalingPolicy(BaseModel): class FakeApplicationAutoscalingPolicy(BaseModel):
def __init__( def __init__(
self, self,
account_id: str,
region_name: str, region_name: str,
policy_name: str, policy_name: str,
service_namespace: str, service_namespace: str,
@ -464,7 +467,7 @@ class FakeApplicationAutoscalingPolicy(BaseModel):
self.policy_name = policy_name self.policy_name = policy_name
self.policy_type = policy_type self.policy_type = policy_type
self._guid = mock_random.uuid4() self._guid = mock_random.uuid4()
self.policy_arn = f"arn:aws:autoscaling:{region_name}:scalingPolicy:{self._guid}:resource/{self.service_namespace}/{self.resource_id}:policyName/{self.policy_name}" self.policy_arn = f"arn:aws:autoscaling:{region_name}:{account_id}:scalingPolicy:{self._guid}:resource/{self.service_namespace}/{self.resource_id}:policyName/{self.policy_name}"
self.creation_time = time.time() self.creation_time = time.time()
@staticmethod @staticmethod

4
tests/test_applicationautoscaling/test_applicationautoscaling.py
View File

@ -379,7 +379,7 @@ def test_put_scaling_policy(policy_type, policy_body_kwargs):
) )
response["ResponseMetadata"]["HTTPStatusCode"].should.equal(200) response["ResponseMetadata"]["HTTPStatusCode"].should.equal(200)
response["PolicyARN"].should.match( response["PolicyARN"].should.match(
rf"arn:aws:autoscaling:.*1:scalingPolicy:.*:resource/{namespace}/{resource_id}:policyName/{policy_name}" rf"arn:aws:autoscaling:.*1:{ACCOUNT_ID}:scalingPolicy:.*:resource/{namespace}/{resource_id}:policyName/{policy_name}"
) )
@ -432,7 +432,7 @@ def test_describe_scaling_policies():
policy["PolicyType"].should.equal(policy_type) policy["PolicyType"].should.equal(policy_type)
policy["TargetTrackingScalingPolicyConfiguration"].should.equal(policy_body) policy["TargetTrackingScalingPolicyConfiguration"].should.equal(policy_body)
policy["PolicyARN"].should.match( policy["PolicyARN"].should.match(
rf"arn:aws:autoscaling:.*1:scalingPolicy:.*:resource/{namespace}/{resource_id}:policyName/{policy_name}" rf"arn:aws:autoscaling:.*1:{ACCOUNT_ID}:scalingPolicy:.*:resource/{namespace}/{resource_id}:policyName/{policy_name}"
) )
policy.should.have.key("CreationTime").which.should.be.a("datetime.datetime") policy.should.have.key("CreationTime").which.should.be.a("datetime.datetime")