Merge branch 'master' into enable-cmek-for-state-bucket

terraform-google-modules · Dec 11, 2023 · bf19ebe · bf19ebe
2 parents 8051090 + 325785c
commit bf19ebe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 10 deletions.
diff --git a/0-bootstrap/README-Jenkins.md b/0-bootstrap/README-Jenkins.md
@@ -69,14 +69,7 @@ You arrived to these instructions because you are using the `jenkins_bootstrap`
 
    - You will see an output similar to this:
 
-   ```text
-   -----BEGIN RSA PRIVATE KEY-----
-         copy your private key
-           from BEGIN to END
-      And configure a new
-     Jenkins Agent in the Web UI
-   -----END RSA PRIVATE KEY-----
-   ```
+      ![RSA private key example](./files/private_key_example.png)
 
 1. Configure a new SSH Jenkins Agent in the Jenkins Controller’s Web UI. You need the following information:
    - [SSH Agent Jenkins plugin](https://plugins.jenkins.io/ssh-agent/) installed in your Controller

diff --git a/0-bootstrap/files/private_key_example.png b/0-bootstrap/files/private_key_example.png
diff --git a/1-org/envs/shared/org_policy.tf b/1-org/envs/shared/org_policy.tf
@@ -27,7 +27,6 @@ locals {
   boolean_type_organization_policies = toset([
     "compute.disableNestedVirtualization",
     "compute.disableSerialPortAccess",
-    "compute.disableGuestAttributesAccess",
     "compute.skipDefaultNetworkCreation",
     "compute.restrictXpnProjectLienRemoval",
     "compute.disableVpcExternalIpv6",

diff --git a/test/integration/org/org_test.go b/test/integration/org/org_test.go
@@ -148,7 +148,6 @@ func TestOrg(t *testing.T) {
 			for _, booleanConstraint := range []string{
 				"constraints/compute.disableNestedVirtualization",
 				"constraints/compute.disableSerialPortAccess",
-				"constraints/compute.disableGuestAttributesAccess",
 				"constraints/compute.skipDefaultNetworkCreation",
 				"constraints/compute.restrictXpnProjectLienRemoval",
 				"constraints/sql.restrictPublicIp",