19
19
import boto3
20
20
import cfnresponse
21
21
import sra_bedrock
22
- import sra_cloudwatch
23
- import sra_config
24
22
import sra_dynamodb
25
- import sra_iam
26
23
import sra_kms
27
24
import sra_lambda
28
- import sra_repo
29
25
import sra_s3
30
- import sra_sns
31
26
import sra_sqs
32
27
import sra_ssm_params
33
28
import sra_sts
@@ -162,22 +157,14 @@ def load_kms_key_policies() -> dict:
162
157
163
158
# Instantiate sra class objects
164
159
ssm_params = sra_ssm_params .SRASSMParams ()
165
- iam = sra_iam .SRAIAM ()
166
160
dynamodb = sra_dynamodb .SRADynamoDB ()
167
161
sts = sra_sts .SRASTS ()
168
- repo = sra_repo .SRARepo ()
169
162
s3 = sra_s3 .SRAS3 ()
170
163
lambdas = sra_lambda .SRALambda ()
171
- sns = sra_sns .SRASNS ()
172
- config = sra_config .SRAConfig ()
173
- cloudwatch = sra_cloudwatch .SRACloudWatch ()
174
164
kms = sra_kms .SRAKMS ()
175
165
bedrock = sra_bedrock .SRABedrock ()
176
166
sqs = sra_sqs .SRASQS ()
177
167
178
- # propagate solution name to class objects
179
- cloudwatch .SOLUTION_NAME = SOLUTION_NAME
180
-
181
168
182
169
def get_resource_parameters (event : dict ) -> None :
183
170
"""Get resource parameters from event.
@@ -489,9 +476,7 @@ def create_kms_key(acct: str, region: str) -> None:
489
476
# Deploy KMS keys
490
477
491
478
kms .KMS_CLIENT = sts .assume_role (acct , sts .CONFIGURATION_ROLE , "kms" , region )
492
- search_bedrock_guardrails_kms_key , bedrock_guardrails_key_alias , bedrock_guardrails_key_id , bedrock_guardrails_key_arn = kms .check_alias_exists (
493
- kms .KMS_CLIENT , f"alias/{ GUARDRAILS_KEY_ALIAS } "
494
- )
479
+ search_bedrock_guardrails_kms_key , _ , bedrock_guardrails_key_id , _ = kms .check_alias_exists (kms .KMS_CLIENT , f"alias/{ GUARDRAILS_KEY_ALIAS } " )
495
480
if search_bedrock_guardrails_kms_key is False :
496
481
LOGGER .info (f"alias/{ GUARDRAILS_KEY_ALIAS } not found." )
497
482
if DRY_RUN is False :
@@ -516,6 +501,8 @@ def create_kms_key(acct: str, region: str) -> None:
516
501
kms .KMS_CLIENT , json .dumps (kms_key_policy ), SOLUTION_NAME , "Key for Bedrock Guardrails Encryption"
517
502
)
518
503
LOGGER .info (f"Created Bedrock Guardrails KMS key: { bedrock_guardrails_key_id } " )
504
+ kms .enable_key_rotation (kms .KMS_CLIENT , bedrock_guardrails_key_id )
505
+ LOGGER .info (f"Enabled automatic rotation of: { bedrock_guardrails_key_id } " )
519
506
LIVE_RUN_DATA [f"KMSKeyCreate-{ acct } -{ region } " ] = "Created SRA Bedrock Guardrails KMS key"
520
507
CFN_RESPONSE_DATA ["deployment_info" ]["action_count" ] += 1
521
508
CFN_RESPONSE_DATA ["deployment_info" ]["resources_deployed" ] += 1
@@ -587,13 +574,13 @@ def check_sqs_queue() -> str:
587
574
"""Add sqs queue record if DLQ exists.
588
575
589
576
Returns:
590
- str: sns topic arn
577
+ str: sqs topic arn
591
578
"""
592
579
global DRY_RUN_DATA
593
580
global LIVE_RUN_DATA
594
581
global CFN_RESPONSE_DATA
595
582
596
- sns . SNS_CLIENT = sts .assume_role (sts .MANAGEMENT_ACCOUNT , sts .CONFIGURATION_ROLE , "sns " , sts .HOME_REGION )
583
+ sqs . SQS_CLIENT = sts .assume_role (sts .MANAGEMENT_ACCOUNT , sts .CONFIGURATION_ROLE , "sqs " , sts .HOME_REGION )
597
584
queue_search = sqs .find_sqs_queue (f"{ SOLUTION_NAME } -DLQ" )
598
585
if queue_search is None :
599
586
LOGGER .info (f"{ SOLUTION_NAME } -DLQ doesn't exist" )
0 commit comments