Test cases minor edits for schematics

ibm/acctest/acctest.go

@@ -125,6 +125,7 @@ var (
 	ISSnapshotCRN                   string
 	WorkspaceID                     string
 	TemplateID                      string
+	AgentID                         string
 	ActionID                        string
 	JobID                           string
 	RepoURL                         string
@@ -1384,6 +1385,11 @@ func init() {
 		ActionID = "us-east.ACTION.action_pm.a4ffeec3"
 		fmt.Println("[INFO] Set the environment variable SCHEMATICS_ACTION_ID for testing schematics resources else it is set to default value")
 	}
+	AgentID = os.Getenv("SCHEMATICS_AGENT_ID")
+	if AgentID == "" {
+		AgentID = "agent-non-bnpp-prod-testing-130.soA.be6e"
+		fmt.Println("[INFO] Set the environment variable SCHEMATICS_AGENT_ID for testing schematics resources else it is set to default value")
+	}
 	JobID = os.Getenv("SCHEMATICS_JOB_ID")
 	if JobID == "" {
 		JobID = "us-east.ACTION.action_pm.a4ffeec3"

ibm/service/schematics/data_source_ibm_schematics_agent_deploy_test.go

@@ -7,21 +7,19 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 
 	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
 )
 
 func TestAccIbmSchematicsAgentDeployDataSourceBasic(t *testing.T) {
-	agentDeployJobAgentID := fmt.Sprintf("tf_agent_id_%d", acctest.RandIntRange(10, 100))
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccCheckIbmSchematicsAgentDeployDataSourceConfigBasic(agentDeployJobAgentID),
+				Config: testAccCheckIbmSchematicsAgentDeployDataSourceConfigBasic(acc.AgentID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_deploy.schematics_agent_deploy_instance", "id"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_deploy.schematics_agent_deploy_instance", "agent_id"),

ibm/service/schematics/data_source_ibm_schematics_agent_health_test.go

@@ -7,25 +7,22 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 
 	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
 )
 
 func TestAccIbmSchematicsAgentHealthDataSourceBasic(t *testing.T) {
-	agentHealthJobAgentID := fmt.Sprintf("tf_agent_id_%d", acctest.RandIntRange(10, 100))
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccCheckIbmSchematicsAgentHealthDataSourceConfigBasic(agentHealthJobAgentID),
+				Config: testAccCheckIbmSchematicsAgentHealthDataSourceConfigBasic(acc.AgentID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_health.schematics_agent_health_instance", "id"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_health.schematics_agent_health_instance", "agent_id"),
-					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_health.schematics_agent_health_instance", "job_id"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_health.schematics_agent_health_instance", "updated_at"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_health.schematics_agent_health_instance", "updated_by"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_health.schematics_agent_health_instance", "agent_version"),

ibm/service/schematics/data_source_ibm_schematics_agent_prs_test.go

@@ -7,25 +7,22 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 
 	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
 )
 
 func TestAccIbmSchematicsAgentPrsDataSourceBasic(t *testing.T) {
-	agentPRSJobAgentID := fmt.Sprintf("tf_agent_id_%d", acctest.RandIntRange(10, 100))
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccCheckIbmSchematicsAgentPrsDataSourceConfigBasic(agentPRSJobAgentID),
+				Config: testAccCheckIbmSchematicsAgentPrsDataSourceConfigBasic(acc.AgentID),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_prs.schematics_agent_prs_instance", "id"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_prs.schematics_agent_prs_instance", "agent_id"),
-					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_prs.schematics_agent_prs_instance", "job_id"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_prs.schematics_agent_prs_instance", "updated_at"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_prs.schematics_agent_prs_instance", "updated_by"),
 					resource.TestCheckResourceAttrSet("data.ibm_schematics_agent_prs.schematics_agent_prs_instance", "agent_version"),

ibm/service/schematics/data_source_ibm_schematics_inventory_test.go

