Skip to content

Commit 6e8d935

Browse files
fix: remove print in lambda
1 parent bcfc62f commit 6e8d935

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

modules/platform/forge_runners/forge_trust_validator/forge_roles.tf

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ data "aws_iam_role" "forge" {
22
for_each = toset(var.forge_iam_roles)
33

44
name = replace(each.value, "/^.*//", "")
5+
6+
depends_on = [module.forge_trust_validator_lambda]
57
}
68

79
locals {
@@ -41,7 +43,7 @@ locals {
4143

4244
# concatenated_trust_object[arn] = full updated policy for each role
4345
concatenated_trust_object = {
44-
for arn, trust in local.original_trust :
46+
for arn, trust in local.updated_statements :
4547
arn => {
4648
Version = try(trust.Version, "2012-10-17")
4749
Statement = local.updated_statements[arn]
@@ -53,14 +55,20 @@ locals {
5355
for arn, obj in local.concatenated_trust_object :
5456
arn => jsonencode(obj)
5557
}
58+
59+
original_statements_trust_json = {
60+
for arn, obj in local.original_statements :
61+
arn => jsonencode(obj)
62+
}
5663
}
5764

5865
resource "null_resource" "update_forge_role_trust" {
5966
for_each = data.aws_iam_role.forge
6067

6168
triggers = {
62-
role_name = each.value.name
63-
future_sha = sha1(local.concatenated_trust_json[each.key])
69+
role_name = each.value.name
70+
original_sha = sha1(local.original_statements_trust_json[each.key])
71+
future_sha = sha1(local.concatenated_trust_json[each.key])
6472
}
6573

6674
provisioner "local-exec" {

modules/platform/forge_runners/forge_trust_validator/lambda/forge_trust_validator.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ def validate_forge_role_against_tenants(
157157
]
158158
)
159159

160-
# Optional: verify the tenant creds actually work
161160
tenant_creds = tenant_resp['Credentials']
162161
sts_as_tenant = boto3.client(
163162
'sts',
@@ -239,8 +238,7 @@ def lambda_handler(event, context):
239238
)
240239
all_results.append(res)
241240

242-
LOG.info('Validation complete')
243-
print(json.dumps(all_results, indent=2))
241+
LOG.info('Validation complete: %s', json.dumps(all_results))
244242

245243
return {
246244
'statusCode': 200,

0 commit comments

Comments
 (0)