vcn_id now saved in tfstate file correctly. This enables the terraform import scenarios

Author: rohanbhattacharjee

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)
 	}

provider/core_route_table_resource_test.go

@@ -72,11 +72,11 @@ func (s *ResourceCoreRouteTableTestSuite) TestAccResourceCoreRouteTable_basic()
 					}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.ResourceName, "display_name"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "vcn_in"),
+					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"),
-					resource.TestCheckResourceAttrSet(s.DefaultResourceName, "vcn_in"),
 				),
 			},
 			// verify add rule
@@ -92,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"),
@@ -131,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"),
@@ -150,7 +154,6 @@ func (s *ResourceCoreRouteTableTestSuite) TestAccResourceCoreRouteTable_basic()
 				Config: s.Config + defaultRouteTable,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.DefaultResourceName, "display_name"),
-					resource.TestCheckResourceAttrSet(s.DefaultResourceName, "vcn_in"),
 					resource.TestCheckResourceAttrSet(s.DefaultResourceName, "route_rules.0.network_entity_id"),
 					resource.TestCheckResourceAttr(s.DefaultResourceName, "route_rules.#", "1"),
 					resource.TestCheckResourceAttr(s.DefaultResourceName, "route_rules.0.cidr_block", "0.0.0.0/0"),

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)
 	}