Variable-ize compartment id for acceptance tests

Author: mikejihbe

data_source_obmcs_core_console_history_data_test.go

@@ -40,7 +40,7 @@ func (s *CoreConsoleHistoryDataDatasourceTestSuite) SetupTest() {
       offset = 1
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_console_history_data.s"
 }
 

data_source_obmcs_core_cpe_test.go

@@ -11,9 +11,6 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 
-
-
-
 	"github.com/stretchr/testify/suite"
 )
 
@@ -37,10 +34,10 @@ func (s *DatasourceCoreCpeTestSuite) SetupTest() {
 	}
 	s.Config = `
     data "baremetal_core_cpes" "s" {
-      compartment_id = "compartmentid"
+      compartment_id = "${var.compartment_id}"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_cpes.s"
 
 }

data_source_obmcs_core_dhcp_options_test.go

@@ -38,13 +38,13 @@ func (s *ResourceCoreDHCPOptionsDatasourceTestSuite) SetupTest() {
 	}
 	s.Config = `
     data "baremetal_core_dhcp_options" "t" {
-      compartment_id = "compartment_id"
+      compartment_id = "${var.compartment_id}"
       limit = 1
       page = "page"
       vcn_id = "vcn_id"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_dhcp_options.t"
 
 	b1 := baremetal.DHCPOptions{

data_source_obmcs_core_drg_attachment_test.go

@@ -37,14 +37,14 @@ func (s *CoreDrgAttachmentDatasourceTestSuite) SetupTest() {
 	}
 	s.Config = `
     data "baremetal_core_drg_attachments" "t" {
-      compartment_id = "compartment_id"
+      compartment_id = "${var.compartment_id}"
 			drg_id = "drg_id"
       limit = 1
       page = "page"
 			vcn_id = "vcn_id"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_drg_attachments.t"
 }
 

data_source_obmcs_core_drg_test.go

@@ -37,12 +37,12 @@ func (s *ResourceCoreDrgsTestSuite) SetupTest() {
 	}
 	s.Config = `
     data "baremetal_core_drgs" "t" {
-      compartment_id = "compartment_id"
+      compartment_id = "${var.compartment_id}"
       limit = 1
       page = "page"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_drgs.t"
 }
 

data_source_obmcs_core_image_test.go

@@ -38,12 +38,12 @@ func (s *ResourceCoreImagesTestSuite) SetupTest() {
 	}
 	s.Config = `
     data "baremetal_core_images" "t" {
-      compartment_id = "compartment_id"
+      compartment_id = "${var.compartment_id}"
       limit = 1
       page = "page"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_images.t"
 
 	b1 := baremetal.Image{

data_source_obmcs_core_instance_credential_test.go

@@ -39,7 +39,7 @@ func (s *ResourceCoreInstanceCredentialTestSuite) SetupTest() {
       instance_id = "instanceid"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_instance_credentials.s"
 
 }

data_source_obmcs_core_instance_test.go

@@ -37,11 +37,11 @@ func (s *ResourceCoreInstancesTestSuite) SetupTest() {
 	}
 	s.Config = `
     data "baremetal_core_instances" "s" {
-      compartment_id = "compartmentid"
+      compartment_id = "${var.compartment_id}"
       availability_domain = "availabilityid"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_instances.s"
 }
 

data_source_obmcs_core_internet_gateway_test.go

@@ -37,11 +37,11 @@ func (s *CoreInternetGatewayDatasourceTestSuite) SetupTest() {
 	}
 	s.Config = `
     data "baremetal_core_internet_gateways" "s" {
-      compartment_id = "compartmentid"
+      compartment_id = "${var.compartment_id}"
       vcn_id = "vcnid"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_internet_gateways.s"
 
 }

data_source_obmcs_core_ipsec_config_test.go

@@ -40,7 +40,7 @@ func (s *DatasourceCoreIPSecConfigTestSuite) SetupTest() {
       ipsec_id = "ipsecid"
     }
   `
-	s.Config += testProviderConfig
+	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_ipsec_config.s"
 
 }