Add a test that properly tests staged deletes and that state is properly removed for virtual networks. Correct some identity provider requirements to match the latest APIs

Author: mikejihbe

core_virtual_network_test.go

@@ -12,6 +12,8 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 
+	"errors"
+
 	"github.com/stretchr/testify/suite"
 )
 
@@ -25,6 +27,7 @@ type ResourceCoreVirtualNetworkTestSuite struct {
 	ResourceName string
 	Res          *baremetal.VirtualNetwork
 	DeletedRes   *baremetal.VirtualNetwork
+	DeletingRes  *baremetal.VirtualNetwork
 }
 
 func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
@@ -66,6 +69,17 @@ func (s *ResourceCoreVirtualNetworkTestSuite) SetupTest() {
 	s.Res.ETag = "etag"
 	s.Res.RequestID = "opcrequestid"
 
+	s.DeletingRes = &baremetal.VirtualNetwork{
+		CidrBlock:             "cidr_block",
+		CompartmentID:         "compartment_id",
+		DefaultRoutingTableID: "default_routing_table_id",
+		DefaultSecurityListID: "default_security_list_id",
+		DisplayName:           "display_name",
+		ID:                    "id",
+		State:                 baremetal.ResourceTerminating,
+		TimeCreated:           s.TimeCreated,
+	}
+
 	s.DeletedRes = &baremetal.VirtualNetwork{
 		CidrBlock:             "cidr_block",
 		CompartmentID:         "compartment_id",
@@ -113,6 +127,30 @@ func (s *ResourceCoreVirtualNetworkTestSuite) TestCreateResourceCoreVirtualNetwo
 	})
 }
 
+func (s *ResourceCoreVirtualNetworkTestSuite) TestDeleteResourceCoreVirtualNetwork() {
+	s.Client.On("GetVirtualNetwork", "id").Return(s.Res, nil).Times(2)
+	s.Client.On("GetVirtualNetwork", "id").Return(s.DeletingRes, nil).Times(2)
+	s.Client.On("GetVirtualNetwork", "id").Return(nil, errors.New("blah blah does not exist"))
+
+	resource.UnitTest(s.T(), resource.TestCase{
+		Providers: s.Providers,
+		Steps: []resource.TestStep{
+			{
+				Config: s.Config,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(s.ResourceName, "id", s.Res.ID),
+				),
+			},
+			{
+				Config: testProviderConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testNoInstanceState("baremetal_core_virtual_network"),
+				),
+			},
+		},
+	})
+}
+
 func (s *ResourceCoreVirtualNetworkTestSuite) TestCreateResourceCoreVirtualNetworkWithoutDisplayName() {
 	s.Client.On("GetVirtualNetwork", "id").Return(s.Res, nil).Times(2)
 	s.Client.On("GetVirtualNetwork", "id").Return(s.DeletedRes, nil)

identity_policy_test.go

@@ -22,6 +22,7 @@ var testPolicyConfig = `
   resource "baremetal_identity_policy" "p" {
     name = "%s"
     description = "%s"
+    compartment_id = "%s"
     statements = %s
   }
 `
@@ -79,6 +80,7 @@ func (s *ResourceIdentityPolicyTestSuite) SetupTest() {
 	s.Config = fmt.Sprintf(testProviderConfig+testPolicyConfig,
 		"pol",
 		"desc",
+		"7",
 		`["statementX","statementY"]`,
 	)
 	s.PolicyName = "baremetal_identity_policy.p"
@@ -96,6 +98,7 @@ func (s *ResourceIdentityPolicyTestSuite) SetupTest() {
 		"CreatePolicy",
 		"pol",
 		"desc",
+		"7",
 		[]string{"statementX", "statementY"},
 		(*baremetal.CreatePolicyOptions)(nil),
 	).Return(s.Policy, nil)
@@ -133,6 +136,7 @@ func (s *ResourceIdentityPolicyTestSuite) TestUpdateResourceIdentityPolicy() {
 	config := fmt.Sprintf(testProviderConfig+testPolicyConfig,
 		"pol",
 		"newdesc",
+		"7",
 		`["statementA","statementY", "statementZ"]`,
 	)
 
@@ -177,6 +181,7 @@ func (s *ResourceIdentityPolicyTestSuite) TestFailedUpdateResourceIdentityPolicy
 	config := fmt.Sprintf(testProviderConfig+testPolicyConfig,
 		"pol",
 		"newdesc",
+		"7",
 		`["statementA", "statementB"]`,
 	)
 
@@ -230,6 +235,7 @@ func (s *ResourceIdentityPolicyTestSuite) TestUpdateResourceIdentityPolicyNameSh
 	config := fmt.Sprintf(testProviderConfig+testPolicyConfig,
 		"newname",
 		"desc",
+		"7",
 		`["statementX", "statementY"]`,
 	)
 
@@ -242,6 +248,7 @@ func (s *ResourceIdentityPolicyTestSuite) TestUpdateResourceIdentityPolicyNameSh
 		"CreatePolicy",
 		"newname",
 		"desc",
+		"7",
 		statements,
 		(*baremetal.CreatePolicyOptions)(nil),
 	).Return(&u, nil)

provider.go

@@ -5,14 +5,15 @@ package main
 import (
 	"crypto/rsa"
 
+	"fmt"
+
 	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/core"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/database"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/identity"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/objectstorage"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
-	"fmt"
 )
 
 var descriptions map[string]string
@@ -110,7 +111,7 @@ func dataSourcesMap() map[string]*schema.Resource {
 		"baremetal_database_db_systems":            database.DBSystemDatasource(),
 		"baremetal_database_db_system_shapes":      database.DBSystemShapeDatasource(),
 		"baremetal_database_db_versions":           database.DBVersionDatasource(),
-		"baremetal_database_supported_operations": database.SupportedOperationDatasource(),
+		"baremetal_database_supported_operations":  database.SupportedOperationDatasource(),
 		"baremetal_identity_api_keys":              identity.APIKeyDatasource(),
 		"baremetal_objectstorage_bucket_summaries": objectstorage.BucketSummaryDatasource(),
 		"baremetal_objectstorage_object_head":      objectstorage.ObjectHeadDatasource(),

provider_test.go

@@ -5,8 +5,12 @@ package main
 import (
 	"testing"
 
+	"errors"
+
 	"github.com/MustWin/baremetal-sdk-go"
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/terraform"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -87,3 +91,21 @@ func TestProviderConfig(t *testing.T) {
 	_, ok := client.(*baremetal.Client)
 	assert.True(t, ok)
 }
+
+// TestNoInstanceState determines if there is any state for a given name.
+func testNoInstanceState(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		ms := s.RootModule()
+		rs, ok := ms.Resources[name]
+		if !ok {
+			return nil
+		}
+
+		is := rs.Primary
+		if is == nil {
+			return nil
+		}
+
+		return errors.New("State exists for primary resource " + name)
+	}
+}