Skip to content

Commit 42ec0cf

Browse files
committed
chore(CI): add new verify
1 parent 76d779c commit 42ec0cf

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

test/integration/beta_cluster/beta_cluster_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/utils"
2626
"github.com/stretchr/testify/assert"
2727
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
28+
gkeutils "github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils"
2829
)
2930

3031
func TestBetaCluster(t *testing.T) {
@@ -33,8 +34,8 @@ func TestBetaCluster(t *testing.T) {
3334
)
3435

3536
gke.DefineVerify(func(assert *assert.Assertions) {
36-
// Commenting Default Verify due to issue 1478 for location Policy
37-
// gke.DefaultVerify(assert) //disables no changes
37+
gkeutils.TGKEVerify(t, gke, assert)
38+
gke.DefaultVerify(assert)
3839

3940
projectId := gke.GetStringOutput("project_id")
4041
location := gke.GetStringOutput("location")

test/integration/sandbox_enabled/sandbox_enabled_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
2323
"github.com/stretchr/testify/assert"
2424
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
25+
gkeutils "github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils"
2526
)
2627

2728
func TestSandboxEnabled(t *testing.T) {
@@ -30,8 +31,8 @@ func TestSandboxEnabled(t *testing.T) {
3031
)
3132

3233
bpt.DefineVerify(func(assert *assert.Assertions) {
33-
//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
34-
// bpt.DefaultVerify(assert)
34+
gkeutils.TGKEVerify(t, bpt, assert)
35+
bpt.DefaultVerify(assert)
3536

3637
projectId := bpt.GetStringOutput("project_id")
3738
location := bpt.GetStringOutput("location")

test/integration/utils/utils.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@
1515
package utils
1616

1717
import (
18+
"slices"
1819
"testing"
1920
"time"
2021

2122
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
23+
tfjson "github.com/hashicorp/terraform-json"
24+
"github.com/stretchr/testify/assert"
2225
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
2326
)
2427

@@ -32,3 +35,19 @@ func GetTestProjectFromSetup(t *testing.T, idx int) string {
3235
}
3336
return projectIDs[idx]
3437
}
38+
39+
var (
40+
// TGKEVerify Exempt Resources. e.g. google_container_cluster.primary
41+
verifyExemptResources = []string{}
42+
)
43+
44+
func TGKEVerify(t *testing.T, b *tft.TFBlueprintTest, assert *assert.Assertions) {
45+
_, ps := b.PlanAndShow()
46+
for _, r := range ps.ResourceChangesMap {
47+
if slices.Contains(verifyExemptResources, r.Address) {
48+
t.Logf("Exempt plan address: %s", r.Address)
49+
continue
50+
}
51+
assert.Equal(tfjson.Actions{tfjson.ActionNoop}, r.Change.Actions, "plan must be no-op for resource: %s", r.Address)
52+
}
53+
}

0 commit comments

Comments
 (0)