@@ -33,7 +33,7 @@ func TestAccIBMSchematicsInventoryDataSourceAllArgs(t *testing.T) {
 	inventoryResourceRecordName := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
 	inventoryResourceRecordDescription := fmt.Sprintf("tf_description_%d", acctest.RandIntRange(10, 100))
 	inventoryResourceRecordLocation := "us-south"
-	inventoryResourceRecordResourceGroup := fmt.Sprintf("tf_resource_group_%d", acctest.RandIntRange(10, 100))
+	inventoryResourceRecordResourceGroup := "Default"
 	inventoryResourceRecordInventoriesIni := fmt.Sprintf("tf_inventories_ini_%d", acctest.RandIntRange(10, 100))
 
 	resource.Test(t, resource.TestCase{

ibm/service/schematics/data_source_ibm_schematics_job_test.go

@@ -18,7 +18,7 @@ func TestAccIBMSchematicsJobDataSourceBasic(t *testing.T) {
 	//jobCommandObjectID := fmt.Sprintf("command_object_id_%d", acctest.RandIntRange(10, 100))
 	jobCommandName := "ansible_playbook_run"
 	jobCommandParameter := fmt.Sprintf("command_parameter_%d", acctest.RandIntRange(10, 100))
-	jobLocation := "us"
+	jobLocation := "us-south"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },

ibm/service/schematics/data_source_ibm_schematics_policies_test.go

@@ -31,7 +31,6 @@ func TestAccIbmSchematicsPoliciesDataSourceBasic(t *testing.T) {
 func testAccCheckIbmSchematicsPoliciesDataSourceConfigBasic() string {
 	return fmt.Sprintf(`
 		data "ibm_schematics_policies" "schematics_policies_instance" {
-			policy_kind = "agent_assignment_policy"
 		}
 	`)
 }

ibm/service/schematics/data_source_ibm_schematics_workspace_test.go

@@ -48,9 +48,9 @@ func TestAccIBMSchematicsWorkspaceDataSourceBasic(t *testing.T) {
 func TestAccIBMSchematicsWorkspaceDataSourceAllArgs(t *testing.T) {
 	workspaceResponseDescription := fmt.Sprintf("description_%d", acctest.RandIntRange(10, 100))
 	workspaceResponseLocation := "us-east"
-	workspaceTemplateType := "terraform_v0.13.5"
+	workspaceTemplateType := "terraform_v1.6"
 	workspaceResponseName := fmt.Sprintf("name_%d", acctest.RandIntRange(10, 100))
-	workspaceResponseResourceGroup := "default"
+	workspaceResponseResourceGroup := "Default"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
@@ -88,8 +88,8 @@ func testAccCheckIBMSchematicsWorkspaceDataSourceConfigBasic() string {
 			description = "tf-acc-test-schematics"
 			name = "tf-acc-test-schematics"
 			location = "us-east"
-			resource_group = "default"
-			template_type = "terraform_v0.13.5"
+			resource_group = "Default"
+			template_type = "terraform_v1.6"
 			template_env_settings = [
 				{
 					IBMCLOUD_ENV_VAR = "ENV_VALUE",
@@ -110,7 +110,7 @@ func testAccCheckIBMSchematicsWorkspaceDataSourceConfig(workspaceResponseDescrip
 			 location = "%s"
 			 name = "%s"
 			 resource_group = "%s"
-			 template_type = "terraform_v0.13.5"
+			 template_type = "terraform_v1.6"
 		 }
  
 		 data "ibm_schematics_workspace" "schematics_workspace" {

ibm/service/schematics/resource_ibm_schematics_action_test.go

@@ -56,7 +56,7 @@ func testAccCheckIBMSchematicsActionConfigBasic(actionName string, description s
 			name = "%s"
 			description = "%s"
 			location = "us-east"
-			resource_group = "default"
+			resource_group = "Default"
 		}
 	`, actionName, description)
 }

ibm/service/schematics/resource_ibm_schematics_agent_deploy_test.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
@@ -20,18 +19,17 @@ import (
 
 func TestAccIbmSchematicsAgentDeployBasic(t *testing.T) {
 	var conf *schematicsv1.AgentDataRecentDeployJob
-	agentID := fmt.Sprintf("tf_agent_id_%d", acctest.RandIntRange(10, 100))
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { acc.TestAccPreCheck(t) },
 		Providers:    acc.TestAccProviders,
 		CheckDestroy: testAccCheckIbmSchematicsAgentDeployDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccCheckIbmSchematicsAgentDeployConfigBasic(agentID),
+				Config: testAccCheckIbmSchematicsAgentDeployConfigBasic(acc.AgentID),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckIbmSchematicsAgentDeployExists("ibm_schematics_agent_deploy.schematics_agent_deploy_instance", conf),
-					resource.TestCheckResourceAttr("ibm_schematics_agent_deploy.schematics_agent_deploy_instance", "agent_id", agentID),
+					resource.TestCheckResourceAttr("ibm_schematics_agent_deploy.schematics_agent_deploy_instance", "agent_id", acc.AgentID),
 				),
 			},
 		},

ibm/service/schematics/resource_ibm_schematics_agent_health_test.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
@@ -20,18 +19,17 @@ import (
 
 func TestAccIbmSchematicsAgentHealthBasic(t *testing.T) {
 	var conf *schematicsv1.AgentDataRecentHealthJob
-	agentID := fmt.Sprintf("tf_agent_id_%d", acctest.RandIntRange(10, 100))
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { acc.TestAccPreCheck(t) },
 		Providers:    acc.TestAccProviders,
 		CheckDestroy: testAccCheckIbmSchematicsAgentHealthDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccCheckIbmSchematicsAgentHealthConfigBasic(agentID),
+				Config: testAccCheckIbmSchematicsAgentHealthConfigBasic(acc.AgentID),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckIbmSchematicsAgentHealthExists("ibm_schematics_agent_health.schematics_agent_health_instance", conf),
-					resource.TestCheckResourceAttr("ibm_schematics_agent_health.schematics_agent_health_instance", "agent_id", agentID),
+					resource.TestCheckResourceAttr("ibm_schematics_agent_health.schematics_agent_health_instance", "agent_id", acc.AgentID),
 				),
 			},
 		},

ibm/service/schematics/resource_ibm_schematics_agent_prs_test.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 
@@ -20,18 +19,17 @@ import (
 
 func TestAccIbmSchematicsAgentPrsBasic(t *testing.T) {
 	var conf *schematicsv1.AgentDataRecentPrsJob
-	agentID := fmt.Sprintf("tf_agent_id_%d", acctest.RandIntRange(10, 100))
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { acc.TestAccPreCheck(t) },
 		Providers:    acc.TestAccProviders,
 		CheckDestroy: testAccCheckIbmSchematicsAgentPrsDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccCheckIbmSchematicsAgentPrsConfigBasic(agentID),
+				Config: testAccCheckIbmSchematicsAgentPrsConfigBasic(acc.AgentID),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testAccCheckIbmSchematicsAgentPrsExists("ibm_schematics_agent_prs.schematics_agent_prs_instance", conf),
-					resource.TestCheckResourceAttr("ibm_schematics_agent_prs.schematics_agent_prs_instance", "agent_id", agentID),
+					resource.TestCheckResourceAttr("ibm_schematics_agent_prs.schematics_agent_prs_instance", "agent_id", acc.AgentID),
 				),
 			},
 		},

ibm/service/schematics/resource_ibm_schematics_agent_test.go

@@ -19,11 +19,11 @@ import (
 func TestAccIbmSchematicsAgentBasic(t *testing.T) {
 	var conf schematicsv1.AgentData
 	name := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
-	version := "1.0.0-prega"
+	version := "1.1.0"
 	schematicsLocation := "us-south"
 	agentLocation := "eu-de"
 	nameUpdate := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
-	versionUpdate := "1.0.0"
+	versionUpdate := "1.2.0"
 	schematicsLocationUpdate := "us-east"
 	agentLocationUpdate := "eu-gb"
 
@@ -58,11 +58,11 @@ func TestAccIbmSchematicsAgentBasic(t *testing.T) {
 func TestAccIbmSchematicsAgentAllArgs(t *testing.T) {
 	var conf schematicsv1.AgentData
 	name := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
-	version := "1.0.0-prega"
+	version := "1.1.0"
 	schematicsLocation := "us-south"
 	agentLocation := "eu-de"
 	nameUpdate := fmt.Sprintf("tf_name_%d", acctest.RandIntRange(10, 100))
-	versionUpdate := "1.0.0"
+	versionUpdate := "1.2.0"
 	schematicsLocationUpdate := "us-east"
 	agentLocationUpdate := "eu-gb"
 	description := fmt.Sprintf("tf_description_%d", acctest.RandIntRange(10, 100))

ibm/service/schematics/resource_ibm_schematics_job_test.go

@@ -63,7 +63,7 @@ func testAccCheckIBMSchematicsJobConfig(commandObject string, commandObjectID st
 			command_object_id = "%s"
 			command_name = "%s"
 			command_parameter = "%s"
-			location = "us"
+			location = "us-south"
 		}
 	`, commandObject, commandObjectID, commandName, commandParameter)
 }

ibm/service/schematics/resource_ibm_schematics_workspace_test.go

@@ -39,7 +39,7 @@ func TestAccIBMSchematicsWorkspaceAllArgs(t *testing.T) {
 	var conf schematicsv1.WorkspaceResponse
 	description := fmt.Sprintf("tf-acc-test-schematics-all-args_%d", acctest.RandIntRange(10, 100))
 	name := fmt.Sprintf("tf-acc-test-schematics_%d", acctest.RandIntRange(10, 100))
-	templateType := "terraform_v0.13.5"
+	templateType := "terraform_v1.6"
 
 	descriptionUpdate := fmt.Sprintf("description_%d", acctest.RandIntRange(10, 100))
 	nameUpdate := fmt.Sprintf("tf-acc-test-schematics_%d", acctest.RandIntRange(10, 100))
@@ -116,8 +116,8 @@ func testAccCheckIBMSchematicsWorkspaceConfigBasic() string {
 			description = "tf-acc-test-schematics"
 			name = "tf-acc-test-schematics"
 			location = "us-east"
-			resource_group = "default"
-			template_type = "terraform_v0.13.5"
+			resource_group = "Default"
+			template_type = "terraform_v1.6"
 		}
 	`
 }
@@ -129,8 +129,8 @@ func testAccCheckIBMSchematicsWorkspaceConfig(description string, name string) s
 			description = "%s"
 			location = "us-east"
 			name = "%s"
-			resource_group = "default"
-			template_type = "terraform_v0.13.5"
+			resource_group = "Default"
+			template_type = "terraform_v1.6"
 		}
 	`, description, name)
 }
@@ -142,8 +142,8 @@ func testAccCheckIBMSchematicsWorkspaceConfigUpdate(description string, name str
 			description = "%s"
 			location = "us-east"
 			name = "%s"
-			resource_group = "default"
-			template_type = "terraform_v0.13.5"
+			resource_group = "Default"
+			template_type = "terraform_v1.6"
 			template_inputs {
 				name = "testinput"
 				value = "test"
@@ -160,8 +160,8 @@ func testAccCheckIBMSchematicsWorkspaceConfigUpdateRepoURL(description string, n
 			description = "%s"
 			location = "us-east"
 			name = "%s"
-			resource_group = "default"
-			template_type = "terraform_v0.13.5"
+			resource_group = "Default"
+			template_type = "terraform_v1.6"
 			template_git_url = "%s"
 			template_inputs {
 				name = "testinput"
@@ -179,8 +179,8 @@ func testAccCheckIBMSchematicsWorkspaceConfigUpdateRepoBranch(description string
 			description = "%s"
 			location = "us-east"
 			name = "%s"
-			resource_group = "default"
-			template_type = "terraform_v0.13.5"
+			resource_group = "Default"
+			template_type = "terraform_v1.6"
 			template_git_url = "%s"
 			template_inputs {
 				name = "testinput"