Merge in oracle master

Author: mikejihbe

Makefile

@@ -28,7 +28,13 @@ test_acceptance:
 build:
 	go build -o terraform-provider-baremetal
 
-cross: test_acceptance
+version:
+	sed -i '' -e 's/version = ".*"/version = "\
+	$(shell curl -s https://api.github.com/repos/oracle/terraform-provider-baremetal/releases/latest | \
+	jq -r '.tag_name')\
+	"/g' version.go
+
+release: version test_acceptance
 	gox -output "./bin/{{.OS}}_{{.Arch}}/terraform-provider-baremetal"
 
 zip:
@@ -39,4 +45,4 @@ zip:
 	&& tar -czvf linux.tar.gz linux_386 linux_amd64 linux_arm \
 	&& tar -czvf openbsd.tar.gz openbsd_386 openbsd_amd64
 
-.PHONY: clean fmt build cross test test_unit zip
+.PHONY: clean fmt build release test test_unit zip version

README.md

@@ -81,9 +81,9 @@ Edit it to include the OCID of the compartment you want to create the VCN. Remem
 
 You should always plan, then apply a configuration -
 ```
-$ terraform plan ./simple_vcn
+$ terraform plan ./single_instance
 # Make sure the plan looks right.
-$ terraform apply ./simple_vcn
+$ terraform apply ./single_instance
 ```
 ## OBMC resource and datasource details
 https://github.com/oracle/terraform-provider-baremetal/tree/master/docs

crud/helpers.go

@@ -3,18 +3,17 @@
 package crud
 
 import (
+	"errors"
 	"log"
 	"reflect"
+	"strconv"
 	"strings"
 	"time"
 
+	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
-
 	"github.com/oracle/terraform-provider-baremetal/client"
-	"github.com/MustWin/baremetal-sdk-go"
-	"errors"
-	"strconv"
 )
 
 var (
@@ -71,9 +70,10 @@ func handleMissingResourceError(sync ResourceVoider, err *error) {
 
 	if err != nil {
 		if strings.Contains((*err).Error(), "does not exist") ||
-		strings.Contains((*err).Error(), " not present in ") ||
-		strings.Contains((*err).Error(), "resource not found") ||
-		(strings.Contains((*err).Error(), "Load balancer") && strings.Contains((*err).Error(), " has no ")) {
+			strings.Contains((*err).Error(), " not present in ") ||
+			strings.Contains((*err).Error(), "resource not found") ||
+			(strings.Contains((*err).Error(), "Load balancer") && strings.Contains((*err).Error(), " has no ")) {
+
 			log.Println("[DEBUG] Object does not exist, voiding resource and nullifying error")
 			sync.VoidState()
 			*err = nil

docs/examples/DBsystems/README.md

@@ -8,9 +8,9 @@
 This example launches a Database System into an existing subnet and because it's an anti-pattern to launch an DBSystem in a subnet with Internet access, behind an existing bastion host. Database Systems don't support user-data scripts but there are still use cases where you might want to execute a script once the DBNode starts so we use the `file` and `remote-exec` provisoners to get through the bastion host and onto the instance. The configuration outputs the private IP address of the instance.
 
 ### Using this example
-* Update env-var with the required information. Most examples use the same set of environment variables so you only need to do this once.
-* Source env-var -
-  * `$ . env-var`
+* Update env-vars with the required information. Most examples use the same set of environment variables so you only need to do this once.
+* Source env-vars -
+  * `$ . env-vars`
 * Update `variables.tf` with your launch options and bastion host IP.  
 
 ### Files in the configuration

docs/examples/clusters/Mongodb/README.md

@@ -10,9 +10,9 @@ This configuration generally implements this - [https://community.oracle.com/com
 It creates a VNC with a route table, Internet Gateway, Security Lists, a bastion subnet and 2 private subnets for the MongoDB instances. 
 
 ### Using this example
-* Update env-var with the required information. Most examples use the same set of environment variables so you only need to do this once.
-* Source env-var
-  * `$ . env-var`
+* Update env-vars with the required information. Most examples use the same set of environment variables so you only need to do this once.
+* Source env-vars
+  * `$ . env-vars`
 * Update `variables.tf` with your instance options.
 
 ### Files in the configuration

docs/examples/compute/single-instance/README.md renamed to docs/examples/compute/single_instance/README.md

@@ -8,9 +8,9 @@
 This example launches an instance into an existing subnet, includes a user-data script in the instance launch, remote executes a command, and outputs the public and private IP address of the instance.
 
 ### Using this example
-* Update env-var with the required information. Most examples use the same set of environment variables so you only need to do this once.
-* Source env-var
-  * `$ . env-var`
+* Update env-vars with the required information. Most examples use the same set of environment variables so you only need to do this once.
+* Source env-vars
+  * `$ . env-vars`
 * Update `variables.tf` with your instance options.
 
 ### Files in the configuration