Merge pull request #1703 from oracle/release_gh_4_98_0

Releasing v4.98.0

Author: vsin12

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 4.98.0 (November 02, 2022)
+
+### Added
+- Support for Oracle Process Automation (OPA) - Customer Facing Release
+- Support for Logging Analytics Customer-Provided Encryption Keys
+- Support for ADB-S: Restore / Clone from backup from last available timestamp
+- Support for third-party scanner
+- Support for filtering in resource discovery
+### Bug Fix
+- Update failures with SCH terraform provider
+
 ## 4.97.0 (October 28, 2022)
 
 ### Added

coverage/coverage_test.go

@@ -14,7 +14,7 @@ import (
 
 var totalRgx = regexp.MustCompile(`total:\s+\(statements\)\s+([^"]*)%`)
 
-const CodeCoverageThreshold = 56.1
+const CodeCoverageThreshold = 57.1
 
 func TestCoverage(t *testing.T) {
 	if os.Getenv("CHECK_COVERAGE") != "true" {

examples/database/adb/autonomous_database.tf

@@ -138,6 +138,20 @@ resource "oci_database_autonomous_database" "autonomous_database_from_backup_tim
 }
 */
 
+resource "oci_database_autonomous_database" "autonomous_database_from_backup_latest" {
+  #Required
+  admin_password           = random_string.autonomous_database_admin_password.result
+  compartment_id           = var.compartment_ocid
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "adbdb3"
+
+  clone_type             = "FULL"
+  source                 = "BACKUP_FROM_TIMESTAMP"
+  autonomous_database_id = oci_database_autonomous_database_backup.autonomous_database_backup.autonomous_database_id
+  use_latest_available_backup_time_stamp              = "true"
+}
+
 data "oci_database_autonomous_databases" "autonomous_databases" {
   #Required
   compartment_id = var.compartment_ocid

examples/id6/description.md

@@ -0,0 +1,19 @@
+// 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" {}
+
+# Fetch namespace name from object store GET /n
+data "oci_objectstorage_namespace" "ns" {
+  compartment_id             = var.compartment_ocid
+}
+
+data "oci_log_analytics_namespace_storage_encryption_key_info" "test_namespace_storage_encryption_key_info" {
+  #Required
+  namespace = data.oci_objectstorage_namespace.ns.namespace
+}

examples/id6/main.tf

@@ -0,0 +1,56 @@
+// 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 "idcs_access_token" {
+
+}
+
+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_opa_opa_instance" "test_opa_instance" {
+  compartment_id = "${var.compartment_id}"
+  consumption_model = "UCM"
+  display_name = "displayName"
+  idcs_at = "${var.idcs_access_token}"
+  metering_type = "EXECUTION_PACK"
+  shape_name = "PRODUCTION"
+}
+
+data "oci_opa_opa_instances" "test_opa_instances" {
+  compartment_id = "${var.compartment_id}"
+  display_name = "displayName2"
+  filter {
+    name = "id"
+    values = ["${oci_opa_opa_instance.test_opa_instance.id}"]
+  }
+  id = "${oci_opa_opa_instance.test_opa_instance.id}"
+  state = "ACTIVE"
+}
+
+data "oci_opa_opa_instance" "test_opa_instance" {
+  opa_instance_id = "${oci_opa_opa_instance.test_opa_instance.id}"
+}

examples/log_analytics/encryption_key_info/encryption_key_info.tf

@@ -140,7 +140,7 @@ resource "oci_sch_service_connector" "test_service_connector" {
   }
 
   // If using streaming source
-  source {
+  /*source {
     kind = "Streaming"
 
     // Optional
@@ -151,7 +151,7 @@ resource "oci_sch_service_connector" "test_service_connector" {
     }
 
     stream_id = oci_streaming_stream.test_stream.id
-  }
+  }*/
 
   target {
     kind      = "streaming"
@@ -170,11 +170,11 @@ resource "oci_sch_service_connector" "test_service_connector" {
   }*/
 
   // If using the log analytics target
-  target {
+  /*target {
     kind            = "loggingAnalytics"
     log_group_id    = var.log_analytics_log_group_id
     log_source_identifier = var.service_connector_target_log_source_identifier
-  }
+  }*/
 
   // If using the notification target
   /*target {

examples/opa/main.tf

@@ -20,6 +20,7 @@ variable "container_scan_recipe_freeform_tags" {
 }
 
 variable "container_scan_recipe_defined_tags" {
+  default = "bar-key"
 }
 
 variable "container_scan_recipe_image_count" {
@@ -38,6 +39,10 @@ variable "container_repo_name" {
 
 }
 
+variable "vault_secret_ocid" {
+  default = "some-secret-ocid"
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -63,6 +68,9 @@ resource "oci_vulnerability_scanning_host_scan_recipe" "test_host_scan_recipe" {
           #Optional
           scan_level = "NONE"
         }
+
+        #Optional
+        vendor_type = "OCI"
       }
     }
     compartment_id = var.compartment_ocid
@@ -82,6 +90,45 @@ resource "oci_vulnerability_scanning_host_scan_recipe" "test_host_scan_recipe" {
     display_name = "TestHostScanRecipe"
 }
 
+resource "oci_vulnerability_scanning_host_scan_recipe" "test_qualys_host_scan_recipe" {
+  #Required
+  agent_settings {
+    #Required
+    scan_level = "NONE"
+
+    #Optional
+    agent_configuration {
+      #Required
+      vendor = "QUALYS"
+
+      #Required
+      should_un_install = false
+
+      #Required
+      vault_secret_id = var.vault_secret_ocid
+
+      #Optional
+      vendor_type = "QUALYS"
+
+    }
+  }
+  compartment_id = var.compartment_ocid
+  port_settings {
+    #Required
+    scan_level = "NONE"
+  }
+  schedule {
+    #Required
+    type = "DAILY"
+
+    #Optional
+    day_of_week = "SUNDAY"
+  }
+
+  #Optional
+  display_name = "TestHostScanRecipe"
+}
+
 resource "oci_vulnerability_scanning_host_scan_target" "test_host_scan_target" {
   #Required
   compartment_id = var.compartment_ocid
@@ -104,7 +151,6 @@ resource "oci_vulnerability_scanning_container_scan_recipe" "test_container_scan
   }
 
   #Optional
-  defined_tags  = map(var.container_scan_recipe_defined_tags, var.container_scan_recipe_defined_tags_value)
   display_name  = var.container_scan_recipe_display_name
   freeform_tags = var.container_scan_recipe_freeform_tags
   image_count   = var.container_scan_recipe_image_count

examples/service_connector_hub/main.tf

@@ -53,7 +53,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
-	github.com/oracle/oci-go-sdk/v65 v65.24.0
+	github.com/oracle/oci-go-sdk/v65 v65.25.0
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
 	github.com/ulikunitz/xz v0.5.8 // indirect