Merge branch 'master' into gke-autopilot-network-tags

terraform-google-modules · Jun 11, 2024 · a4a56ff · a4a56ff
2 parents 57a2588 + 329c08f
commit a4a56ff
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...ntegration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json b/...ntegration/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/...ntegration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json b/...ntegration/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
@@ -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
@@ -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
@@ -25,6 +25,7 @@
   "currentNodeCount": 1,
   "currentNodeVersion": "1.25.5-gke.1500",
   "databaseEncryption": {
+    "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"
   },
   "defaultMaxPodsConstraint": {