Merge pull request #1390 from terraform-providers/release_gh

Releasing version 4.30.0

Author: zexinwanoci

.go-version

@@ -1,2 +1,2 @@
-1.12.3
+1.15.5
 

.travis.yml

@@ -4,7 +4,7 @@ services:
 - docker
 language: go
 go:
-- "1.12.3"
+- "1.15.5"
 
 install:
 # This script is used by the Travis build to install a cookie for

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.30.0 (Unreleased)
+
+### Added
+- Support for Higher performance volumes added to `core`
+- Support for End-to-end encryption for Bare Metal hosts to `core`
+- Support for Java Management Service
+
+### Fixed
+- Removed `oci_artifacts_container_configuration` from resource discovery due to its non-applicability.
+- Fix documentation for `oci_mysql_heat_wave_cluster` and `oci_core_drg_attachment`
+
 ## 4.29.0 (June 02, 2021)
 
 ### Added

GNUmakefile

@@ -34,6 +34,11 @@ sweep: fmtcheck gomodenv
 testacc: build
 	TF_ACC=1 $(prefix) go test $(TEST) -v $(TESTARGS) $(run_regex) $(test_tags) -timeout $(timeout)
 
+localinstall:
+	mkdir -p $(GOPATH)/bin/registry.terraform.io/hashicorp/oci/1.0.0/darwin_amd64
+	cp $(GOPATH)/bin/terraform-provider-oci $(HOME)/.terraform.d/plugins/registry.terraform.io/hashicorp/oci/1.0.0/darwin_amd64
+	cp $(GOPATH)/bin/terraform-provider-oci $(GOPATH)/bin/registry.terraform.io/hashicorp/oci/1.0.0/darwin_amd64
+
 vet:
 	@echo "go vet ."
 	@go vet $$(go list ./... | grep -v vendor/) ; if [ $$? -ne 0 ]; then \

README.md

@@ -20,9 +20,9 @@ Requirements
 ------------
 
 - [Terraform](https://www.terraform.io/downloads.html) v0.10.1 or greater
-- [Go](https://golang.org/doc/install) 1.12.3 (recommended)
+- [Go](https://golang.org/doc/install) 1.15.5 (recommended)
 
-Note: You may use any version 1.8 or above to build the provider. However, the `goimports`, `go vet`, and `gofmt` code checks will only pass when using version 1.12.
+Note: You may use any version 1.8 or above to build the provider. However, the `goimports`, `go vet`, and `gofmt` code checks will only pass when using version 1.15.
 
 
 Building the Provider

examples/database/db_systems/db_exacs/resources.tf

@@ -31,26 +31,27 @@ resource "oci_database_db_home" "test_db_home_vm_cluster" {
 
   database {
     admin_password      = "BEstrO0ng_#11"
-    backup_id           = oci_database_backup.test_backup.id
-    backup_tde_password = "BEstrO0ng_#11"
     db_name             = "dbVMClus"
     character_set       = "AL32UTF8"
     ncharacter_set      = "AL16UTF16"
     db_workload         = "OLTP"
     pdb_name            = "pdbName"
-
+    db_backup_config {
+      auto_backup_enabled = false
+    }
     freeform_tags = {
       "Department" = "Finance"
     }
   }
 
-  # VM_CLUSTER_NONE can also be specified as a source for cloud VM clusters.
-  source       = "VM_CLUSTER_BACKUP"
+  # VM_CLUSTER_BACKUP can also be specified as a source for cloud VM clusters.
+  source       = "VM_CLUSTER_NEW"
+  db_version   = "19.0.0.0"
   display_name = "createdDbHome"
 }
 
 resource "oci_database_backup" "test_backup" {
   depends_on   = ["oci_database_db_home.test_db_home_vm_cluster"]
-  database_id  = oci_database_db_home.test_db_home_vm_cluster.database.id
+  database_id  = oci_database_db_home.test_db_home_vm_cluster.database.0.id
   display_name = "FirstBackup"
 }

examples/jms/fleet.tf

@@ -0,0 +1,64 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_ocid" {}
+
+variable "fleet_description" {
+  default = "Example Fleet created by Terraform"
+}
+
+variable "fleet_display_name" {
+  default = "Example Fleet"
+}
+
+variable "fleet_freeform_tags" {
+  default = { "bar-key" = "value" }
+}
+
+variable "fleet_defined_tags" {
+  default  = { "example-tag-namespace-all.example-tag" = "value" }
+}
+
+variable "fleet_id" {
+  default = "id"
+}
+
+variable "fleet_state" {
+  default = "ACTIVE"
+}
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+resource "oci_jms_fleet" "example_fleet" {
+  #Required
+  compartment_id = var.compartment_ocid
+  display_name   = var.fleet_display_name
+
+  #Optional
+  description   = var.fleet_description
+  freeform_tags = var.fleet_freeform_tags
+
+  # Create the Tag namespace in OCI before enabling
+  # See user guide: https://docs.oracle.com/en-us/iaas/Content/Tagging/Tasks/managingtagsandtagnamespaces.htm
+  # defined_tags  = var.fleet_defined_tags
+}
+
+data "oci_jms_fleets" "example_fleets" {
+
+  #Optional
+  compartment_id = var.compartment_ocid
+  display_name   = var.fleet_display_name
+  id             = var.fleet_id
+  state          = var.fleet_state
+}

go.mod

@@ -4,13 +4,12 @@ require (
 	github.com/fatih/color v1.7.0
 	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
 	github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
-	github.com/hashicorp/terraform-exec v0.6.0
-	github.com/hashicorp/terraform-plugin-sdk v1.15.0
-	github.com/oracle/oci-go-sdk/v41 v41.1.0
-	github.com/stretchr/objx v0.1.1 // indirect
-	github.com/stretchr/testify v1.6.1
+	github.com/hashicorp/terraform-exec v0.13.3
+	github.com/hashicorp/terraform-plugin-sdk v1.17.2
+	github.com/oracle/oci-go-sdk/v41 v41.2.0
+	github.com/stretchr/testify v1.7.0
 	golang.org/x/mod v0.3.0
-	gopkg.in/yaml.v2 v2.2.2
+	gopkg.in/yaml.v2 v2.3.0
 )
 
 // Uncomment this line to get OCI Go SDK from local source instead of github