Releasing version 4.19.0

Releasing version 4.19.0

Author: rashik-bhasin

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 4.19.0 (Unreleased)
+
+### Added
+- Support for Maintenance Windows History in `database`
+- Support save report in cost analysis
+- Support for Capacity Reservations
+- Support for Renaming Analytics Service to HeatWave
+- Support for Marketplace-Community Catalog
+- Support for Network Load Balancer
+
+### Fixed
+- Doc update for `image_digest` and `image` fields in `functions` resource
+
 ## 4.18.0 (March 17, 2021)
 
 ### Added

GNUmakefile

@@ -4,6 +4,7 @@ TEST?=./...
 GOFMT_FILES?=$(if $(SERVICE), $$(find . -name '$(SERVICE)*.go' |grep -v vendor), $$(find . -name '*.go' |grep -v vendor))
 PKG_NAME=oci
 WEBSITE_REPO=github.com/hashicorp/terraform-website
+release_date=$(shell date -v +5d +%F)
 
 prefix := $(if $(debug),TF_LOG=DEBUG OCI_GO_SDK_DEBUG=v, )
 timeout := $(if $(timeout), $(timeout), 120m)
@@ -99,6 +100,7 @@ get: ;go get golang.org/x/tools/cmd/goimports; go get github.com/mitchellh/gox
 ### `make update-version version=2.0.1`
 update-version:
 ifdef version
+	sed -i -e 's/ReleaseDate = ".*"/ReleaseDate = "$(release_date)"/g' oci/version.go
 	sed -i -e 's/Version = ".*"/Version = "$(version)"/g' oci/version.go && rm -f oci/version.go-e
 else
 	@echo Err! `make update-version` requires a version argument

examples/compute/capacity_reservation/common.tf

@@ -0,0 +1,49 @@
+provider "oci" {
+  region = var.region
+  tenancy_ocid = var.tenancy_ocid
+  user_ocid = var.user_ocid
+  fingerprint = var.fingerprint
+  private_key_path = var.private_key_path
+  retry_duration_seconds = "1800"
+}
+
+data "oci_identity_availability_domain" "ad" {
+  compartment_id = var.tenancy_ocid
+  ad_number      = 1
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.1.0.0/16"
+  compartment_id = var.compartment_ocid
+  display_name   = "TestVcn"
+  dns_label      = "testvcn"
+}
+
+resource "oci_core_internet_gateway" "test_internet_gateway" {
+  compartment_id = var.compartment_ocid
+  display_name   = "TestInternetGateway"
+  vcn_id         = oci_core_vcn.test_vcn.id
+}
+
+resource "oci_core_default_route_table" "default_route_table" {
+  manage_default_resource_id = oci_core_vcn.test_vcn.default_route_table_id
+  display_name               = "DefaultRouteTable"
+
+  route_rules {
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = oci_core_internet_gateway.test_internet_gateway.id
+  }
+}
+
+resource "oci_core_subnet" "test_subnet" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  cidr_block          = "10.1.20.0/24"
+  display_name        = "TestSubnet"
+  dns_label           = "testsubnet"
+  security_list_ids   = [oci_core_vcn.test_vcn.default_security_list_id]
+  compartment_id      = var.compartment_ocid
+  vcn_id              = oci_core_vcn.test_vcn.id
+  route_table_id      = oci_core_vcn.test_vcn.default_route_table_id
+  dhcp_options_id     = oci_core_vcn.test_vcn.default_dhcp_options_id
+}

examples/compute/capacity_reservation/config.tf

@@ -0,0 +1,27 @@
+
+
+resource "oci_core_compute_capacity_reservation" "cr" {
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  instance_reservation_configs {
+    instance_shape = var.instance_shape
+    reserved_count = var.instance_count
+  }
+}
+
+resource "oci_core_instance" "test_instance" {
+  count                   = var.instance_count
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id          = var.compartment_ocid
+  capacity_reservation_id = oci_core_compute_capacity_reservation.cr.id
+  display_name            = "${var.instance_name_prefix}${count.index}"
+  shape                   = var.instance_shape
+  create_vnic_details {
+    assign_public_ip = false
+    subnet_id        = oci_core_subnet.test_subnet.id
+  }
+  source_details {
+    source_type = "image"
+    source_id = var.instance_image_ocid[var.region]
+  }
+}

examples/compute/capacity_reservation/config.tfvars.example

@@ -0,0 +1,13 @@
+# Modify these to reflect your account
+user_ocid = "ocid1.user.oc1..123456789abcdf0123456789abcdf0123456789abcdf0123456789abcdf0"
+private_key_path = "/home/opc/.oci/oci_api_key.pem"
+private_key_fingerprint = "12:34:56:78:9a:bc:de:f0:12:34:56:78:9a:bc:de:f0"
+
+tenancy_ocid = "ocid1.tenancy.oc1..123456789abcdf0123456789abcdf0123456789abcdf0123456789abcdf0"
+availability_domain = "aBcD:PHX-AD-1"
+compartment_id = "ocid1.tenancy.oc1..123456789abcdf0123456789abcdf0123456789abcdf0123456789abcdf0"
+
+subnet_id = "ocid1.subnet.oc1.phx.123456789abcdf0123456789abcdf0123456789abcdf0123456789abcdf0"
+
+# Modify these to adjust the scale of the test
+instance_count = "1"

examples/compute/capacity_reservation/variables.tf

