ECO-5623 | fixing acceptance tests

Author: Uddipaan Hazarika

internal/provider/resource_appdata_dsource_test.go

@@ -17,11 +17,11 @@ func TestDsource_create_positive(t *testing.T) {
 	name := os.Getenv("DSOURCE_NAME")
 	environmentUser := os.Getenv("DSOURCE_ENV_USER")
 	stagingEnvironment := os.Getenv("DSOURCE_STAGE_ENV")
-	postgresPort := os.Getenv("DSOURCE_POSTGRES_PORT")
+	parameters := os.Getenv("DSOURCE_PARAMETERS")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
-			testDsourcePreCheck(t, sourceId, groupId, name, environmentUser, stagingEnvironment, postgresPort)
+			testDsourcePreCheck(t, sourceId, groupId, name, environmentUser, stagingEnvironment, parameters)
 		},
 		Providers:    testAccProviders,
 		CheckDestroy: testDsourceDestroy,
@@ -31,13 +31,13 @@ func TestDsource_create_positive(t *testing.T) {
 				ExpectError: regexp.MustCompile(`.*`),
 			},
 			{
-				Config: testDsourceBasic(sourceId, groupId, name, environmentUser, stagingEnvironment, postgresPort),
+				Config: testDsourceBasic(sourceId, groupId, name, environmentUser, stagingEnvironment, parameters),
 				Check: resource.ComposeTestCheckFunc(
 					testDsourceExists("delphix_appdata_dsource.new_data_dsource", sourceId),
 					resource.TestCheckResourceAttr("delphix_appdata_dsource.new_data_dsource", "source_id", sourceId)),
 			},
 			{
-				Config: testDsourceUpdate(sourceId, groupId, "update_same_dsource", environmentUser, stagingEnvironment, postgresPort),
+				Config: testDsourceUpdate(sourceId, groupId, "update_same_dsource", environmentUser, stagingEnvironment, parameters),
 				Check:  resource.ComposeAggregateTestCheckFunc(
 				// irrelevant
 				),
@@ -47,7 +47,7 @@ func TestDsource_create_positive(t *testing.T) {
 	})
 }
 
-func testDsourcePreCheck(t *testing.T, sourceId string, groupId string, name string, environmentUser string, stagingEnvironment string, postgresPort string) {
+func testDsourcePreCheck(t *testing.T, sourceId string, groupId string, name string, environmentUser string, stagingEnvironment string, parameters string) {
 	testAccPreCheck(t)
 	if sourceId == "" {
 		t.Fatal("DSOURCE_SOURCE_ID must be set for env acceptance tests")
@@ -64,12 +64,12 @@ func testDsourcePreCheck(t *testing.T, sourceId string, groupId string, name str
 	if stagingEnvironment == "" {
 		t.Fatal("DSOURCE_STAGE_ENV must be set for env acceptance tests")
 	}
-	if postgresPort == "" {
-		t.Fatal("DSOURCE_POSTGRES_PORT must be set for env acceptance tests")
+	if parameters == "" {
+		t.Fatal("DSOURCE_PARAMETERS must be set for env acceptance tests")
 	}
 }
 
-func testDsourceBasic(sourceId string, groupId string, name string, environmentUser string, stagingEnvironment string, postgresPort string) string {
+func testDsourceBasic(sourceId string, groupId string, name string, environmentUser string, stagingEnvironment string, parameters string) string {
 	return fmt.Sprintf(`
 resource "delphix_appdata_dsource" "new_data_dsource" {
   source_value                  = "%s"
@@ -86,10 +86,10 @@ resource "delphix_appdata_dsource" "new_data_dsource" {
     resync = true
   })
 }
-	`, sourceId, groupId, name, environmentUser, stagingEnvironment, postgresPort)
+	`, sourceId, groupId, name, environmentUser, stagingEnvironment, parameters)
 }
 
-func testDsourceUpdate(sourceId string, groupId string, name string, environmentUser string, stagingEnvironment string, postgresPort string) string {
+func testDsourceUpdate(sourceId string, groupId string, name string, environmentUser string, stagingEnvironment string, parameters string) string {
 	return fmt.Sprintf(`
 resource "delphix_appdata_dsource" "new_data_dsource" {
   source_value                  = "%s"
@@ -106,7 +106,7 @@ resource "delphix_appdata_dsource" "new_data_dsource" {
     resync = true
   })
 }
-	`, sourceId, groupId, name, environmentUser, stagingEnvironment, postgresPort)
+	`, sourceId, groupId, name, environmentUser, stagingEnvironment, parameters)
 }
 
 func testDsourceExists(n string, sourceId string) resource.TestCheckFunc {

internal/provider/resource_vdb_test.go

@@ -93,9 +93,6 @@ func testAccVdbAppDataPreCheck(t *testing.T) {
 	if err := os.Getenv("APPDATA_SOURCE_PARAMS"); err == "" {
 		t.Fatal("APPDATA_SOURCE_PARAMS must be set for vdb acceptance tests")
 	}
-	if err := os.Getenv("APPDATA_CONFIG_PARAMS"); err == "" {
-		t.Fatal("APPDATA_CONFIG_PARAMS must be set for vdb acceptance tests")
-	}
 }
 
 func testAccCheckDctVDBConfigBasic() string {
@@ -111,15 +108,13 @@ func testAccCheckDctVDBConfigBasic() string {
 func testAccCheckDctVDBConfigAppDataBasic() string {
 	appdata_datasource_id := os.Getenv("APPDATA_DATASOURCE_ID")
 	appdata_source_params := os.Getenv("APPDATA_SOURCE_PARAMS")
-	appdata_config_params := os.Getenv("APPDATA_CONFIG_PARAMS")
 	return fmt.Sprintf(`
 	resource "delphix_vdb" "new_appdata" {
 		auto_select_repository = true
     	source_data_id         = "%s"
 		appdata_source_params  = jsonencode(%s)
-		appdata_config_params  = jsonencode(%s)
 	}
-	`, appdata_datasource_id, appdata_source_params, appdata_config_params)
+	`, appdata_datasource_id, appdata_source_params)
 }
 
 func testAccCheckDctVDBBookmarkConfigBasic() string {
@@ -185,8 +180,6 @@ func testAccCheckDctVDBBookmarkConfigBasic() string {
 	}
 	`, bookmark_id)
 
-	print(resource)
-
 	return resource
 
 }
@@ -314,8 +307,6 @@ func testAccCheckVdbDestroy(s *terraform.State) error {
 
 func testAccCheckVdbDestroyBookmark(s *terraform.State) error {
 	client := testAccProvider.Meta().(*apiClient).client
-
-	print("Deleting parent vdb " + vdb_id)
 	deleteVdbParams := dctapi.NewDeleteVDBParametersWithDefaults()
 	deleteVdbParams.SetForce(false)
 	client.VDBsAPI.DeleteVdb(context.Background(), vdb_id).DeleteVDBParameters(*deleteVdbParams).Execute()