From 36f987bfab7b2b99f20cf36d83c33ff10fe00a1d Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Thu, 8 Aug 2024 13:29:30 -0400 Subject: [PATCH] remove 2.3 --- pkg/tests/ossm/deploy_on_infra_test.go | 3 --- pkg/tests/ossm/smcp_secret_test.go | 6 ------ pkg/tests/tasks/security/authorization/ext_auth_test.go | 8 ++------ 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pkg/tests/ossm/deploy_on_infra_test.go b/pkg/tests/ossm/deploy_on_infra_test.go index 36133595..c437ffc1 100644 --- a/pkg/tests/ossm/deploy_on_infra_test.go +++ b/pkg/tests/ossm/deploy_on_infra_test.go @@ -37,9 +37,6 @@ func TestDeployOnInfraNodes(t *testing.T) { test.NewTest(t).Id("T40").Groups(test.Full, test.Disconnected, test.ARM).Run(func(t test.TestHelper) { t.Log("This test verifies that the OSSM operator and Istio components can be configured to run on infrastructure nodes") - if env.GetSMCPVersion().LessThan(version.SMCP_2_3) { - t.Skip("Deploy On Infra node is available in SMCP versions v2.3+") - } if env.IsRosa() { t.Skip("Skipping test on ROSA due to lack of permissions") } diff --git a/pkg/tests/ossm/smcp_secret_test.go b/pkg/tests/ossm/smcp_secret_test.go index 6148eaee..795c732d 100644 --- a/pkg/tests/ossm/smcp_secret_test.go +++ b/pkg/tests/ossm/smcp_secret_test.go @@ -19,10 +19,8 @@ import ( "strings" "testing" - "github.com/maistra/maistra-test-tool/pkg/util/env" "github.com/maistra/maistra-test-tool/pkg/util/shell" . "github.com/maistra/maistra-test-tool/pkg/util/test" - "github.com/maistra/maistra-test-tool/pkg/util/version" ) func TestSMCPSecret(t *testing.T) { @@ -30,10 +28,6 @@ func TestSMCPSecret(t *testing.T) { // Created a subtest because we need to add more test related to Addons in the future. t.NewSubTest("secret_validation").Run(func(t TestHelper) { - if env.GetSMCPVersion().LessThan(version.SMCP_2_4) { - t.Skip("Secret is not valid in SMCP versions v2.3") - } - DeployControlPlane(t) output := shell.Execute(t, fmt.Sprintf(`oc get secret -n %s htpasswd -o json | jq .data.auth | tr -d \" | base64 -d | sed 's/}.*/}REDACTED\n/'`, meshNamespace)) diff --git a/pkg/tests/tasks/security/authorization/ext_auth_test.go b/pkg/tests/tasks/security/authorization/ext_auth_test.go index 9a7c8823..2384673e 100644 --- a/pkg/tests/tasks/security/authorization/ext_auth_test.go +++ b/pkg/tests/tasks/security/authorization/ext_auth_test.go @@ -27,9 +27,7 @@ import ( func TestEnvoyExtAuthzHttpExtensionProvider(t *testing.T) { test.NewTest(t).Id("T37").Groups(test.Full, test.InterOp, test.ARM).Run(func(t test.TestHelper) { - if env.GetSMCPVersion().LessThan(version.SMCP_2_3) { - t.Skip("extensionProviders.envoyExtAuthzHttp was added in v2.3") - } + t.Log("This test validates authorization policies with a JWT Token") ns := "foo" @@ -137,9 +135,7 @@ spec: func TestEnvoyExtAuthzGrpcExtensionProvider(t *testing.T) { test.NewTest(t).Id("T42").Groups(test.Full, test.InterOp, test.ARM).Run(func(t test.TestHelper) { - if env.GetSMCPVersion().LessThan(version.SMCP_2_3) { - t.Skip("extensionProviders.envoyExtAuthzGrpc is not supported in versions below v2.3") - } + t.Log("This test validates authorization policies with a JWT Token") ns := "foo"