Revert "support e2e test directory being different from resource directory"

This reverts commit f620f31.

Author: AgustinBettati

.github/workflows/e2e-testing.yaml

@@ -24,8 +24,7 @@ jobs:
           filters: |
             cluster:
               - 'cfn-resources/cluster/**'
-              - 'cfn-resources/test/e2e/cluster-basic/**'
-              - 'cfn-resources/test/e2e/cluster-pause/**'
+              - 'cfn-resources/test/e2e/cluster/**'
             flex-cluster:
               - 'cfn-resources/flex-cluster/**'
               - 'cfn-resources/test/e2e/flex-cluster/**'

cfn-resources/test/e2e/cluster-basic/cluster_test.go

@@ -52,7 +52,6 @@ type testCluster struct {
 const (
 	resourceTypeName  = "MongoDB::Atlas::Cluster"
 	resourceDirectory = "cluster"
-	e2eTestDirectory  = "cluster-basic"
 	cfnTemplatePath   = "cluster.json.template"
 )
 
@@ -123,7 +122,7 @@ func setupSuite(t *testing.T) *localTestContext {
 
 func (c *localTestContext) setUp(t *testing.T) {
 	t.Helper()
-	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory, admin.PtrString(e2eTestDirectory))
+	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory)
 	c.cfnClient, c.atlasClient = utility.NewClients(t)
 	_, c.atlasClient20231115014 = utility.NewClients20231115014(t)
 

cfn-resources/test/e2e/cluster-pause/cluster_pause_test.go

@@ -43,7 +43,6 @@ type pauseTestCluster struct {
 const (
 	resourceTypeName     = "MongoDB::Atlas::Cluster"
 	resourceDirectory    = "cluster"
-	e2eTestDirectory     = "cluster-pause"
 	pauseCfnTemplatePath = "cluster_pause.json.template"
 )
 
@@ -92,7 +91,7 @@ func setupPauseSuite(t *testing.T) *pauseTestContext {
 
 func (c *pauseTestContext) setUp(t *testing.T) {
 	t.Helper()
-	c.resourceCtx = utility.InitResourceCtx(pauseStackName, pauseRandSuffix, resourceTypeName, resourceDirectory, admin20231115014.PtrString(e2eTestDirectory))
+	c.resourceCtx = utility.InitResourceCtx(pauseStackName, pauseRandSuffix, resourceTypeName, resourceDirectory)
 	c.cfnClient, _ = utility.NewClients(t)
 	_, c.atlasClient20231115014 = utility.NewClients20231115014(t)
 

cfn-resources/test/e2e/flex-cluster/flexcluster_test.go

@@ -90,7 +90,7 @@ func setupSuite(t *testing.T) *localTestContext {
 
 func (c *localTestContext) setUp(t *testing.T) {
 	t.Helper()
-	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory, nil)
+	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory)
 	c.cfnClient, c.atlasClient = utility.NewClients(t)
 	_, c.atlasClient20231115014 = utility.NewClients20231115014(t)
 	utility.PublishToPrivateRegistry(t, c.resourceCtx)

cfn-resources/test/e2e/project/project_test.go

@@ -93,7 +93,7 @@ func setupSuite(t *testing.T) *localTestContext {
 
 func (c *localTestContext) setUp(t *testing.T) {
 	t.Helper()
-	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory, nil)
+	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory)
 	c.cfnClient, c.atlasClient = utility.NewClients20231115014(t)
 	utility.PublishToPrivateRegistry(t, c.resourceCtx)
 	c.setupPrerequisites(t)

cfn-resources/test/e2e/search-deployment/searchdeployment_test.go

@@ -90,7 +90,7 @@ func setupSuite(t *testing.T) *localTestContext {
 
 func (c *localTestContext) setUp(t *testing.T) {
 	t.Helper()
-	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory, nil)
+	c.resourceCtx = utility.InitResourceCtx(stackName, e2eRandSuffix, resourceTypeName, resourceDirectory)
 	c.cfnClient, c.atlasClient = utility.NewClients20231115014(t)
 	utility.PublishToPrivateRegistry(t, c.resourceCtx)
 	c.setupPrerequisites(t)

cfn-resources/test/e2e/utility/publish_cfn_to_registry.sh

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 # This script performs the following actions:
 #
 # 1) Generates the resource typename to use for the e2e test. Note: we cannot use the default typeName as it will affect other cfn stacks/tests
@@ -25,7 +26,6 @@ set -eu
 set -eux
 
 resource_directory=$RESOURCE_DIRECTORY_NAME
-e2e_test_directory="${E2E_TEST_DIRECTORY_NAME:-$resource_directory}"
 
 echo "Updating .rpdk-config with the E2E resource type $RESOURCE_TYPE_NAME_FOR_E2E"
 rpdk_file="../../../$RESOURCE_DIRECTORY_NAME/.rpdk-config"
@@ -36,6 +36,7 @@ jq --arg type_name "$RESOURCE_TYPE_NAME_FOR_E2E" \
 rm "${rpdk_file}"
 mv "${tmp_rpdk_file}" "${rpdk_file}"
 
+
 echo "Creating a new resource schema"
 schema_file_name="${resource_directory//-/}"
 echo "New schema file name: ${schema_file_name}"
@@ -49,7 +50,8 @@ echo "Releasing the resource to private registry $RESOURCE_TYPE_NAME_FOR_E2E"
 cd ../../../"$resource_directory"
 
 make build && cfn submit --set-default
-cd ../test/e2e/"$e2e_test_directory"
+cd ../test/e2e/"$resource_directory"
+
 
 echo "Reverting .rpdk-config with the original resource typeName $RESOURCE_TYPE_NAME"
 jq --arg type_name "$RESOURCE_TYPE_NAME" \
@@ -58,6 +60,7 @@ jq --arg type_name "$RESOURCE_TYPE_NAME" \
 rm "${rpdk_file}"
 mv "${tmp_rpdk_file}" "${rpdk_file}"
 
+
 echo "Deleting resource JSON schema used for the E2E test"
 rm "${tmp_resource_schema_file}"
 

cfn-resources/test/e2e/utility/resource_context.go

@@ -16,18 +16,16 @@ package utility
 
 type ResourceContext struct {
 	ResourceDirectory      string
-	E2eTestDirectory       *string
 	ResourceTypeName       string
 	ResourceTypeNameForE2e string
 	E2eRandSuffix          string
 	StackName              string
 }
 
-func InitResourceCtx(stackName, randSuffix, resourceTypeName, resourceDirectory string, e2eTestDirectory *string) ResourceContext {
+func InitResourceCtx(stackName, randSuffix, resourceTypeName, resourceDirectory string) ResourceContext {
 	return ResourceContext{
 		StackName:              stackName,
 		ResourceDirectory:      resourceDirectory,
-		E2eTestDirectory:       e2eTestDirectory,
 		ResourceTypeName:       resourceTypeName,
 		E2eRandSuffix:          randSuffix,
 		ResourceTypeNameForE2e: resourceTypeName + randSuffix,

cfn-resources/test/e2e/utility/util.go

@@ -65,9 +65,6 @@ func PublishToPrivateRegistry(t *testing.T, rctx ResourceContext) {
 	t.Setenv("RESOURCE_TYPE_NAME_FOR_E2E", rctx.ResourceTypeNameForE2e)
 	t.Setenv("E2E_RAND_SUFFIX", rctx.E2eRandSuffix)
 	t.Setenv("RESOURCE_DIRECTORY_NAME", rctx.ResourceDirectory)
-	if rctx.E2eTestDirectory != nil {
-		t.Setenv("E2E_TEST_DIRECTORY_NAME", *rctx.E2eTestDirectory)
-	}
 	t.Cleanup(func() {
 		RunCleanupScript(t, rctx)
 	})