Replace bmcs-go-sdk with oci-go-sdk

Author: alexng-canuck

.gitignore

@@ -8,6 +8,7 @@ tf.plan
 .DS_Store
 .env
 .idea
+.vscode
 .wercker
 terraform-encrypted-des.sh
 terraform-encrypted.sh
@@ -16,4 +17,7 @@ bin/*
 obmc-container-clean
 terraform-provider-oci
 *.iml
+debug.test
+*.iws
+*.ipr
 docs/solutions/rhel74_image/ipxe.sh

CHANGELOG.md

@@ -3,6 +3,30 @@ All notable changes to this project are documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## 2.1.0 - 2018-03-08
+More details for the changes introduced in 2.1.0 can be found [here](https://github.com/oracle/terraform-provider-oci/wiki/Details-for-v2.1.0-Release)
+
+### Added
+- [Client side filtering](https://github.com/oracle/terraform-provider-oci/blob/master/docs/Filters.md) is now enabled for all data sources that return a list.
+- Some Core data sources now support server side filtering by `display_name` and `state`.
+- New optional parameters and fields have been added to existing resources and data sources to support new functionality added by the services.
+- Documentation files have been updated and improved. Documentation files for resources and data sources of the same entity have now been consolidated into one file.
+
+### Deprecated
+- `limit` and `page` parameters in data sources have been deprecated. All list data sources loop through all the pages and return one aggregated list.  
+- The `time_modified` field was deprecated from a few resources as it is no longer set by the service.
+
+### Fixed
+- Updates to fields in `oci_objectstorage_preauthrequest` resource will force the destruction and recreation of the resource. Updates to fields in this resource had no effect earlier.
+- Updating some fields resulted in nothing happening. This has been fixed.
+- Unexpected destruction and recreation of `oci_objectstorage_object` was fixed by constraining all keys in the `metadata` map to be lower case.
+
+### Notes
+- With this release we started using the new official [OCI Go SDK](https://github.com/oracle/oci-go-sdk). Widespread changes to the source code were needed to make this happen.
+- Removing optional parameters from a created resource will not result in a difference and the value for that field will remain as it was. If you want to reset the field to the default value returned by the service for that field you will have to taint the resource to destroy it and recreate it. 
+- If upgrading the OCI provider from v1.x.x, see [this wiki](https://github.com/oracle/terraform-provider-oci/wiki/Oracle-Terraform-Provider-Name-Change) for migration steps.
+- See docs for this version [here](https://github.com/oracle/terraform-provider-oci/tree/v2.1.0).
+
 ## 2.0.7 - 2018-02-08
 
 ### Added
@@ -16,7 +40,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - If upgrading from v1, see [this wiki](https://github.com/oracle/terraform-provider-oci/wiki/Oracle-Terraform-Provider-Name-Change) for migration steps.
 - See docs for this version [here](https://github.com/oracle/terraform-provider-oci/tree/v2.0.7).
 
-
 ## 2.0.6 - 2018-01-08
 
 ### Added

Makefile

@@ -1,6 +1,6 @@
 GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
 
-default: build
+default: fmt build
 build: ;go build -o terraform-provider-oci
 clean: ;@rm -rf terraform-provider-oci  rm -rf bin/*  rm bin
 fmt: ;goimports -w -local github.com/oracle/terraform-provider-oci $(GOFMT_FILES)
@@ -28,12 +28,12 @@ ifdef run
   cmd := $(cmd) -run $(run)
 endif
 ifdef debug
-  cmd := DEBUG=true TF_LOG=DEBUG $(cmd)
+  cmd := DEBUG=true TF_LOG=DEBUG OCI_GO_SDK_DEBUG=1 $(cmd)
 endif
 test: ;$(cmd)
 
 test_print:
-	@grep -ohi "Test.*$(test).*TestSuite" *.go
-	@grep -oh "TestAcc.*\*testing.T" *.go | cut -d \( -f 1
+	@grep -ohi "Test.*$(test).*TestSuite" provider/*.go
+	@grep -oh "TestAcc.*\*testing.T" provider/*.go | cut -d \( -f 1
 
 .PHONY: build clean fmt release zip test test_print

README.md

@@ -142,5 +142,3 @@ https://community.oracle.com/community/cloud_computing/bare-metal
 
 [Github issues](https://github.com/oracle/terraform-provider-oci/issues)
 
-## About the provider
-This provider was written on behalf of Oracle by [MustWin.](http://mustwin.com/)

crud/helpers.go

@@ -3,7 +3,9 @@
 package crud
 
 import (
+	"context"
 	"errors"
+	"fmt"
 	"log"
 	"reflect"
 	"strconv"
@@ -12,7 +14,8 @@ import (
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/oracle/bmcs-go-sdk"
+	oci_common "github.com/oracle/oci-go-sdk/common"
+	oci_load_balancer "github.com/oracle/oci-go-sdk/loadbalancer"
 )
 
 var (
@@ -27,9 +30,12 @@ var (
 	}
 )
 
+const (
+	FAILED = "FAILED"
+)
+
 type BaseCrud struct {
-	D      *schema.ResourceData
-	Client *baremetal.Client
+	D *schema.ResourceData
 }
 
 func (s *BaseCrud) VoidState() {
@@ -46,7 +52,18 @@ func (s *BaseCrud) setState(sync StatefulResource) error {
 		// Yes, this "valid"ation is terrible
 		if resourceReferenceValue := v.FieldByName(key); resourceReferenceValue.IsValid() {
 			if resourceValue := resourceReferenceValue.Elem(); resourceValue.IsValid() {
-				if stateValue := resourceValue.FieldByName("State"); stateValue.IsValid() {
+				// In rare cases, the kind for "Res" is an interface (e.g. if the resource itself is
+				// a polymorphic type, opposed to a field on the resource). Use Elem() to get the value
+				// the interface contains, otherwise the ".FieldByName()" method will throw.
+				if resourceValue.Kind() == reflect.Interface {
+					resourceValue = resourceValue.Elem()
+				}
+
+				if stateValue := resourceValue.FieldByName("LifecycleState"); stateValue.IsValid() {
+					currentState := stateValue.String()
+					log.Printf("[DEBUG] crud.BaseCrud.setState: state: %#v", currentState)
+					return s.D.Set("state", currentState)
+				} else if stateValue := resourceValue.FieldByName("State"); stateValue.IsValid() {
 					currentState := stateValue.String()
 					log.Printf("[DEBUG] crud.BaseCrud.setState: state: %#v", currentState)
 					return s.D.Set("state", currentState)
@@ -82,59 +99,61 @@ func handleMissingResourceError(sync ResourceVoider, err *error) {
 	}
 }
 
-func LoadBalancerResourceID(res interface{}, workReq *baremetal.WorkRequest) (id *string, workReqSucceeded bool) {
+func LoadBalancerResourceID(res interface{}, workReq *oci_load_balancer.WorkRequest) (id *string, workReqSucceeded bool) {
 	v := reflect.ValueOf(res).Elem()
 	if v.IsValid() {
 		// This is super fugly. It's this way because the LB API has no convention for ID formats.
 
 		// Load balancer
-		id := v.FieldByName("ID")
-		if id.IsValid() {
-			s := id.String()
+		id := v.FieldByName("Id")
+		if id.IsValid() && !id.IsNil() {
+			s := id.Elem().String()
 			return &s, false
 		}
 		// backendset, listener
 		name := v.FieldByName("Name")
-		if name.IsValid() {
-			s := name.String()
+		if name.IsValid() && !name.IsNil() {
+			s := name.Elem().String()
 			return &s, false
 		}
 		// certificate
 		certName := v.FieldByName("CertificateName")
-		if certName.IsValid() {
-			s := certName.String()
+		if certName.IsValid() && !certName.IsNil() {
+			s := certName.Elem().String()
 			return &s, false
 		}
-		// backend
-		ip := v.FieldByName("ip_address")
-		port := v.FieldByName("port")
-		if ip.IsValid() && port.IsValid() {
-			s := ip.String() + ":" + strconv.Itoa(int(int(port.Int())))
+		// backend TODO The following can probably be removed because the Backend object has a Name parameter)
+		ip := v.FieldByName("IpAddress")
+		port := v.FieldByName("Port")
+		if ip.IsValid() && !ip.IsNil() && port.IsValid() && !port.IsNil() {
+			s := ip.Elem().String() + ":" + strconv.Itoa(int(int(port.Elem().Int())))
 			return &s, false
 		}
 	}
 	if workReq != nil {
-		if workReq.State == baremetal.WorkRequestSucceeded {
+		if workReq.LifecycleState == oci_load_balancer.WorkRequestLifecycleStateSucceeded {
 			return nil, true
 		} else {
-			return &workReq.ID, false
+			return workReq.Id, false
 		}
 	}
 	return nil, false
 }
 
-func LoadBalancerResourceGet(s BaseCrud, workReq *baremetal.WorkRequest) (id string, stillWorking bool, err error) {
-	id = s.D.Id()
+func LoadBalancerResourceGet(client *oci_load_balancer.LoadBalancerClient, d *schema.ResourceData, wr *oci_load_balancer.WorkRequest, retryOptions ...oci_common.RetryPolicyOption) (id string, stillWorking bool, err error) {
+	id = d.Id()
 	// NOTE: if the id is for a work request, refresh its state and loadBalancerID.
 	if strings.HasPrefix(id, "ocid1.loadbalancerworkrequest.") {
-		updatedWorkReq, err := s.Client.GetWorkRequest(id, nil)
+		getWorkRequestRequest := oci_load_balancer.GetWorkRequestRequest{}
+		getWorkRequestRequest.WorkRequestId = &id
+		updatedWorkRes, err := client.GetWorkRequest(context.Background(), getWorkRequestRequest, retryOptions...)
 		if err != nil {
 			return "", false, err
 		}
-		if workReq != nil {
-			*workReq = *updatedWorkReq
-			s.D.Set("state", workReq.State)
-			if workReq.State == baremetal.WorkRequestSucceeded {
+		if wr != nil {
+			*wr = updatedWorkRes.WorkRequest
+			d.Set("state", wr.LifecycleState)
+			if wr.LifecycleState == oci_load_balancer.WorkRequestLifecycleStateSucceeded {
 				return "", false, nil
 			}
 		}
@@ -143,30 +162,31 @@ func LoadBalancerResourceGet(s BaseCrud, workReq *baremetal.WorkRequest) (id str
 	return id, false, nil
 }
 
-func LoadBalancerWaitForWorkRequest(client *baremetal.Client, d *schema.ResourceData, wr *baremetal.WorkRequest) error {
+func LoadBalancerWaitForWorkRequest(client *oci_load_balancer.LoadBalancerClient, d *schema.ResourceData, wr *oci_load_balancer.WorkRequest, retryOptions ...oci_common.RetryPolicyOption) error {
 	var e error
 	stateConf := &resource.StateChangeConf{
 		Pending: []string{
-			baremetal.ResourceWaitingForWorkRequest,
-			baremetal.WorkRequestInProgress,
-			baremetal.WorkRequestAccepted,
+			string(oci_load_balancer.WorkRequestLifecycleStateInProgress),
+			string(oci_load_balancer.WorkRequestLifecycleStateAccepted),
 		},
 		Target: []string{
-			baremetal.ResourceSucceededWorkRequest,
-			baremetal.WorkRequestSucceeded,
-			baremetal.ResourceFailed,
+			string(oci_load_balancer.WorkRequestLifecycleStateSucceeded),
+			string(oci_load_balancer.WorkRequestLifecycleStateFailed),
 		},
 		Refresh: func() (interface{}, string, error) {
-			wr, e = client.GetWorkRequest(wr.ID, nil)
-			return wr, wr.State, e
+			getWorkRequestRequest := oci_load_balancer.GetWorkRequestRequest{}
+			getWorkRequestRequest.WorkRequestId = wr.Id
+			workRequestResponse, err := client.GetWorkRequest(context.Background(), getWorkRequestRequest, retryOptions...)
+			wr = &workRequestResponse.WorkRequest
+			return wr, string(wr.LifecycleState), err
 		},
 		Timeout: d.Timeout(schema.TimeoutCreate),
 	}
 
 	if _, e = stateConf.WaitForState(); e != nil {
 		return e
 	}
-	if wr.State == baremetal.ResourceFailed {
+	if wr.LifecycleState == oci_load_balancer.WorkRequestLifecycleStateFailed {
 		return errors.New("Resource creation failed, state FAILED")
 	}
 	return nil
@@ -214,8 +234,7 @@ func CreateResource(d *schema.ResourceData, sync ResourceCreator) (e error) {
 
 	if stateful, ok := sync.(StatefullyCreatedResource); ok {
 		e = waitForStateRefresh(stateful, d.Timeout(schema.TimeoutCreate), stateful.CreatedPending(), stateful.CreatedTarget())
-
-		if stateful.State() == baremetal.WorkRequestFailed {
+		if stateful.State() == string(oci_load_balancer.WorkRequestLifecycleStateFailed) {
 			// Remove resource from state if asynchronous work request has failed so that it is recreated on next apply
 			// TODO: automatic retry on WorkRequestFailed
 			sync.VoidState()
@@ -245,7 +264,7 @@ func ReadResource(sync ResourceReader) (e error) {
 	// Remove resource from state if it has been terminated so that it is recreated on next apply
 	if dr, ok := sync.(StatefullyDeletedResource); ok {
 		for _, target := range dr.DeletedTarget() {
-			if dr.State() == target && dr.State() != baremetal.ResourceSucceededWorkRequest && dr.State() != baremetal.WorkRequestSucceeded {
+			if dr.State() == target && dr.State() != string(oci_load_balancer.WorkRequestLifecycleStateSucceeded) {
 				dr.VoidState()
 				return
 			}
@@ -327,7 +346,7 @@ func waitForStateRefresh(sync StatefulResource, timeout time.Duration, pending,
 		handleMissingResourceError(sync, &e)
 		return
 	}
-	if sync.State() == baremetal.ResourceFailed || sync.State() == baremetal.WorkRequestFailed {
+	if sync.State() == FAILED {
 		return errors.New("Resource creation failed, state FAILED")
 	}
 
@@ -346,7 +365,29 @@ func EqualIgnoreCaseSuppressDiff(key string, old string, new string, d *schema.R
 	return strings.EqualFold(old, new)
 }
 
-func ImportDefaultResource(d *schema.ResourceData, value interface{}) ([]*schema.ResourceData, error) {
-	err := d.Set("manage_default_resource_id", d.Id())
-	return []*schema.ResourceData{d}, err
+func FieldDeprecated(deprecatedFieldName string) string {
+	return fmt.Sprintf("The '%s' field has been deprecated. It is no longer supported.", deprecatedFieldName)
+}
+
+func FieldDeprecatedForAnother(deprecatedFieldName string, newFieldName string) string {
+	return fmt.Sprintf("The '%s' field has been deprecated. Please use '%s' instead.", deprecatedFieldName, newFieldName)
+}
+
+// GenerateDataSourceID generates an ID for the data source based on the current time stamp.
+func GenerateDataSourceID() string {
+	// Important, if you don't have an ID, make one up for your datasource
+	// or things will end in tears.
+
+	// Consider prefixing with resource name or useful identifier beyond just a timestamp.
+	return time.Now().UTC().String()
+}
+
+// stringsToSet encodes an []string into a
+// *schema.Set in the appropriate structure for the schema
+func StringsToSet(ss []string) *schema.Set {
+	st := &schema.Set{F: schema.HashString}
+	for _, s := range ss {
+		st.Add(s)
+	}
+	return st
 }

crud/interface.go

@@ -4,8 +4,6 @@ package crud
 
 import (
 	"time"
-
-	"github.com/oracle/bmcs-go-sdk"
 )
 
 // Common interfaces
@@ -96,13 +94,3 @@ type StatefullyDeletedResource interface {
 	DeletedPending() []string
 	DeletedTarget() []string
 }
-
-type IdentitySync struct{}
-
-func (s *IdentitySync) CreatedPending() []string {
-	return []string{baremetal.ResourceCreating}
-}
-
-func (s *IdentitySync) CreatedTarget() []string {
-	return []string{baremetal.ResourceCreated}
-}

docs/Managing Default Resources.md

@@ -1,14 +1,14 @@
 ## Managing Default Virtual Cloud Network Resources
 
-When you create an [oci_core_virtual_network](https://github.com/oracle/terraform-provider-oci/blob/master/docs/resources/core/virtual_networks.md)
+When you create an [oci_core_vcn](https://github.com/oracle/terraform-provider-oci/blob/master/docs/core/vcns.md)
 resource, it will also create the following associated resources by default.
 
-- [oci_core_security_list](https://github.com/oracle/terraform-provider-oci/blob/master/docs/resources/core/security_list.md)
-- [oci_core_dhcp_options](https://github.com/oracle/terraform-provider-oci/blob/master/docs/resources/core/dhcp_option.md)
-- [oci_core_route_table](https://github.com/oracle/terraform-provider-oci/blob/master/docs/resources/core/route_table.md)
+- [oci_core_security_list](https://github.com/oracle/terraform-provider-oci/blob/master/docs/core/security_lists.md)
+- [oci_core_dhcp_options](https://github.com/oracle/terraform-provider-oci/blob/master/docs/core/dhcp_options.md)
+- [oci_core_route_table](https://github.com/oracle/terraform-provider-oci/blob/master/docs/core/route_tables.md)
 
 These default resources will be implicitly created even if they are not specified in the Terraform configuration.
-Their OCIDs are returned by the following attributes under the `oci_core_virtual_network` resource:
+Their OCIDs are returned by the following attributes under the `oci_core_vcn` resource:
 
 - `default_security_list_id`
 - `default_dhcp_options_id`
@@ -32,15 +32,15 @@ Consequently, the `compartment_id` and `vcn_id` are no longer necessary for defa
 #### Modifying a VCN's default DHCP options
 
 ```
-resource "oci_core_virtual_network" "vcn1" {
+resource "oci_core_vcn" "vcn1" {
   cidr_block = "10.0.0.0/16"
   dns_label = "vcn1"
   compartment_id = "${var.compartment_ocid}"
   display_name = "vcn1"
 }
 
 resource "oci_core_default_dhcp_options" "default-dhcp-options" {
-  manage_default_resource_id = "${oci_core_virtual_network.vcn1.default_dhcp_options_id}"
+  manage_default_resource_id = "${oci_core_vcn.vcn1.default_dhcp_options_id}"
 
   // required
   options {
@@ -60,7 +60,7 @@ For more detailed examples, refer to [docs/examples/networking/vcn_default](http
 
 ### Limitations
 
-Default resources can only be removed when the associated `oci_core_virtual_network resource` is removed. When attempting
+Default resources can only be removed when the associated `oci_core_vcn resource` is removed. When attempting
 a targeted removal of a default resource, the resource will be removed from the Terraform state file but the resource may
 still exist in OCI with empty settings.