From 329c08f5a0410fc89af018407151e521896248d1 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Tue, 11 Jun 2024 12:33:04 -0700 Subject: [PATCH] chore(CI): add CURRENT_STATE_DECRYPTED (#1974) --- .../disable_client_cert/testdata/TestDisableClientCert.json | 1 + .../testdata/TestPrivateZonalWithNetworking.json | 1 + test/integration/safer_cluster/testdata/TestSaferCluster.json | 1 + .../sandbox_enabled/testdata/TestSandboxEnabled.json | 1 + .../testdata/TestSimpleAutopilotPrivate.json | 1 + .../testdata/TestSimpleAutopilotPublic.json | 1 + .../simple_regional/testdata/TestSimpleRegional.json | 1 + .../testdata/TestSimpleRegionalPrivate.json | 1 + .../simple_regional_with_gateway_api/controls/gcloud.rb | 2 +- test/integration/simple_regional_with_ipv6/controls/gcloud.rb | 2 +- .../testdata/TestSimpleRegionalWithKubeConfig.json | 1 + .../testdata/TestSimpleRegionalWithNetworking.json | 1 + .../testdata/TestSimpleWindowsNodePool.json | 1 + test/integration/simple_zonal/testdata/TestSimpleZonal.json | 1 + .../simple_zonal_private/testdata/TestSimpleZonalPrivate.json | 1 + 15 files changed, 15 insertions(+), 2 deletions(-) diff --git a/test/integration/disable_client_cert/testdata/TestDisableClientCert.json b/test/integration/disable_client_cert/testdata/TestDisableClientCert.json index d10f0d2945..235c0a8b8b 100755 --- a/test/integration/disable_client_cert/testdata/TestDisableClientCert.json +++ b/test/integration/disable_client_cert/testdata/TestDisableClientCert.json @@ -27,6 +27,7 @@ "currentNodeCount": 3, "currentNodeVersion": "1.24.7-gke.900", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json index 51f49e2285..c6bdd3f7cb 100755 --- a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json +++ b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json @@ -27,6 +27,7 @@ "currentNodeCount": 1, "currentNodeVersion": "1.24.7-gke.900", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/safer_cluster/testdata/TestSaferCluster.json b/test/integration/safer_cluster/testdata/TestSaferCluster.json index cb1bdb3674..e2836b34c7 100755 --- a/test/integration/safer_cluster/testdata/TestSaferCluster.json +++ b/test/integration/safer_cluster/testdata/TestSaferCluster.json @@ -29,6 +29,7 @@ "currentNodeCount": 3, "currentNodeVersion": "1.23.14-gke.401", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json b/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json index cb2ffe680c..6ba2bb70cb 100755 --- a/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json +++ b/test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json @@ -25,6 +25,7 @@ "currentNodeCount": 3, "currentNodeVersion": "1.24.7-gke.900", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json b/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json index 997ba9b5e5..62103f7ee9 100644 --- a/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json +++ b/test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json @@ -70,6 +70,7 @@ "currentNodeCount": 2, "currentNodeVersion": "1.24.7-gke.900", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json b/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json index 0e92769fe6..d014c325dc 100644 --- a/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json +++ b/test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json @@ -70,6 +70,7 @@ "currentNodeCount": 2, "currentNodeVersion": "1.24.7-gke.900", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_regional/testdata/TestSimpleRegional.json b/test/integration/simple_regional/testdata/TestSimpleRegional.json index 85c8e55db7..16d6297fdc 100644 --- a/test/integration/simple_regional/testdata/TestSimpleRegional.json +++ b/test/integration/simple_regional/testdata/TestSimpleRegional.json @@ -38,6 +38,7 @@ "currentNodeCount": 3, "currentNodeVersion": "1.27.3-gke.100", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json b/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json index 295ae578f7..4c9fbcd32b 100644 --- a/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json +++ b/test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json @@ -25,6 +25,7 @@ "currentNodeCount": 3, "currentNodeVersion": "1.25.4-gke.2100", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_regional_with_gateway_api/controls/gcloud.rb b/test/integration/simple_regional_with_gateway_api/controls/gcloud.rb index 14722175bd..631eae3d2a 100644 --- a/test/integration/simple_regional_with_gateway_api/controls/gcloud.rb +++ b/test/integration/simple_regional_with_gateway_api/controls/gcloud.rb @@ -66,7 +66,7 @@ end it "has the expected databaseEncryption config" do - expect(data['databaseEncryption']).to eq({ + expect(data['databaseEncryption']).to include({ "state" => 'DECRYPTED', }) end diff --git a/test/integration/simple_regional_with_ipv6/controls/gcloud.rb b/test/integration/simple_regional_with_ipv6/controls/gcloud.rb index 6b3e65e3ce..0080ed5c14 100644 --- a/test/integration/simple_regional_with_ipv6/controls/gcloud.rb +++ b/test/integration/simple_regional_with_ipv6/controls/gcloud.rb @@ -64,7 +64,7 @@ end it "has the expected databaseEncryption config" do - expect(data['databaseEncryption']).to eq({ + expect(data['databaseEncryption']).to include({ "state" => 'DECRYPTED', }) end diff --git a/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json b/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json index 33e3de8c05..216876af9f 100644 --- a/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json +++ b/test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json @@ -25,6 +25,7 @@ "currentNodeCount": 3, "currentNodeVersion": "1.25.5-gke.1500", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json b/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json index 5c2b2478f4..82160d884e 100644 --- a/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json +++ b/test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json @@ -25,6 +25,7 @@ "currentNodeCount": 3, "currentNodeVersion": "1.25.5-gke.1500", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json b/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json index d5569ab489..b1cb9ae910 100644 --- a/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json +++ b/test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json @@ -35,6 +35,7 @@ "currentNodeCount": 2, "currentNodeVersion": "1.24.7-gke.900", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_zonal/testdata/TestSimpleZonal.json b/test/integration/simple_zonal/testdata/TestSimpleZonal.json index 5d1987285b..79b4b79a8b 100644 --- a/test/integration/simple_zonal/testdata/TestSimpleZonal.json +++ b/test/integration/simple_zonal/testdata/TestSimpleZonal.json @@ -26,6 +26,7 @@ "currentNodeCount": 4, "currentNodeVersion": "1.25.6-gke.1000", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": { diff --git a/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json b/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json index 0172ee91fd..c0f5e13070 100644 --- a/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json +++ b/test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json @@ -25,6 +25,7 @@ "currentNodeCount": 1, "currentNodeVersion": "1.25.5-gke.1500", "databaseEncryption": { + "currentState": "CURRENT_STATE_DECRYPTED", "state": "DECRYPTED" }, "defaultMaxPodsConstraint": {