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

remove hardcoded permissions on cryptoKeyEncrypterDecrypter #7293

Merged
merged 7 commits into from
Feb 15, 2023
Merged

remove hardcoded permissions on cryptoKeyEncrypterDecrypter #7293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9990ac9
remove hardcoded permissions on cryptoKeyEncrypterDecrypter
ScottSuarez Feb 14, 2023
ec51b38
Removed hard coded permissions for cryptoKeyEncrypterDecrypter
ScottSuarez Feb 14, 2023
98e1f9a
another one
ScottSuarez Feb 14, 2023
6606d94
remove subdependency
ScottSuarez Feb 14, 2023
4a13dfe
remove unneeded line from configuration
ScottSuarez Feb 14, 2023
0bc618e
remove dependency
ScottSuarez Feb 14, 2023
c11a553
remove parameter from function name
ScottSuarez Feb 14, 2023
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
30 changes: 1 addition & 29 deletions mmv1/third_party/terraform/tests/resource_composer_environment_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1349,41 +1349,13 @@ data "google_project" "project" {
project_id = "%s"
}


resource "google_project_iam_member" "kms-project-binding1" {
project = data.google_project.project.project_id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@cloudcomposer-accounts.iam.gserviceaccount.com"
}
resource "google_project_iam_member" "kms-project-binding2" {
project = data.google_project.project.project_id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
}
resource "google_project_iam_member" "kms-project-binding3" {
project = data.google_project.project.project_id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@container-engine-robot.iam.gserviceaccount.com"
}
resource "google_project_iam_member" "kms-project-binding4" {
project = data.google_project.project.project_id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-artifactregistry.iam.gserviceaccount.com"
}
resource "google_project_iam_member" "kms-project-binding5" {
project = data.google_project.project.project_id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
}
resource "google_kms_crypto_key_iam_member" "iam" {
crypto_key_id = "%s"
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@gs-project-accounts.iam.gserviceaccount.com"
}
resource "google_composer_environment" "test" {
depends_on = [google_project_iam_member.kms-project-binding1, google_project_iam_member.kms-project-binding2,
google_project_iam_member.kms-project-binding3, google_project_iam_member.kms-project-binding4,
google_project_iam_member.kms-project-binding5, google_kms_crypto_key_iam_member.iam]
depends_on = [google_kms_crypto_key_iam_member.iam]
name = "%s"
region = "us-central1"
config {
Expand Down
18 changes: 3 additions & 15 deletions mmv1/third_party/terraform/tests/resource_pubsub_topic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ func TestAccPubsubTopic_cmek(t *testing.T) {
t.Parallel()

kms := BootstrapKMSKey(t)
pid := getTestProjectFromEnv()
topicName := fmt.Sprintf("tf-test-%s", randString(t, 10))

vcrTest(t, resource.TestCase{
Expand All @@ -52,7 +51,7 @@ func TestAccPubsubTopic_cmek(t *testing.T) {
CheckDestroy: testAccCheckPubsubTopicDestroyProducer(t),
Steps: []resource.TestStep{
{
Config: testAccPubsubTopic_cmek(pid, topicName, kms.CryptoKey.Name),
Config: testAccPubsubTopic_cmek(topicName, kms.CryptoKey.Name),
},
{
ResourceName: "google_pubsub_topic.topic",
Expand Down Expand Up @@ -91,22 +90,11 @@ resource "google_pubsub_topic" "foo" {
`, topic, key, value, region)
}

func testAccPubsubTopic_cmek(pid, topicName, kmsKey string) string {
func testAccPubsubTopic_cmek(topicName, kmsKey string) string {
return fmt.Sprintf(`
data "google_project" "project" {
project_id = "%s"
}

resource "google_project_iam_member" "kms-project-binding" {
project = data.google_project.project.project_id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
}

resource "google_pubsub_topic" "topic" {
name = "%s"
project = google_project_iam_member.kms-project-binding.project
kms_key_name = "%s"
}
`, pid, topicName, kmsKey)
`, topicName, kmsKey)
}