Merge pull request #53 from MustWin/master

Fixes #42, Fixes #48, Fixes #45 (unable to repro with these changes), Fixes #43.

Author: craigcarl-oracle

.gitignore

@@ -34,6 +34,7 @@ terraform-Oracle-BareMetal-Provider
 *.orig
 .idea
 terraform-Oracle-BareMetal-Provider.iml
+terraform-provider-baremetal.iml
 .env
 crash.log
 terraform-encrypted-des.sh

README.md

@@ -96,6 +96,8 @@ or meet us in the OBMCS forums
 https://community.oracle.com/community/cloud_computing/bare-metal
 
 ## Known serious bugs
+See [Issues.](https://github.com/oracle/terraform-provider-baremetal/issues)
+
 There are 2 issues with the potential for unexpected data loss.
 1. [Issue #44, running apply in an enviroment where a subnet has multiple attached Security Lists can cause all of the instances in the subnet to be terminated and re-created.](https://github.com/oracle/terraform-provider-baremetal/issues/44)  
 2. [Issue #45, not currently reproducible. Running apply in an enviroment with attached block volumes can cause all of the block volumes to be temporarily detatched and reattached. This leads to block volume IO interruption.](https://github.com/oracle/terraform-provider-baremetal/issues/45)  

client/bare_metal_client.go

@@ -157,6 +157,6 @@ type BareMetalClient interface {
 	UpdateUser(id string, opts *baremetal.UpdateIdentityOptions) (res *baremetal.User, e error)
 	UpdateVirtualNetwork(id string, opts *baremetal.IfMatchDisplayNameOptions) (vcn *baremetal.VirtualNetwork, e error)
 	UpdateVolume(id string, opts *baremetal.UpdateOptions) (res *baremetal.Volume, e error)
-	UpdateVolumeBackup(id string, opts *baremetal.UpdateBackupOptions) (vol *baremetal.VolumeBackup, e error)
+	UpdateVolumeBackup(id string, opts *baremetal.IfMatchDisplayNameOptions) (vol *baremetal.VolumeBackup, e error)
 	UploadAPIKey(userID, key string, opts *baremetal.RetryTokenOptions) (apiKey *baremetal.APIKey, e error)
 }

client/mocks/bare_metal_client.go

@@ -1,7 +1,7 @@
 package mocks
 
 import baremetal "github.com/MustWin/baremetal-sdk-go"
-import client "github.com/oracle/terraform-provider-baremetal/client"
+
 import mock "github.com/stretchr/testify/mock"
 
 // BareMetalClient is an autogenerated mock type for the BareMetalClient type
@@ -2977,11 +2977,11 @@ func (_m *BareMetalClient) UpdateVolume(id string, opts *baremetal.UpdateOptions
 }
 
 // UpdateVolumeBackup provides a mock function with given fields: id, opts
-func (_m *BareMetalClient) UpdateVolumeBackup(id string, opts *baremetal.UpdateBackupOptions) (*baremetal.VolumeBackup, error) {
+func (_m *BareMetalClient) UpdateVolumeBackup(id string, opts *baremetal.IfMatchDisplayNameOptions) (*baremetal.VolumeBackup, error) {
 	ret := _m.Called(id, opts)
 
 	var r0 *baremetal.VolumeBackup
-	if rf, ok := ret.Get(0).(func(string, *baremetal.UpdateBackupOptions) *baremetal.VolumeBackup); ok {
+	if rf, ok := ret.Get(0).(func(string, *baremetal.IfMatchDisplayNameOptions) *baremetal.VolumeBackup); ok {
 		r0 = rf(id, opts)
 	} else {
 		if ret.Get(0) != nil {
@@ -2990,7 +2990,7 @@ func (_m *BareMetalClient) UpdateVolumeBackup(id string, opts *baremetal.UpdateB
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(string, *baremetal.UpdateBackupOptions) error); ok {
+	if rf, ok := ret.Get(1).(func(string, *baremetal.IfMatchDisplayNameOptions) error); ok {
 		r1 = rf(id, opts)
 	} else {
 		r1 = ret.Error(1)
@@ -3021,5 +3021,3 @@ func (_m *BareMetalClient) UploadAPIKey(userID string, key string, opts *baremet
 
 	return r0, r1
 }
-
-var _ client.BareMetalClient = (*BareMetalClient)(nil)

core/image_datasource.go

@@ -24,6 +24,10 @@ func ImageDatasource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"display_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"operating_system": {
 				Type:     schema.TypeString,
 				Optional: true,

core/image_datasource_crud.go

@@ -26,6 +26,9 @@ func (s *ImageDatasourceCrud) Get() (e error) {
 	if val, ok := s.D.GetOk("operating_system_version"); ok {
 		opts.OperatingSystemVersion = val.(string)
 	}
+	if val, ok := s.D.GetOk("display_name"); ok {
+		opts.DisplayName = val.(string)
+	}
 
 	s.Res = &baremetal.ListImages{Images: []baremetal.Image{}}
 

core/virtual_network_datasource_crud.go

@@ -53,7 +53,7 @@ func (s *VirtualNetworkDatasourceCrud) SetData() {
 			res := map[string]string{
 				"cidr_block":               v.CidrBlock,
 				"compartment_id":           v.CompartmentID,
-				"default_routing_table_id": v.DefaultRoutingTableID,
+				"default_route_table_id": v.DefaultRouteTableID,
 				"default_security_list_id": v.DefaultSecurityListID,
 				"display_name":             v.DisplayName,
 				"id":                       v.ID,

core/virtual_network_resource.go

@@ -25,7 +25,7 @@ func VirtualNetworkResource() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"default_routing_table_id": {
+			"default_route_table_id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},

core/virtual_network_resource_crud.go

@@ -67,7 +67,7 @@ func (s *VirtualNetworkResourceCrud) Update() (e error) {
 func (s *VirtualNetworkResourceCrud) SetData() {
 	s.D.Set("cidr_block", s.Res.CidrBlock)
 	s.D.Set("compartment_id", s.Res.CompartmentID)
-	s.D.Set("default_routing_table_id", s.Res.DefaultRoutingTableID)
+	s.D.Set("default_route_table_id", s.Res.DefaultRouteTableID)
 	s.D.Set("default_security_list_id", s.Res.DefaultSecurityListID)
 	s.D.Set("display_name", s.Res.DisplayName)
 	s.D.Set("state", s.Res.State)

core/volume_attachment_resource.go

@@ -3,9 +3,11 @@
 package core
 
 import (
+	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
+
 	"github.com/oracle/terraform-provider-baremetal/client"
 	"github.com/oracle/terraform-provider-baremetal/crud"
-	"github.com/hashicorp/terraform/helper/schema"
 )
 
 func VolumeAttachmentResource() *schema.Resource {
@@ -14,33 +16,42 @@ func VolumeAttachmentResource() *schema.Resource {
 		Read:   readVolumeAttachment,
 		Delete: deleteVolumeAttachment,
 		Schema: map[string]*schema.Schema{
+			//// Required ////
 			"attachment_type": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringInSlice([]string{"iscsi"}, false),
+			},
+			"compartment_id": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
-			"availability_domain": {
+			"instance_id": {
 				Type:     schema.TypeString,
-				Computed: true,
+				Required: true,
+				ForceNew: true,
 			},
-			"compartment_id": {
+			"volume_id": {
 				Type:     schema.TypeString,
 				Required: true,
 				ForceNew: true,
 			},
-			"display_name": {
+			//// Computed ////
+			"id": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"id": {
+			"availability_domain": {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"instance_id": {
+			"display_name": {
 				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Computed: true,
 			},
+			// aka lifecycleState
 			"state": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -49,10 +60,27 @@ func VolumeAttachmentResource() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"volume_id": {
+			// The following are only computed if type == "iscsi"
+			"chap_secret": {
 				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Computed: true,
+			},
+			"chap_username": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"ipv4": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"iqn": {
+				// iSCSI Qualified Name per RFC 3720
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"port": {
+				Type:     schema.TypeInt,
+				Computed: true,
 			},
 		},
 	}