Merge pull request #388 from oracle/terraform-import-fix

rohanbhattacharjee · web-flow · commit 938755cdf6a7 · 2017-12-13T13:03:27.000-08:00
Fix errors with terraform import because of missing vcn_id in tfstate files
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ terraform-plain.sh
 bin/*
 obmc-container-clean
 terraform-provider-oci
+*.iml
diff --git a/provider/core_dhcp_options_data_source.go b/provider/core_dhcp_options_data_source.go
@@ -109,7 +109,7 @@ func (s *DHCPOptionsDatasourceCrud) SetData() {
 			"options":        nestedStateObjs,
 			"state":          res.State,
 			"time_created":   res.TimeCreated.String(),
-			"vcn_id":         s.D.Get("vcn_id").(string), // todo: get this off the resource result
+			"vcn_id":         res.VcnID,
 		}
 		resources = append(resources, stateObj)
 	}
diff --git a/provider/core_dhcp_options_resource.go b/provider/core_dhcp_options_resource.go
@@ -250,6 +250,7 @@ func (s *DHCPOptionsResourceCrud) Update() (e error) {
 func (s *DHCPOptionsResourceCrud) SetData() {
 	s.D.Set("compartment_id", s.Res.CompartmentID)
 	s.D.Set("display_name", s.Res.DisplayName)
+	s.D.Set("vcn_id", s.Res.VcnID)
 
 	entities := []map[string]interface{}{}
 	for _, val := range s.Res.Options {
diff --git a/provider/core_dhcp_options_resource_test.go b/provider/core_dhcp_options_resource_test.go
@@ -128,6 +128,11 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestAccResourceCoreDHCPOptions_basic(
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "options.0.type", "DomainNameServer"),
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "options.0.server_type", "CustomDnsServer"),
 					resource.TestCheckResourceAttr("oci_core_default_dhcp_options.default", "options.1.type", "SearchDomain"),
+
+					resource.TestCheckResourceAttrSet("oci_core_dhcp_options.opt1", "vcn_id"),
+					resource.TestCheckResourceAttrSet("oci_core_dhcp_options.opt2", "vcn_id"),
+					resource.TestCheckResourceAttrSet("oci_core_dhcp_options.opt3", "vcn_id"),
+					resource.TestCheckResourceAttrSet("oci_core_dhcp_options.opt4", "vcn_id"),
 				),
 			},
 			// Verify removing default DHCP options
diff --git a/provider/core_route_table_resource.go b/provider/core_route_table_resource.go
@@ -255,6 +255,7 @@ func (s *RouteTableResourceCrud) Update() (e error) {
 func (s *RouteTableResourceCrud) SetData() {
 	s.D.Set("compartment_id", s.Res.CompartmentID)
 	s.D.Set("display_name", s.Res.DisplayName)
+	s.D.Set("vcn_id", s.Res.VcnID)
 
 	rules := []map[string]interface{}{}
 	for _, val := range s.Res.RouteRules {
diff --git a/provider/core_route_table_resource_test.go b/provider/core_route_table_resource_test.go
@@ -72,6 +72,8 @@ func (s *ResourceCoreRouteTableTestSuite) TestAccResourceCoreRouteTable_basic()
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.ResourceName, "display_name"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "vcn_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "compartment_id"),
 					resource.TestCheckResourceAttr(s.ResourceName, "route_rules.#", "0"),
 					resource.TestCheckResourceAttrSet(s.DefaultResourceName, "display_name"),
 					resource.TestCheckResourceAttr(s.DefaultResourceName, "route_rules.#", "0"),
@@ -90,6 +92,8 @@ func (s *ResourceCoreRouteTableTestSuite) TestAccResourceCoreRouteTable_basic()
 					}` + defaultRouteTable,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.ResourceName, "display_name"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "vcn_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "compartment_id"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "route_rules.0.network_entity_id"),
 					resource.TestCheckResourceAttr(s.ResourceName, "route_rules.#", "1"),
 					resource.TestCheckResourceAttr(s.ResourceName, "route_rules.0.cidr_block", "0.0.0.0/0"),
@@ -129,6 +133,8 @@ func (s *ResourceCoreRouteTableTestSuite) TestAccResourceCoreRouteTable_basic()
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(s.ResourceName, "display_name", "-tf-route-table"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "vcn_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "compartment_id"),
 					resource.TestCheckResourceAttr(s.ResourceName, "route_rules.#", "2"),
 					resource.TestCheckResourceAttr(s.ResourceName, "route_rules.0.cidr_block", "0.0.0.0/0"),
 					resource.TestCheckResourceAttr(s.ResourceName, "route_rules.1.cidr_block", "10.0.0.0/8"),
diff --git a/provider/core_route_tables_data_source.go b/provider/core_route_tables_data_source.go
@@ -108,7 +108,7 @@ func (s *RouteTableDatasourceCrud) SetData() {
 			"state":          v.State,
 			"time_created":   v.TimeCreated.String(),
 			"time_modified":  v.TimeModified.String(),
-			"vcn_id":         s.D.Get("vcn_id").(string), // todo: get this off the route table result
+			"vcn_id":         v.VcnID,
 		}
 		resources = append(resources, res)
 	}
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/client.go b/vendor/github.com/oracle/bmcs-go-sdk/client.go
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/core_dhcp_options.go b/vendor/github.com/oracle/bmcs-go-sdk/core_dhcp_options.go
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/core_route_table.go b/vendor/github.com/oracle/bmcs-go-sdk/core_route_table.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -2972,10 +2972,10 @@
 			"revisionTime": "2017-01-25T16:36:56Z"
 		},
 		{
-			"checksumSHA1": "EY2CFkCSq6E581t2Pc2t17KWiV0=",
+			"checksumSHA1": "SCBrA8wrrV1OFM909p59ODhIbXI=",
 			"path": "github.com/oracle/bmcs-go-sdk",
-			"revision": "e95f390096f7ad4988c4a4d1b97a0dcd424ee91d",
-			"revisionTime": "2017-11-06T17:38:49Z",
+			"revision": "223378ed3de811efe4d166b770be079c3e239f3b",
+			"revisionTime": "2017-12-09T01:48:44Z",
 			"version": "add-db-license-model",
 			"versionExact": "add-db-license-model"
 		},

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func (s *DHCPOptionsDatasourceCrud) SetData() {`
`109`	`109`	`"options": nestedStateObjs,`
`110`	`110`	`"state": res.State,`
`111`	`111`	`"time_created": res.TimeCreated.String(),`
`112`		`- "vcn_id": s.D.Get("vcn_id").(string), // todo: get this off the resource result`
	`112`	`+ "vcn_id": res.VcnID,`
`113`	`113`	`}`
`114`	`114`	`resources = append(resources, stateObj)`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ func (s *RouteTableDatasourceCrud) SetData() {`
`108`	`108`	`"state": v.State,`
`109`	`109`	`"time_created": v.TimeCreated.String(),`
`110`	`110`	`"time_modified": v.TimeModified.String(),`
`111`		`- "vcn_id": s.D.Get("vcn_id").(string), // todo: get this off the route table result`
	`111`	`+ "vcn_id": v.VcnID,`
`112`	`112`	`}`
`113`	`113`	`resources = append(resources, res)`
`114`	`114`	`}`