Merge pull request #1601 from oracle/release_gh

Releasing version 4.77.0

Author: rashik-bhasin

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.77.0 (May 25, 2022)
+
+### Added
+- Support for customer managed encryption keys in Oracle Analytics Cloud
+- Increase lsInventory size when creating db software image for VMBM.
+- Support for Oracle Linux 8 Application Streams to the OS Management Service
+- Supporting Usage plan and Subscriber in API Gateway
+### Bug Fix
+- Fix defaults and backwards compatibility tests
+- Fix for configurationId and dataStorageSizeGB update in DbSystem
+
 ## 4.76.0 (May 19, 2022)
 
 ### Added

examples/analytics/main.tf

@@ -1,6 +1,7 @@
 // Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
 
+
 // These variables would commonly be defined as environment variables or sourced in a .env file
 variable "tenancy_ocid" {
 }
@@ -23,6 +24,8 @@ variable "region" {
 variable "idcs_access_token" {
 }
 
+variable "kms_key_id" {
+}
 
 provider "oci" {
   region           = var.region
@@ -35,7 +38,7 @@ provider "oci" {
 resource "oci_analytics_analytics_instance" "test_oce_instance_public" {
   compartment_id     = var.compartment_ocid
   description        = "OAC instance"
-//  email_notification = var.email_notification
+  email_notification = var.email_notification
   feature_set        = "ENTERPRISE_ANALYTICS"
   license_type       = "LICENSE_INCLUDED"
 
@@ -65,13 +68,16 @@ resource "oci_analytics_analytics_instance" "test_oce_instance_public" {
       whitelisted_ips = [oci_core_vcn.test_vcn.cidr_block]
     }
   }
+
+  # Optionally specify a master encryption key for analytics metadata.
+  kms_key_id = var.kms_key_id
 }
 
 # Create a private access channel for the instance
 resource "oci_analytics_analytics_instance_private_access_channel" "test_private_access_channel" {
 #Required
   analytics_instance_id = oci_analytics_analytics_instance.test_oce_instance_public.id
-  display_name = "Example Private Access Channel"
+  display_name = "ExamplePAC"
   subnet_id = oci_core_subnet.test_subnet.id
   vcn_id = oci_core_vcn.test_vcn.id
   private_source_dns_zones {
@@ -81,14 +87,14 @@ resource "oci_analytics_analytics_instance_private_access_channel" "test_private
 }
 
 # Create a vanity url for the instance
-resource "oci_analytics_analytics_instances_vanity_url" "test_analytics_instances_vanity_url" {
+resource "oci_analytics_analytics_instance_vanity_url" "test_analytics_instances_vanity_url" {
   #Required
   analytics_instance_id = oci_analytics_analytics_instance.test_oce_instance_public.id
   ca_certificate        = file("/path/to/the/file/RootCA.crt")
-  hosts                 = ["analyticsdev"]
+  hosts                 = ["analyticsdev.mycompany.com"]
   private_key           = file("/path/to/the/file/analyticsdevCA.key")
   public_certificate    = file("/path/to/the/file/analyticsdevCA.crt")
-
+  
   #Optional
   description = "description"
   # passphrase is required if the private key was created with a passphrase

examples/api_gateway/gateway/main.tf

@@ -57,7 +57,6 @@ provider "oci" {
   fingerprint      = var.fingerprint
   private_key_path = var.private_key_path
   region           = var.region
-  version = "4.22.0"
 }
 
 resource "oci_core_subnet" "regional_subnet" {
@@ -115,7 +114,6 @@ data "oci_apigateway_gateways" "test_gateways" {
   compartment_id = var.compartment_ocid
 
   #Optional
-  id           = oci_apigateway_gateway.test_gateway.id
   state        = var.gateway_state
 }
 

examples/api_gateway/subscriber/main.tf

@@ -0,0 +1,54 @@
+// 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" {}
+
+
+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_apigateway_usage_plan" "test_usage_plan" {
+  compartment_id = var.compartment_ocid
+  entitlements {
+    name = "name"
+  }
+}
+
+resource "oci_apigateway_subscriber" "test_subscriber" {
+  #Required
+  clients {
+    #Required
+    name  = "subscriber_clients_name"
+    token = "subscriber_clients_token"
+  }
+  compartment_id = var.compartment_ocid
+  usage_plans    = [oci_apigateway_usage_plan.test_usage_plan.id]
+
+  #Optional
+  display_name  = "subscriber_display_name"
+  freeform_tags = { "Department" = "Finance" }
+}
+
+data "oci_apigateway_subscribers" "test_subscribers" {
+  #Required
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  display_name = "subscriber_display_name"
+  state        = "ACTIVE"
+}
+
+data "oci_apigateway_subscriber" "test_subscriber" {
+  #Required
+  subscriber_id = oci_apigateway_subscriber.test_subscriber.id
+}

examples/api_gateway/usage_plan/main.tf

@@ -0,0 +1,109 @@
+// 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" {}
+
+
+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_apigateway_gateway" "test_gateway" {
+  compartment_id = var.compartment_ocid
+  endpoint_type  = "PUBLIC"
+  subnet_id      = oci_core_subnet.regional_subnet.id
+}
+
+resource "oci_core_vcn" "vcn1" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = var.compartment_ocid
+  display_name   = "exampleVCN"
+  dns_label      = "tfexamplevcn"
+}
+
+resource "oci_core_subnet" "regional_subnet" {
+  cidr_block     = "10.0.1.0/24"
+  display_name   = "regionalSubnet"
+  dns_label      = "regionalsubnet"
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.vcn1.id
+}
+
+resource "oci_apigateway_deployment" "test_deployment" {
+  compartment_id = var.compartment_ocid
+  gateway_id     = oci_apigateway_gateway.test_gateway.id
+  path_prefix    = "/"
+
+  specification {
+    request_policies {
+      #Optional
+      usage_plans {
+        #Required
+        token_locations = ["request.headers[apiKeyLocation]"]
+      }
+    }
+    routes {
+      backend {
+        type = "HTTP_BACKEND"
+        url  = "https://api.weather.gov"
+      }
+      path    = "/hello"
+      methods = ["GET"]
+    }
+  }
+}
+
+resource "oci_apigateway_usage_plan" "test_usage_plan" {
+  #Required
+  compartment_id = var.compartment_ocid
+  entitlements {
+    #Required
+    name = "usagePlanEntitlementsName"
+
+    #Optional
+    description = "usage_plan_entitlements_description"
+    quota {
+      #Required
+      operation_on_breach = "REJECT"
+      reset_policy        = "CALENDAR"
+      unit                = "MINUTE"
+      value               = 10
+    }
+    rate_limit {
+      #Required
+      unit  = "SECOND"
+      value = 10
+    }
+    targets {
+      #Required
+      deployment_id = oci_apigateway_deployment.test_deployment.id
+    }
+  }
+
+  #Optional
+  display_name  = "usage_plan_display_name"
+  freeform_tags = { "Department" = "Finance" }
+}
+
+data "oci_apigateway_usage_plans" "test_usage_plans" {
+  #Required
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  display_name = "usage_plan_display_name"
+  state        = "ACTIVE"
+}
+
+data "oci_apigateway_usage_plan" "test_usage_plan" {
+  #Required
+  usage_plan_id = oci_apigateway_usage_plan.test_usage_plan.id
+}

examples/osmanagement/managed_instance_module_stream/main.tf

@@ -0,0 +1,49 @@
+// 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_id" {}
+
+variable "managed_instance_id" {
+}
+
+variable "managed_instance_module_name" {
+}
+
+variable "managed_instance_stream_name" {
+}
+
+variable "managed_instance_stream_status" {
+  default = "ENABLED"
+}
+
+
+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
+}
+
+data "oci_osmanagement_managed_instance_module_streams" "test_managed_instance_module_streams" {
+  #Required
+  managed_instance_id = var.managed_instance_id
+
+  #Optional
+  compartment_id = var.compartment_id
+  module_name    = var.managed_instance_module_name
+  stream_name    = var.managed_instance_stream_name
+  stream_status  = var.managed_instance_stream_status
+}
+
+output "test_managed_instance_module_streams" {
+  value = {
+    module_streams_on_managed_instance = data.oci_osmanagement_managed_instance_module_streams.test_managed_instance_module_streams.module_stream_on_managed_instances
+  }  
+}
+

examples/osmanagement/managed_instance_stream_profile/main.tf

@@ -0,0 +1,53 @@
+// 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_id" {}
+
+variable "managed_instance_id" {
+}
+
+variable "managed_instance_module_name" {
+}
+
+variable "managed_instance_module_stream_name" {
+}
+
+variable "managed_instance_module_stream_profile_name" {
+}
+
+variable "managed_instance_profile_status" {
+  default = "INSTALLED"
+}
+
+
+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
+}
+
+data "oci_osmanagement_managed_instance_stream_profiles" "test_managed_instance_stream_profiles" {
+  #Required
+  managed_instance_id = var.managed_instance_id
+
+  #Optional
+  compartment_id = var.compartment_id
+  module_name    = var.managed_instance_module_name
+  profile_name   = var.managed_instance_module_stream_profile_name
+  profile_status = var.managed_instance_profile_status
+  stream_name    = var.managed_instance_module_stream_name
+}
+
+output "test_managed_instance_stream_profiles" {
+  value = {
+    module_stream_profiles_on_managed_instance = data.oci_osmanagement_managed_instance_stream_profiles.test_managed_instance_stream_profiles.module_stream_profile_on_managed_instances
+  }  
+}
+