@@ -0,0 +1,56 @@
+## Required connection credentials ##
+variable "user_ocid" {
+  description = "user OCID for the user account with which to connect to the API."
+}
+
+variable "private_key_path" {
+  description = "full file path of the private key to use for API access with the user account. Does not support environment variables or ~ to abbreviate a user's home directory."
+}
+
+variable "fingerprint" {
+  description = "PEM fingerprint for private key."
+}
+
+variable "tenancy_ocid" {
+  description = "tenancy OCID in which to launch instances."
+}
+
+variable "compartment_ocid" {
+  description = "compartment OCID in which to launch instances."
+}
+
+## Optional parameters ##
+variable "instance_count" {
+  description = "number of instances to launch."
+  default = "1"
+}
+
+variable "instance_name_prefix" {
+  default = "capacity_reservation_"
+}
+
+variable "region" {
+  description = "region in which to launch instances."
+  default = "us-phoenix-1"
+}
+
+# variable "image" {
+#   description = "image OCID to launch instances from. This will be unique per region. This default is for region: us-phoenix-1."
+#   default = "ocid1.image.oc1.phx.aaaaaaaapxvrtwbpgy3lchk2usn462ekarljwg4zou2acmundxlkzdty4bjq"
+# }
+variable "instance_image_ocid" {
+  type = map(string)
+
+  default = {
+    # See https://docs.us-phoenix-1.oraclecloud.com/images/
+    # Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
+    us-phoenix-1   = "ocid1.image.oc1.phx.aaaaaaaaoqj42sokaoh42l76wsyhn3k2beuntrh5maj3gmgmzeyr55zzrwwa"
+    us-ashburn-1   = "ocid1.image.oc1.iad.aaaaaaaageeenzyuxgia726xur4ztaoxbxyjlxogdhreu3ngfj2gji3bayda"
+    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaaitzn6tdyjer7jl34h2ujz74jwy5nkbukbh55ekp6oyzwrtfa4zma"
+    uk-london-1    = "ocid1.image.oc1.uk-london-1.aaaaaaaa32voyikkkzfxyo4xbdmadc2dmvorfxxgdhpnk6dw64fa3l4jh7wa"
+  }
+}
+
+variable "instance_shape" {
+  default = "VM.Standard2.1"
+}

examples/database/db_systems/db_exacs/resources.tf

@@ -49,74 +49,8 @@ resource "oci_database_db_home" "test_db_home_vm_cluster" {
   display_name = "createdDbHome"
 }
 
-resource "oci_database_db_system" "test_db_system" {
-  availability_domain = data.oci_identity_availability_domain.ad.name
-  compartment_id      = var.compartment_ocid
-  cpu_core_count      = "22"
-  database_edition    = var.db_edition
-
-  db_home {
-    database {
-      admin_password = var.db_admin_password
-      db_name        = "TFdb1Exa"
-      character_set  = var.character_set
-      ncharacter_set = var.n_character_set
-      db_workload    = var.db_workload
-      pdb_name       = var.pdb_name
-
-      db_backup_config {
-        auto_backup_enabled = false
-      }
-    }
-
-    db_version   = "12.1.0.2"
-    display_name = "MyTFDBHome1Exa"
-  }
-
-  maintenance_window_details {
-    preference = "CUSTOM_PREFERENCE"
-
-    days_of_week {
-      name = "MONDAY"
-    }
-
-    hours_of_day       = ["4"]
-    lead_time_in_weeks = 2
-
-    months {
-      name = "APRIL"
-    }
-
-    weeks_of_month = ["2"]
-  }
-
-  disk_redundancy  = var.db_disk_redundancy
-  shape            = var.db_system_shape
-  subnet_id        = oci_core_subnet.subnet.id
-  backup_subnet_id = oci_core_subnet.subnet_backup.id
-  ssh_public_keys  = [var.ssh_public_key]
-  display_name     = var.db_system_display_name
-  sparse_diskgroup = var.sparse_diskgroup
-
-  hostname                = var.hostname
-  data_storage_percentage = var.data_storage_percentage
-
-  #data_storage_size_in_gb = var.data_storage_size_in_gb
-  license_model          = var.license_model
-  node_count             = lookup(data.oci_database_db_system_shapes.test_db_system_shapes.db_system_shapes[0], "minimum_node_count")
-  backup_network_nsg_ids = [oci_core_network_security_group.test_network_security_group.id]
-  nsg_ids                = [oci_core_network_security_group.test_network_security_group_backup.id, oci_core_network_security_group.test_network_security_group.id]
-
-  #To use defined_tags, set the values below to an existing tag namespace, refer to the identity example on how to create tag namespaces
-  #defined_tags = map("example-tag-namespace-all.example-tag", "originalValue")
-
-  freeform_tags = {
-    "Department" = "Finance"
-  }
-}
-
 resource "oci_database_backup" "test_backup" {
-  depends_on   = ["oci_database_db_system.test_db_system"]
-  database_id  = oci_database_db_system.test_db_system.db_home.0.database.0.id
+  depends_on   = ["oci_database_db_home.test_db_home_vm_cluster"]
+  database_id  = oci_database_db_home.test_db_home_vm_cluster.database.id
   display_name = "FirstBackup"
 }

examples/goldengate/Deployment/main.tf

@@ -197,7 +197,7 @@ data "oci_objectstorage_namespace" "test_namespace" {
 
 data "oci_golden_gate_deployments" "test_deployments" {
   #Required
-  compartment_id = var.compartment_id
+  compartment_id = var.compartment_ocid
 
   #Optional
   display_name = var.deployment_display_name