Acceptance tests for identity and objectstorage

Author: mikejihbe

data_source_obmcs_core_volume_backup_test.go

@@ -37,12 +37,21 @@ func (s *ResourceCoreVolumeBackupsTestSuite) SetupTest() {
 		"baremetal": s.Provider,
 	}
 	s.Config = `
-    data "baremetal_core_volume_backups" "t" {
-      compartment_id = "${var.compartment_id}"
-      limit = 1
-      page = "page"
-      volume_id = "volume_id"
-    }
+data "baremetal_identity_availability_domains" "ADs" {
+	compartment_id = "${var.compartment_id}"
+}
+resource "baremetal_core_volume" "t" {
+	availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
+	compartment_id = "${var.compartment_id}"
+	display_name = "display_name"
+	size_in_mbs = 262144
+}
+data "baremetal_core_volume_backups" "t" {
+	compartment_id = "${var.compartment_id}"
+	limit = 1
+	page = "page"
+	volume_id = "${baremetal_core_volume.t.id}"
+}
   `
 	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_volume_backups.t"

provider_test.go

@@ -32,6 +32,10 @@ func testProviderConfig() string {
 	variable "compartment_id" {
 		default = "` + getEnvSetting("compartment_id", "compartment_id") + `"
 	}
+
+	variable "namespace" {
+		default = "` + getEnvSetting("namespace", "mustwin") + `"
+	}
 	`
 }
 

resource_obmcs_core_ipsec_test.go

@@ -59,7 +59,7 @@ func (s *ResourceCoreIPSecTestSuite) SetupTest() {
       			cpe_id = "${baremetal_core_cpe.t.id}"
       			drg_id = "${baremetal_core_drg.t.id}"
 			display_name = "display_name"
-      			static_routes = ["route1","route2"]
+      			static_routes = ["10.0.0.0/16"]
 		}
 	`
 
@@ -92,7 +92,7 @@ func (s *ResourceCoreIPSecTestSuite) SetupTest() {
 	s.Client.On("DeleteIPSecConnection", s.Res.ID, (*baremetal.IfMatchOptions)(nil)).Return(nil)
 }
 
-func (s *ResourceCoreIPSecTestSuite) TestCreateResourceCoreSubnet() {
+func (s *ResourceCoreIPSecTestSuite) TestCreateResourceCoreIpsec() {
 	s.Client.On("GetIPSecConnection", "id").Return(s.Res, nil)
 
 	resource.UnitTest(s.T(), resource.TestCase{
@@ -115,113 +115,6 @@ func (s *ResourceCoreIPSecTestSuite) TestCreateResourceCoreSubnet() {
 	})
 }
 
-func (s *ResourceCoreIPSecTestSuite) TestCreateResourceCoreSubnetWithoutDisplayName() {
-	s.Client.On("GetIPSecConnection", "id").Return(s.Res, nil)
-
-	s.Config = `
-
-resource "baremetal_core_drg" "t" {
-	compartment_id = "${var.compartment_id}"
-	display_name = "display_name"
-}
-resource "baremetal_core_cpe" "t" {
-	compartment_id = "${var.compartment_id}"
-	display_name = "displayname"
-      ip_address = "123.123.123.123"
-}
-  resource "baremetal_core_ipsec" "t" {
-    compartment_id = "${var.compartment_id}"
-    cpe_id = "${baremetal_core_cpe.t.id}"
-    drg_id = "${baremetal_core_drg.t.id}"
-    static_routes = ["route1","route2"]
-  }
-	`
-
-	s.Config += testProviderConfig()
-
-	opts := &baremetal.CreateOptions{}
-	s.Res.DisplayName = ""
-
-	s.Client.On(
-		"CreateIPSecConnection",
-		s.Res.CompartmentID,
-		s.Res.CpeID,
-		s.Res.DrgID,
-		s.Res.StaticRoutes,
-		opts).Return(s.Res, nil)
-
-	resource.UnitTest(s.T(), resource.TestCase{
-		Providers: s.Providers,
-		Steps: []resource.TestStep{
-			{
-				ImportState:       true,
-				ImportStateVerify: true,
-				Config:            s.Config,
-				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(s.ResourceName, "display_name", s.Res.DisplayName),
-				),
-			},
-		},
-	})
-}
-
-func (s ResourceCoreIPSecTestSuite) TestUpdateCompartmentIDForcesNewIPSec() {
-	s.Client.On("GetIPSecConnection", "id").Return(s.Res, nil)
-
-	config := `
-		resource "baremetal_core_ipsec" "t" {
-    compartment_id = "new_compartment_id"
-    cpe_id = "cpeid"
-    drg_id = "drgid"
-    display_name = "display_name"
-    static_routes = ["route1","route2"]
-		}
-	`
-
-	config += testProviderConfig()
-
-	res := &baremetal.IPSecConnection{
-		CompartmentID: "new_compartment_id",
-		DisplayName:   "display_name",
-		ID:            "new_id",
-		DrgID:         "drgid",
-		CpeID:         "cpeid",
-		StaticRoutes:  []string{"route1", "route2"},
-		TimeCreated:   s.TimeCreated,
-		State:         baremetal.ResourceUp,
-	}
-
-	opts := &baremetal.CreateOptions{}
-	opts.DisplayName = "display_name"
-	s.Client.On(
-		"CreateIPSecConnection",
-		res.CompartmentID,
-		res.CpeID,
-		res.DrgID,
-		res.StaticRoutes,
-		opts).Return(res, nil).Once()
-
-	s.Client.On("GetIPSecConnection", res.ID).Return(res, nil)
-	s.Client.On("DeleteIPSecConnection", res.ID, (*baremetal.IfMatchOptions)(nil)).Return(nil)
-
-	resource.UnitTest(s.T(), resource.TestCase{
-		Providers: s.Providers,
-		Steps: []resource.TestStep{
-			{
-				ImportState:       true,
-				ImportStateVerify: true,
-				Config:            s.Config,
-			},
-			{
-				Config: config,
-				Check: resource.ComposeTestCheckFunc(
-
-				),
-			},
-		},
-	})
-}
-
 func (s *ResourceCoreIPSecTestSuite) TestTerminateIPSec() {
 	s.Client.On("GetIPSecConnection", "id").Return(s.Res, nil).Times(2)
 	s.Client.On("GetIPSecConnection", "id").Return(s.DeletedRes, nil)

resource_obmcs_core_volume_backup.go

@@ -105,13 +105,13 @@ func (s *VolumeBackupResourceCrud) ID() string {
 }
 
 func (s *VolumeBackupResourceCrud) CreatedPending() []string {
-	return []string{baremetal.ResourceRequestReceived}
+	return []string{baremetal.ResourceRequestReceived, baremetal.ResourceCreating, }
 }
 
 // Creating is considered "Created" because it can take some time to finish
 // actually creating and uploading the backup.
 func (s *VolumeBackupResourceCrud) CreatedTarget() []string {
-	return []string{baremetal.ResourceCreating, baremetal.ResourceAvailable}
+	return []string{baremetal.ResourceAvailable}
 }
 
 func (s *VolumeBackupResourceCrud) DeletedPending() []string {
@@ -161,7 +161,9 @@ func (s *VolumeBackupResourceCrud) SetData() {
 	s.D.Set("display_name", s.Res.DisplayName)
 	s.D.Set("state", s.Res.State)
 	s.D.Set("size_in_mbs", s.Res.SizeInMBs)
-	s.D.Set("time_created", s.Res.TimeCreated.String())
+	if !s.Res.TimeCreated.IsZero() {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
 	s.D.Set("time_request_received", s.Res.TimeCreated.String())
 	s.D.Set("unique_size_in_mbs", s.Res.SizeInMBs)
 	s.D.Set("volume_id", s.Res.VolumeID)

resource_obmcs_identity_api_key.go

@@ -8,6 +8,8 @@ import (
 
 	"github.com/oracle/terraform-provider-baremetal/client"
 	"github.com/oracle/terraform-provider-baremetal/crud"
+	"errors"
+	"regexp"
 )
 
 func APIKeyResource() *schema.Resource {
@@ -36,6 +38,15 @@ func APIKeyResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
+				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+					r := regexp.MustCompile("\\s")
+					strippedOld := r.ReplaceAllString(old, "")
+					strippedNew := r.ReplaceAllString(new, "")
+					if strippedOld == strippedNew {
+						return true
+					}
+					return false
+				},
 			},
 			"state": {
 				Type:     schema.TypeString,
@@ -130,11 +141,11 @@ func (s *APIKeyResourceCrud) Get() (e error) {
 	for _, val := range res.Keys {
 		if val.Fingerprint == fingerprint {
 			s.Res = &val
-			break
+			return nil
 		}
 	}
 
-	return
+	return errors.New("Specified APIKEY does not exist")
 }
 
 func (s *APIKeyResourceCrud) SetData() {

resource_obmcs_identity_api_key_test.go

@@ -38,9 +38,23 @@ func (s *ResourceIdentityAPIKeyTestSuite) SetupTest() {
 	s.Providers = map[string]terraform.ResourceProvider{"baremetal": s.Provider}
 
 	s.Config = `
+		resource "baremetal_identity_user" "t" {
+			name = "name1"
+			description = "desc!"
+		}
 		resource "baremetal_identity_api_key" "t" {
-			user_id = "user_id"
-			key_value = "1"
+			user_id = "${baremetal_identity_user.t.id}"
+			key_value = <<EOF
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtBLQAGmKJ7tpfzYJyqLG
+ZDwHL51+d6T8Z00BnP9CFfzxZZZ48PcYSUHuTyCM8mR5JqYLyH6C8tZ/DKqwxUnc
+ONgBytG3MM42bgxfHIhsZRj5rCz1oqWlSLuXvgww1kuqWnt6r+NtnXog439YsGTH
+RotrTLTdEgOxH0EFP5uHUc9w/Uix7rWU7GB2ra060oeTB/hKpts5U70eI2EI6ec9
+1sJdUIj7xNfBJeQQrz4CFUrkyzL06211CFvhmxH2hA9gBKOqC3rGL8XraHZBhGWn
+mXlrQB7nNKsJrrv5fHwaPDrAY4iNP2W0q3LRpyNigJ6cgRuGJhHa82iHPmxgIx8m
+fwIDAQAB
+-----END PUBLIC KEY-----
+EOF
 		}
 	`
 	s.Config += testProviderConfig()
@@ -86,8 +100,8 @@ func (s *ResourceIdentityAPIKeyTestSuite) TestCreateAPIKey() {
 				ImportStateVerify: true,
 				Config:            s.Config,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(s.ResourceName, "user_id", "user_id"),
-					resource.TestCheckResourceAttr(s.ResourceName, "key_value", "1"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "user_id"),
+					resource.TestCheckResourceAttr(s.ResourceName, "state", s.Res.State),
 				),
 			},
 		},