From 9814756074de9528de41d77ed66657c75a80ffff Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Fri, 15 Nov 2024 11:48:37 +0100 Subject: [PATCH] Make project iam viewer name consistent with GCP naming (#2694) * Make project iam viewer name consistent with GCP naming * Fix tests --- .../0-bootstrap/data/custom-roles/project_iam_viewer.yaml | 4 ++-- tests/fast/stages/s0_bootstrap/simple.yaml | 4 ++-- tests/fast/stages/s1_resman/simple.tfvars | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fast/stages/0-bootstrap/data/custom-roles/project_iam_viewer.yaml b/fast/stages/0-bootstrap/data/custom-roles/project_iam_viewer.yaml index a1966e492..2f268aa11 100644 --- a/fast/stages/0-bootstrap/data/custom-roles/project_iam_viewer.yaml +++ b/fast/stages/0-bootstrap/data/custom-roles/project_iam_viewer.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ # yaml-language-server: $schema=../../schemas/custom-role.schema.json # this is used by the plan-only admin SA -name: projectIAMViewer +name: projectIamViewer includedPermissions: - iam.policybindings.get - iam.policybindings.list diff --git a/tests/fast/stages/s0_bootstrap/simple.yaml b/tests/fast/stages/s0_bootstrap/simple.yaml index c472d83e4..259d2e38b 100644 --- a/tests/fast/stages/s0_bootstrap/simple.yaml +++ b/tests/fast/stages/s0_bootstrap/simple.yaml @@ -56,7 +56,7 @@ outputs: ngfw_enterprise_viewer: organizations/123456789012/roles/ngfwEnterpriseViewer organization_admin_viewer: organizations/123456789012/roles/organizationAdminViewer organization_iam_admin: organizations/123456789012/roles/organizationIamAdmin - project_iam_viewer: organizations/123456789012/roles/projectIAMViewer + project_iam_viewer: organizations/123456789012/roles/projectIamViewer service_project_network_admin: organizations/123456789012/roles/serviceProjectNetworkAdmin storage_viewer: organizations/123456789012/roles/storageViewer tag_viewer: organizations/123456789012/roles/tagViewer @@ -74,4 +74,4 @@ outputs: pool: null workload_identity_pool: pool: null - providers: {} \ No newline at end of file + providers: {} diff --git a/tests/fast/stages/s1_resman/simple.tfvars b/tests/fast/stages/s1_resman/simple.tfvars index f6463ade0..0f73afb84 100644 --- a/tests/fast/stages/s1_resman/simple.tfvars +++ b/tests/fast/stages/s1_resman/simple.tfvars @@ -61,7 +61,7 @@ custom_roles = { ngfw_enterprise_admin = "organizations/123456789012/roles/ngfwEnterpriseAdmin" ngfw_enterprise_viewer = "organizations/123456789012/roles/ngfwEnterpriseViewer" organization_admin_viewer = "organizations/123456789012/roles/organizationAdminViewer" - project_iam_viewer = "organizations/123456789012/roles/projectIAMViewer" + project_iam_viewer = "organizations/123456789012/roles/projectIamViewer" service_project_network_admin = "organizations/123456789012/roles/xpnServiceAdmin" storage_viewer = "organizations/123456789012/roles/storageViewer" }