Merge pull request #236 from oracle/rename

Renaming "baremetal" provider to "oci" and making region a required f…

Author: rcohenma

.github/ISSUE_TEMPLATE

@@ -7,12 +7,12 @@ $ terraform -v
 
 </details>
 
-### Baremetal Provider Version
+### OCI Provider Version
 
 <details>
 # Execute the plugin directly to get the version:
 
-$ \<path-to-plugin\>/terraform-provider-baremetal
+$ \<path-to-plugin\>/terraform-provider-oci
 
 </details>
 

.gitignore

@@ -29,12 +29,14 @@ terraform.tfstate.backup
 tf.plan
 
 # Don't version the default binary
+terraform-provider-oci
 terraform-provider-baremetal
 terraform-Oracle-BareMetal-Provider
 *.orig
 .idea
 terraform-Oracle-BareMetal-Provider.iml
 terraform-provider-baremetal.iml
+terraform-provider-oci.iml
 .env
 crash.log
 terraform-encrypted-des.sh

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to the Terraform provider for Oracle Bare Metal Cloud Services
+# Contributing to the Terraform provider for Oracle Cloud Infrastructure
 
 *Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.*
 

Makefile

@@ -3,11 +3,11 @@ GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
 default: build
 
 clean:
-	rm -rf terraform-provider-baremetal
+	rm -rf terraform-provider-oci
 	rm -rf bin/*
 
 fmt:
-	goimports -w -local github.com/oracle/terraform-provider-baremetal $(GOFMT_FILES)
+	goimports -w -local github.com/oracle/terraform-provider-oci $(GOFMT_FILES)
 
 show_tests:
 	grep -ohi "Test.*$(test).*TestSuite" *.go
@@ -32,16 +32,16 @@ test:
 	TF_ORACLE_ENV=test TF_ACC=1 go test -v -timeout 120m
 
 build:
-	go build -o terraform-provider-baremetal
+	go build -o terraform-provider-oci
 
 version:
 	sed -i '' -e 's/version = ".*"/version = "\
-	$(shell curl -s https://api.github.com/repos/oracle/terraform-provider-baremetal/releases/latest | \
+	$(shell curl -s https://api.github.com/repos/oracle/terraform-provider-oci/releases/latest | \
 	jq -r '.tag_name')\
 	"/g' version.go
 
 release: clean version
-	gox -output "./bin/{{.OS}}_{{.Arch}}/terraform-provider-baremetal"
+	gox -output "./bin/{{.OS}}_{{.Arch}}/terraform-provider-oci"
 
 zip:
 	cd bin \

README.md

@@ -4,22 +4,22 @@
     #   | |_| |  _ < / ___ | |___| |___| |___
     #    \___/|_| \_/_/   \_\____|_____|_____|
 ***
-# Terraform provider for Oracle Bare Metal Cloud Services
+# Terraform provider for Oracle Cloud Infrastructure
 
 [![wercker status](https://app.wercker.com/status/666d2ee10f45dde41189bb03248aadf9/s/master "wercker status")](https://app.wercker.com/project/byKey/666d2ee10f45dde41189bb03248aadf9)
 
-Oracle customers now have access to an enterprise class, developer friendly orchestration tool they can use to manage [Oracle Bare Metal Cloud Service](https://cloud.oracle.com/en_US/bare-metal) resources as well as the [Oracle Compute Cloud](https://github.com/oracle/terraform-provider-compute).
+Oracle customers now have access to an enterprise class, developer friendly orchestration tool they can use to manage [Oracle Cloud Infrastructure](https://cloud.oracle.com/en_US/bare-metal) resources as well as the [Oracle Compute Cloud](https://github.com/oracle/terraform-provider-compute).
 
-This Terraform provider is OSS, available to all OBMCS customers at no charge.
+This Terraform provider is OSS, available to all OCI customers at no charge.
 
 ## Compatibility
 The provider is compatible with Terraform .9.\*.
 
 ### Coverage
-The Terraform provider provides coverage for the entire BMC API, with some minor exceptions.
+The Terraform provider provides coverage for the entire OCI API, with some minor exceptions.
 
 ## Getting started
-Be sure to read the FAQ and Writing Terraform configurations for OBMCS in [/docs](https://github.com/oracle/terraform-provider-baremetal/tree/master/docs).
+Be sure to read the FAQ and Writing Terraform configurations for OCI in [/docs](https://github.com/oracle/terraform-provider-oci/tree/master/docs).
 
 ### Download Terraform
 Download the appropriate **.9.x binary** for your platform.  
@@ -32,8 +32,8 @@ previous v.9.x configuration no longer applies. See note below.
 ### Install Terraform
 https://www.terraform.io/intro/getting-started/install.html
 
-### Get the Oracle Bare Metal Cloud Terraform provider
-https://github.com/oracle/terraform-provider-baremetal/releases
+### Get the Oracle Cloud Infrastructure Terraform provider
+https://github.com/oracle/terraform-provider-oci/releases
 
 Unpack the provider. Terraform v.10.x introduces a change to plugin 
 management where v.9.x configuration no longer applies. To be compatible 
@@ -46,10 +46,10 @@ location:
 ```
 
 Then create the `~/.terraformrc` file that specifies the path to the 
-`baremetal` provider **(only required for v.9.x)**.
+`oci` provider **(only required for v.9.x)**.
 ```
 providers {
-  baremetal = "~/.terraform.d/plugins/terraform-provider-baremetal"
+  oci = "~/.terraform.d/plugins/terraform-provider-oci"
 }
 ```
 
@@ -59,10 +59,10 @@ providers {
 ```
 
 Then create `%APPDATA%/terraform.rc` that specifies the path to the 
-`baremetal` provider **(only required for v.9.x)**.
+`oci` provider **(only required for v.9.x)**.
 ```
 providers {
-  baremetal = "%appdata%/terraform.d/plugins/terraform-provider-baremetal"
+  oci = "%appdata%/terraform.d/plugins/terraform-provider-oci"
 }
 ```
 
@@ -76,7 +76,7 @@ If your TF configurations are limited to a single compartment/user then
 using this `bash_profile` option will work well. For more complex 
 environments you may want to maintain multiple sets of environment 
 variables. 
-See the [compute single instance example](https://github.com/oracle/terraform-provider-baremetal/tree/master/docs/examples/compute/instance) for more info.
+See the [compute single instance example](https://github.com/oracle/terraform-provider-oci/tree/master/docs/examples/compute/instance) for more info.
 
 In your ~/.bash_profile set these variables
 ```
@@ -101,7 +101,7 @@ setx TF_VAR_private_key_path <value>
 The variables won't be set for the current session, exit the terminal and reopen.
 
 ## Deploy an example configuration
-Download the [compute single instance example](https://github.com/oracle/terraform-provider-baremetal/tree/master/docs/examples/compute/instance).
+Download the [compute single instance example](https://github.com/oracle/terraform-provider-oci/tree/master/docs/examples/compute/instance).
 
 Edit it to include the OCID of the compartment you want to create the VCN. Remember that the tenancy OCID is the compartment OCID of your root compartment.
 
@@ -113,19 +113,22 @@ $ terraform plan
 # Make sure the plan looks right.
 $ terraform apply
 ```
-## OBMC resource and datasource details
-https://github.com/oracle/terraform-provider-baremetal/tree/master/docs
+## OCI resource and datasource details
+https://github.com/oracle/terraform-provider-oci/tree/master/docs
 
 ## Getting help
 You can file an issue against the project
-https://github.com/oracle/terraform-provider-baremetal/issues
+https://github.com/oracle/terraform-provider-oci/issues
 
-or meet us in the OBMCS forums
+or meet us in the OCI forums
 https://community.oracle.com/community/cloud_computing/bare-metal
 
 ## Known issues
 
-[Github issues](https://github.com/oracle/terraform-provider-baremetal/issues)
+[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/)
+
+## Documentation and examples for v1.0.18 (when the provider's name was "baremetal") can be found here:
+https://github.com/oracle/terraform-provider-oci/tree/v1.0.18/docs

data_source_obmcs_core_console_history_data.go

@@ -9,7 +9,7 @@ import (
 	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/oracle/terraform-provider-baremetal/crud"
+	"github.com/oracle/terraform-provider-oci/crud"
 )
 
 func ConsoleHistoryDataDatasource() *schema.Resource {

data_source_obmcs_core_console_history_data_test.go

@@ -29,19 +29,19 @@ func (s *CoreConsoleHistoryDataDatasourceTestSuite) SetupTest() {
 	})
 
 	s.Providers = map[string]terraform.ResourceProvider{
-		"baremetal": s.Provider,
+		"oci": s.Provider,
 	}
 	s.Config = instanceConfig + `
-    resource "baremetal_core_console_history" "t" {
-	instance_id = "${baremetal_core_instance.t.id}"
+    resource "oci_core_console_history" "t" {
+	instance_id = "${oci_core_instance.t.id}"
     }
-    data "baremetal_core_console_history_data" "s" {
-      console_history_id = "${baremetal_core_console_history.t.id}"
+    data "oci_core_console_history_data" "s" {
+      console_history_id = "${oci_core_console_history.t.id}"
       length = 10240
     }
   `
 	s.Config += testProviderConfig()
-	s.ResourceName = "data.baremetal_core_console_history_data.s"
+	s.ResourceName = "data.oci_core_console_history_data.s"
 }
 
 func (s *CoreConsoleHistoryDataDatasourceTestSuite) TestResourceShowConsoleHistory() {

data_source_obmcs_core_cpe.go

@@ -8,8 +8,8 @@ import (
 	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/oracle/terraform-provider-baremetal/crud"
-	"github.com/oracle/terraform-provider-baremetal/options"
+	"github.com/oracle/terraform-provider-oci/crud"
+	"github.com/oracle/terraform-provider-oci/options"
 )
 
 func CpeDatasource() *schema.Resource {

data_source_obmcs_core_cpe_test.go

@@ -30,21 +30,21 @@ func (s *DatasourceCoreCpeTestSuite) SetupTest() {
 	})
 
 	s.Providers = map[string]terraform.ResourceProvider{
-		"baremetal": s.Provider,
+		"oci": s.Provider,
 	}
 	s.Config = `
-resource "baremetal_core_cpe" "t" {
+resource "oci_core_cpe" "t" {
     compartment_id = "${var.compartment_id}"
     display_name = "name1"
     ip_address = "142.10.10.2"
 }
 
-data "baremetal_core_cpes" "s" {
-    compartment_id = "${baremetal_core_cpe.t.compartment_id}"
+data "oci_core_cpes" "s" {
+    compartment_id = "${oci_core_cpe.t.compartment_id}"
 }
   `
 	s.Config += testProviderConfig()
-	s.ResourceName = "data.baremetal_core_cpes.s"
+	s.ResourceName = "data.oci_core_cpes.s"
 
 }
 

data_source_obmcs_core_dhcp_options.go

@@ -8,8 +8,8 @@ import (
 	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/hashicorp/terraform/helper/schema"
 
-	"github.com/oracle/terraform-provider-baremetal/crud"
-	"github.com/oracle/terraform-provider-baremetal/options"
+	"github.com/oracle/terraform-provider-oci/crud"
+	"github.com/oracle/terraform-provider-oci/options"
 )
 
 func DHCPOptionsDatasource() *schema.Resource {