Merge pull request #1659 from oracle/release_gh

Releasing version 4.92.0

Author: MeharwadeDivya

CHANGELOG.md

@@ -0,0 +1,124 @@
+// 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 "data_source_access_level" {
+  default = "ACCESSIBLE"
+}
+
+variable "data_source_compartment_id_in_subtree" {
+  default = true
+}
+
+variable "data_source_defined_tags_value" {
+  default = "value"
+}
+
+variable "data_source_freeform_tags" {
+  default = { "bar-key" = "value" }
+}
+
+//Has to be unique
+variable "data_source_display_name" {
+  default = "displayName"
+}
+
+variable "data_source_data_source_feed_provider" {
+  default = "LOGGINGQUERY"
+}
+
+//Acceptable values come from LifecycleStateEnum
+variable "data_source_state" {
+  default = "ACTIVE"
+}
+
+variable "data_source_data_source_details_logging_query_type" {
+  default = "INSIGHT"
+}
+
+variable "data_source_data_source_details_operator" {
+  default = "GREATERTHANEQUALTO"
+}
+
+variable "data_source_data_source_details_additional_entities_count" {
+  default = "2"
+}
+
+variable "data_source_data_source_details_interval_in_minutes" {
+  default = "10"
+}
+
+variable "data_source_data_source_details_threshold" {
+  default = "0"
+}
+
+variable "data_source_data_source_details_query" {
+  default = "search \"ocid1.tenancy.oc1..aaaaaaaaqoggzsjut2u64wqliyd4eyd3dl4ipsu26lgqx4bihofnve5li5hq\" | isNotNull(data.eventName) | limit 1 | select data.eventName as cgkey01, data.message as cg01, data.resourceId as cg02"
+}
+
+variable "data_source_data_source_details_regions" {
+  default = ["us-phoenix-1"]
+}
+
+variable "data_source_data_source_details_logging_query_details_key_entities_count" {
+  default = "1"
+}
+
+variable "data_source_data_source_details_query_start_time_start_policy_type" {
+  default = "NO_DELAY_START_POLICY"
+}
+
+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_cloud_guard_data_sources" "test_data_sources" {
+  #Required
+  compartment_id = var.tenancy_ocid
+
+  #Optional
+  state        = var.data_source_state
+  display_name = var.data_source_display_name
+}
+
+resource "oci_cloud_guard_data_source" "test_data_source" {
+  #Required
+  compartment_id            = var.compartment_id
+  display_name              = var.data_source_display_name
+  data_source_feed_provider = var.data_source_data_source_feed_provider
+
+  #Required
+  data_source_details {
+    data_source_feed_provider = var.data_source_data_source_feed_provider
+    additional_entities_count = var.data_source_data_source_details_additional_entities_count
+    interval_in_minutes       = var.data_source_data_source_details_interval_in_minutes
+    logging_query_type        = var.data_source_data_source_details_logging_query_type
+    operator                  = var.data_source_data_source_details_operator
+    query                     = var.data_source_data_source_details_query
+    regions                   = var.data_source_data_source_details_regions
+    threshold                 = var.data_source_data_source_details_threshold
+
+    logging_query_details {
+      logging_query_type  = var.data_source_data_source_details_logging_query_type
+      key_entities_count = var.data_source_data_source_details_logging_query_details_key_entities_count
+    }
+
+    query_start_time {
+      start_policy_type = var.data_source_data_source_details_query_start_time_start_policy_type
+    }
+  }
+
+  #Optional
+  defined_tags  = { "example-tag-namespace-all.example-tag" = var.data_source_defined_tags_value }
+  freeform_tags = var.data_source_freeform_tags
+}

examples/README.md

@@ -76,4 +76,9 @@ resource "oci_cloud_guard_security_zone" "test_security_zone" {
 
   #Optional
   description   = "${var.security_zone_description}"
+
+  //Added only because we are testing this in a splat-disabled env
+  lifecycle {
+    ignore_changes = [system_tags]
+  }
 }

examples/cloudguard/data_source/cloud_guard_data_source.tf

@@ -66,4 +66,8 @@ resource "oci_cloud_guard_security_recipe" "test_security_recipe" {
   #Optional
   description       = "${var.security_recipe_description}"
 
+  //Added only because we are testing this in a splat-disabled env
+  lifecycle {
+    ignore_changes = [system_tags]
+  }
 }

examples/cloudguard/security_zone/security_zone.tf

@@ -0,0 +1,71 @@
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "region" {
+}
+
+variable "registry_display_name" {
+  default = "displayName"
+}
+
+variable "registry_description" {
+  default = "description"
+}
+
+variable "registry_freeform_tags" {
+  default = {
+    "Department" = "Finance"
+  }
+}
+
+variable "registry_state" {
+  default = "ACTIVE"
+}
+
+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
+}
+
+resource "oci_data_connectivity_registry" "test_registry" {
+  #Required
+  display_name = var.registry_display_name
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  description = var.registry_description
+  freeform_tags = var.registry_freeform_tags
+
+  lifecycle {
+    ignore_changes = [
+      defined_tags]
+  }
+}
+
+data "oci_data_connectivity_registries" "test_registries" {
+  #Required
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  state = var.registry_state
+}
+
+data "oci_data_connectivity_registry" "test_registry" {
+  #Required
+  registry_id = oci_data_connectivity_registry.test_registry.id
+}

examples/cloudguard/security_zone_recipe/security_zone_recipe.tf

@@ -188,6 +188,10 @@ variable "managed_database_optimizer_statistics_collection_operation_task_type"
   default = "ALL"
 }
 
+variable "managed_database_preferred_credential_credential_name" {
+  default = "credentialName"
+}
+
 provider "oci" {
   tenancy_ocid = var.tenancy_ocid
   user_ocid = var.user_ocid
@@ -453,4 +457,15 @@ data "oci_database_management_managed_database_optimizer_statistics_collection_o
 data "oci_database_management_managed_database_table_statistics" "test_managed_database_table_statistics" {
   #Required
   managed_database_id = oci_database_management_managed_database.test_managed_database.id
+}
+
+data "oci_database_management_managed_database_preferred_credentials" "test_managed_database_preferred_credentials" {
+  #Required
+  managed_database_id = oci_database_management_managed_database.test_managed_database.id
+}
+
+data "oci_database_management_managed_database_preferred_credential" "test_managed_database_preferred_credential" {
+  #Required
+  credential_name = var.managed_database_preferred_credential_credential_name
+  managed_database_id = oci_database_management_managed_database.test_managed_database.id
 }

examples/dataConnectivity/README.md

@@ -129,6 +129,10 @@ variable "tag_namespace_name" {
   default = "testexamples-tag-namespace"
 }
 
+variable "is_notifications_per_metric_dimension_enabled" {
+  default = false
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -167,6 +171,7 @@ resource "oci_monitoring_alarm" "test_alarm" {
   repeat_notification_duration     = var.alarm_repeat_notification_duration
   resolution                       = var.alarm_resolution
   resource_group                   = var.alarm_resource_group
+  is_notifications_per_metric_dimension_enabled = var.is_notifications_per_metric_dimension_enabled
 
   suppression {
     #Required