Skip to content

Commit

Permalink
Add missing return, fix nits
Browse files Browse the repository at this point in the history
  • Loading branch information
trodge committed Mar 3, 2023
1 parent 969bda0 commit b75f4ec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,8 @@ func grantEncrypterDecrypterRoleToServiceAgents(t *testing.T) {
"gcp-sa-artifactregistry",
"gcp-sa-pubsub",
}
if policyChanged := BootstrapAllPSARole(t, serviceAgents, "roles/cloudkms.cryptoKeyEncrypterDecrypter"); policyChanged {
role := "roles/cloudkms.cryptoKeyEncrypterDecrypter"
if policyChanged := BootstrapAllPSARole(t, serviceAgents, role); policyChanged {
// Fail this test run because the policy needs time to reconcile.
t.Fatalf("Granted crypto key encrypter/decrypter role for service agents %v in test project's IAM policy. Retry the test in a few minutes.", serviceAgents)
}
Expand Down
2 changes: 2 additions & 0 deletions mmv1/third_party/terraform/utils/iam.go.erb
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,8 @@ func missingBindingsMap(aMap, bMap map[iamBindingKey]map[string]struct{}) map[ia
results[key] = bMembers
}
}

return results
}

// Returns the bindings that are in one set of bindings and not the other.
Expand Down

0 comments on commit b75f4ec

Please sign in to comment.