Merge pull request #2029 from oracle/release_gh

Releasing version 5.25.0

Author: Khalid-Chaudhry

CHANGELOG.md

@@ -1,3 +1,15 @@
+## 5.25.0 (January 17, 2024)
+
+### Added
+Support for Configure Acceptable Risks for Security Assessment Findings
+Support for Data Safe - Users access to db objects, top 5 security assessment findings and db security feature usage
+Support for suppression by dimension
+Support for ADM Polyglot Audit
+Support for Data Safe Support for Active DataGuard (ADG) enabled databases
+Support for OL8/OL7 DomU provisioning on OL8 Infra
+### Bug Fix
+Fix missing discover private IPs associated with VLAN using terraform
+
 ## 5.24.0 (January 10, 2024)
 
 ### Added

examples/adm/knowledge_base/main.tf

@@ -38,11 +38,11 @@ resource "oci_adm_knowledge_base" "example_knowledge_base" {
 
 resource "oci_adm_vulnerability_audit" "example_vulnerability_audit" {
   #Required
-  compartment_id = var.compartment_ocid
-  build_type = "MAVEN"
+  knowledge_base_id = oci_adm_knowledge_base.example_knowledge_base.id
 
   #Optional
-  knowledge_base_id = oci_adm_knowledge_base.example_knowledge_base.id
+  build_type = "MAVEN"
+  compartment_id = var.compartment_ocid
   application_dependencies {
     gav = "com.google.guava:guava:29.0-jre"
     node_id = "node_id"
@@ -64,6 +64,28 @@ resource "oci_adm_vulnerability_audit" "example_vulnerability_audit" {
   display_name = "Example_Vulnerability_Audit"
 }
 
+resource "oci_adm_vulnerability_audit" "example_vulnerability_audit_polyglot" {
+  #Required
+  knowledge_base_id = oci_adm_knowledge_base.example_knowledge_base.id
+
+  #Optional
+  build_type = "UNSET"
+
+  application_dependencies {
+    gav = ""
+    purl = "pkg:deb/ubuntu/openjdk-6@6b30?distro=14.04"
+    node_id = "node_id"
+    #Optional
+    application_dependency_node_ids = []
+  }
+
+  source {
+    type = "OCI_RESOURCE"
+    oci_resource_id = "ocid1.example.ocid"
+  }
+  display_name = "Example_Polyglot_Vulnerability_Audit"
+}
+
 data "oci_adm_knowledge_base" "example_knowledge_base" {
   knowledge_base_id = oci_adm_knowledge_base.example_knowledge_base.id
 }
@@ -88,3 +110,9 @@ data "oci_adm_vulnerability_audit_application_dependency_vulnerabilities" "examp
   gav = "com.google.guava:guava:29.0-jre"
   cvss_v2greater_than_or_equal = "1.5"
 }
+
+data "oci_adm_vulnerability_audit_application_dependency_vulnerabilities" "example_application_dependency_vulnerabilities_polyglot" {
+  vulnerability_audit_id = oci_adm_vulnerability_audit.example_vulnerability_audit_polyglot.id
+  purl = "pkg:deb/ubuntu/openjdk-6@6b30?distro=14.04"
+  severity_greater_than_or_equal = "LOW"
+}

examples/adm/remediation/main.tf

@@ -47,8 +47,7 @@ resource "oci_adm_remediation_recipe" "example_remediation_recipe" {
   is_run_triggered_on_kb_change = false
   detect_configuration {
     exclusions = []
-    max_permissible_cvss_v2score = 1.5
-    max_permissible_cvss_v3score = 1.5
+    max_permissible_severity = "LOW"
     upgrade_policy = "NEAREST"
   }
   network_configuration {

examples/datasafe/peer_target_database/main.tf

@@ -0,0 +1,78 @@
+// Copyright (c) 2017, 2023, 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 "data_safe_target_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_data_safe_data_safe_configuration" "test_data_safe_configuration" {
+  is_enabled = "true"
+}
+
+variable "peer_target_database_description" {
+  default = "description"
+}
+
+variable "peer_target_database_display_name" {
+  default = "peerTargetDatabase1"
+}
+
+variable "peerdb_ocid" {}
+
+variable "peerdb_port" {}
+
+variable "service_name" {}
+
+
+resource "random_string" "autonomous_database_admin_password" {
+  length      = 16
+  min_numeric = 1
+  min_lower   = 1
+  min_upper   = 1
+  min_special = 1
+}
+variable "autonomous_database_db_workload" {
+  default = "OLTP"
+}
+
+variable "autonomous_database_freeform_tags" {
+  default = {
+    "Department" = "Finance"
+  }
+}
+
+resource "oci_data_safe_target_database_peer_target_database" "test_target_database_peer_target_database" {
+#Required
+    target_database_id = var.data_safe_target_ocid
+    database_details {
+        database_type = "DATABASE_CLOUD_SERVICE"
+        infrastructure_type = "ORACLE_CLOUD"
+        db_system_id = var.peerdb_ocid
+        listener_port = var.peerdb_port
+        service_name = var.service_name
+    }
+}

examples/datasafe/security_assessment/security_assessment.tf

@@ -6,9 +6,9 @@ variable "user_ocid" {}
 variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
-variable "compartment_id" {}
+variable "compartment_ocid" {}
 variable "security_assessment_id" {}
-variable "target_id" {}
+variable "data_safe_target_ocid" {}
 
 
 variable "display_name" {
@@ -25,18 +25,18 @@ provider "oci" {
 
 resource "oci_data_safe_security_assessment" "oci_data_safe_security_assessment" {
   #Required
-  compartment_id = var.compartment_id
+  compartment_id = var.compartment_ocid
 
   #Optional
-  target_id = var.target_id
+  target_id = var.data_safe_target_ocid
   display_name = var.display_name
 }
 
 data "oci_data_safe_security_assessments" "test_security_assessments" {
   #Required
-  compartment_id = var.compartment_id
+  compartment_id = var.compartment_ocid
 
   #Optional
-  target_id = var.target_id
+  target_id = var.data_safe_target_ocid
 
 }

examples/datasafe/security_assessment_finding_analytics/security_assessment_finding_analytics.tf

@@ -0,0 +1,26 @@
+// Copyright (c) 2017, 2023, 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 "security_assessment_ocid" {}
+variable "data_safe_target_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
+}
+
+data "oci_data_safe_security_assessment_finding_analytics" "test_security_assessment_finding_analytics" {
+  #Required
+  compartment_id = var.compartment_ocid
+  access_level = "ACCESSIBLE"
+  compartment_id_in_subtree = true
+}

examples/datasafe/security_assessment_findings/security_assessment_findings.tf

@@ -7,8 +7,8 @@ variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
 variable "compartment_ocid" {}
-variable "security_assessment_id" {}
-variable "target_id" {}
+variable "security_assessment_ocid" {}
+variable "data_safe_target_ocid" {}
 
 variable "description" {
   default = "description"
@@ -29,7 +29,7 @@ provider "oci" {
 resource "oci_data_safe_security_assessment" "oci_data_safe_security_assessment" {
   #Required
   compartment_id = var.compartment_ocid
-  target_id = var.target_id
+  target_id = var.data_safe_target_ocid
 
   #Optional
   description = var.description
@@ -38,5 +38,5 @@ resource "oci_data_safe_security_assessment" "oci_data_safe_security_assessment"
 
 data "oci_data_safe_security_assessment_findings" "test_security_assessment_findings" {
   #Required
-  security_assessment_id = var.security_assessment_id
+  security_assessment_id = var.security_assessment_ocid
 }

examples/datasafe/security_assessment_findings_change_audit_log/security_assessment_findings_change_audit_log.tf

@@ -0,0 +1,32 @@
+// Copyright (c) 2017, 2023, 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 "security_assessment_ocid" {}
+variable "data_safe_target_ocid" {}
+
+variable "description" {
+  default = "description"
+}
+
+variable "display_name" {
+  default = "SA_1"
+}
+
+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_data_safe_security_assessment_findings_change_audit_logs" "test_security_assessment_findings_change_audit_logs" {
+  #Required
+  security_assessment_id = var.security_assessment_ocid
+}

examples/datasafe/security_assessment_security_feature/security_assessment_security_feature.tf

@@ -0,0 +1,27 @@
+// Copyright (c) 2017, 2023, 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 "security_assessment_ocid" {}
+variable "data_safe_target_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
+}
+
+data "oci_data_safe_security_assessment_security_features" "test_security_assessment_security_features" {
+  #Required
+  compartment_id = var.compartment_ocid
+  target_id = var.data_safe_target_ocid
+  access_level = "ACCESSIBLE"
+  compartment_id_in_subtree = true
+}

examples/datasafe/security_assessment_security_feature_analytics/security_assessment_security_feature_analytics.tf

@@ -0,0 +1,26 @@
+// Copyright (c) 2017, 2023, 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 "security_assessment_ocid" {}
+variable "data_safe_target_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
+}
+
+data "oci_data_safe_security_assessment_security_feature_analytics" "test_security_assessment_security_feature_analytics" {
+  #Required
+  compartment_id = var.compartment_ocid
+  access_level = "ACCESSIBLE"
+  compartment_id_in_subtree = true
+}