Skip to content

chore: consolidate test utils #2191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 25, 2024
Merged

chore: consolidate test utils #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
234db37
chore: consolidate test utils
apeabody Nov 22, 2024
71a18ed
Merge branch 'master' into ap/consolidate
apeabody Nov 22, 2024
5299be6
Merge branch 'master' into ap/consolidate
apeabody Nov 23, 2024
e4ec414
Merge branch 'master' into ap/consolidate
apeabody Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/integration/deploy_service/deploy_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestDeployService(t *testing.T) {
k8sOpts := k8s.KubectlOptions{}
listServices, err := k8s.RunKubectlAndGetOutputE(t, &k8sOpts, "get", "svc", "terraform-example", "-o", "json")
assert.NoError(err)
kubeService := testutils.ParseKubectlJSONResult(t, listServices)
kubeService := utils.ParseKubectlJSONResult(t, listServices)
serviceIp := kubeService.Get("status.loadBalancer.ingress").Array()[0].Get("ip")
serviceUrl := fmt.Sprintf("http://%s:8080", serviceIp)

Expand Down
3 changes: 1 addition & 2 deletions test/integration/sandbox_enabled/sandbox_enabled_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
"github.com/stretchr/testify/assert"
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
gkeutils "github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils"
)

func TestSandboxEnabled(t *testing.T) {
Expand All @@ -33,7 +32,7 @@ func TestSandboxEnabled(t *testing.T) {
bpt.DefineVerify(func(assert *assert.Assertions) {
//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
// bpt.DefaultVerify(assert)
gkeutils.TGKEVerify(t, bpt, assert) // Verify Resources
testutils.TGKEVerify(t, bpt, assert) // Verify Resources

projectId := bpt.GetStringOutput("project_id")
location := bpt.GetStringOutput("location")
Expand Down
3 changes: 1 addition & 2 deletions ...n/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ import (
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
"github.com/stretchr/testify/assert"
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/utils"
)

func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {
projectID := utils.GetTestProjectFromSetup(t, 1)
projectID := testutils.GetTestProjectFromSetup(t, 1)
bpt := tft.NewTFBlueprintTest(t,
tft.WithVars(map[string]interface{}{"project_id": projectID}),
tft.WithRetryableTerraformErrors(testutils.RetryableTransientErrors, 3, 2*time.Minute),
Expand Down
3 changes: 2 additions & 1 deletion test/integration/simple_zonal/simple_zonal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/gcloud"
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/golden"
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/utils"
"github.com/gruntwork-io/terratest/modules/k8s"
"github.com/stretchr/testify/assert"
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
Expand Down Expand Up @@ -77,7 +78,7 @@ func TestSimpleZonal(t *testing.T) {
k8sOpts := k8s.KubectlOptions{}
configNameSpace, err := k8s.RunKubectlAndGetOutputE(t, &k8sOpts, "get", "ns", "config-management-system", "-o", "json")
assert.NoError(err)
configkubeNS := testutils.ParseKubectlJSONResult(t, configNameSpace)
configkubeNS := utils.ParseKubectlJSONResult(t, configNameSpace)
assert.Contains(configkubeNS.Get("metadata.name").String(), "config-management-system", "Namespace is Functional")
})

Expand Down
5 changes: 3 additions & 2 deletions test/integration/simple_zonal_with_asm/simple_zonal_with_asm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (

"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/gcloud"
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/utils"
"github.com/gruntwork-io/terratest/modules/k8s"
"github.com/stretchr/testify/assert"
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
Expand Down Expand Up @@ -49,11 +50,11 @@ func TestSimpleZonalWithASM(t *testing.T) {
k8sOpts := k8s.KubectlOptions{}
listNameSpace, err := k8s.RunKubectlAndGetOutputE(t, &k8sOpts, "get", "ns", "istio-system", "-o", "json")
assert.NoError(err)
kubeNS := testutils.ParseKubectlJSONResult(t, listNameSpace)
kubeNS := utils.ParseKubectlJSONResult(t, listNameSpace)
assert.Contains(kubeNS.Get("metadata.name").String(), "istio-system", "Namespace is Functional")
listConfigMap, err := k8s.RunKubectlAndGetOutputE(t, &k8sOpts, "get", "configmap", "asm-options", "-n", "istio-system", "-o", "json")
assert.NoError(err)
kubeCM := testutils.ParseKubectlJSONResult(t, listConfigMap)
kubeCM := utils.ParseKubectlJSONResult(t, listConfigMap)
assert.Contains(kubeCM.Get("metadata.name").String(), "asm-options", "Configmap is Present")

})
Expand Down
40 changes: 0 additions & 40 deletions test/integration/testutils/json.go
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions test/integration/testutils/retry.go
View file
Open in desktop

This file was deleted.

18 changes: 15 additions & 3 deletions test/integration/utils/utils.go → test/integration/testutils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package utils
package testutils

import (
"slices"
Expand All @@ -23,12 +23,24 @@ import (
"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
tfjson "github.com/hashicorp/terraform-json"
"github.com/stretchr/testify/assert"
"github.com/terraform-google-modules/terraform-google-kubernetes-engine/test/integration/testutils"
)

var (
RetryableTransientErrors = map[string]string{
// Error 409: unable to queue the operation
".*Error 409.*unable to queue the operation": "Unable to queue operation.",

// Error code 409 for concurrent policy changes.
".*Error 409.*There were concurrent policy changes.*": "Concurrent policy changes.",

// API Rate limit exceeded errors can be retried.
".*rateLimitExceeded.*": "Rate limit exceeded.",
}
)

func GetTestProjectFromSetup(t *testing.T, idx int) string {
setup := tft.NewTFBlueprintTest(t,
tft.WithRetryableTerraformErrors(testutils.RetryableTransientErrors, 3, 2*time.Minute),
tft.WithRetryableTerraformErrors(RetryableTransientErrors, 3, 2*time.Minute),
)
projectIDs := setup.GetTFSetupOutputListVal("project_ids")
if len(projectIDs)-1 < idx {
Expand Down