Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(logging): Some log lines were incorrect #17

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(logging): Some log lines were incorrect #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
698599f
fix(consumer): Deleting the stack was not reverting `recordingMode` t…
priiiiit Sep 21, 2024
fe2d4cd
fix(producer): UPDATE and DELETE logs were copied from CREATE and nev…
priiiiit Sep 21, 2024
ea13459
fix(consumer): Some log lines were not logging the variables given to…
priiiiit Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ct_configrecorder_override_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def assume_role(account_id, role='AWSControlTowerExecution'):

# Describe configuration recorder
configrecorder = configservice.describe_configuration_recorders()
logging.info(f'Existing Configuration Recorder :', configrecorder)
logging.info(f'Existing Configuration Recorder: {configrecorder}')

# ControlTower created configuration recorder with name "aws-controltower-BaselineConfigRecorder" and we will update just that
try:
Expand All @@ -107,9 +107,12 @@ def assume_role(account_id, role='AWSControlTowerExecution'):
'recordingGroup': {
'allSupported': True,
'includeGlobalResourceTypes': False
}
},
'recordingMode': {'recordingFrequency': 'CONTINUOUS'},
})
logging.info(f'Response for put_configuration_recorder :{response} ')
logging.warn(
f"Configuration Recorder reset to default. Response: {json.dumps(response, default=str)}"
)

else:
config_recorder = {
Expand Down Expand Up @@ -151,7 +154,7 @@ def assume_role(account_id, role='AWSControlTowerExecution'):
logging.info(f'Post Change Configuration recorder : {configrecorder}')

except botocore.exceptions.ClientError as exe:
logging.error('Unable to Update Config Recorder for Account and Region : ', account_id, aws_region)
logging.error(f'Unable to Update Config Recorder for Account {account_id} and Region {aws_region}')
configrecorder = configservice.describe_configuration_recorders()
logging.info(f'Exception : {configrecorder}')
raise exe
Expand Down
6 changes: 3 additions & 3 deletions ct_configrecorder_override_producer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def lambda_handler(event, context):
elif ('LogicalResourceId' in event) and (event['RequestType'] == 'Update'):
logging.info('Update Update')
logging.info(
'overriding config recorder for ALL accounts because of first run after function deployment from CloudFormation')
'overriding config recorder for ALL accounts because of CloudFormation stack update')
override_config_recorder(excluded_accounts, sqs_url, '', 'Update')
response = {}
update_excluded_accounts(excluded_accounts,sqs_url)
Expand All @@ -83,8 +83,8 @@ def lambda_handler(event, context):
cfnresponse.send(event, context, cfnresponse.SUCCESS, response, "CustomResourcePhysicalID")
elif ('LogicalResourceId' in event) and (event['RequestType'] == 'Delete'):
logging.info('DELETE DELETE')
logging.info(
'overriding config recorder for ALL accounts because of first run after function deployment from CloudFormation')
logging.warn(
'Initiating config recorder cleanup for ALL accounts due to CloudFormation stack deletion')
override_config_recorder(excluded_accounts, sqs_url, '', 'Delete')
response = {}
## Send signal back to CloudFormation after the final run
Expand Down