Merge pull request #1644 from oracle/release_gh

Releasing version 4.87.0

Author: ravinitp

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 4.87.0 (August 03, 2022)
+
+### Added
+- Support of Announcements Service Subscriptions
+- support for rack SN as a system tag
+- Support for ExaCS - Monthly Security Patching
+- Support patch management
+- Support for Private Access Connection in Devops Build Service
+- Support for new data source TimeMaintenanceRebootDueMax
+- Support for Exacc Monthly Security Patching
+- support for Child Tables for NoSQL Database Cloud
+- Support for listing volumes/replicas by group/replica group id. Also support to view volume group membership status
+- Support for ExaCS in Opctl
+
+### Bug Fix
+- Enabled preserve_data_volumes in oci_core_instance delete API
+- Enabled host_type in opsi_host_insights_data_source list api
+
 ## 4.86.1 (July 28, 2022)
 
 ### Bug Fix

examples/announcements_service/description.md

@@ -0,0 +1,4 @@
+# Overview
+This is a Terraform configuration that creates the Announcements service Subscription resources on Oracle Cloud Infrastructure.
+
+The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources.

examples/announcements_service/main.tf

@@ -0,0 +1,111 @@
+// 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 "announcement_subscription_defined_tags_value" {
+  default = "value"
+}
+
+variable "announcement_subscription_description" {
+  default = "description"
+}
+
+variable "announcement_subscription_display_name" {
+  default = "displayName"
+}
+
+variable "announcement_subscription_filter_groups_filters_type" {
+  default = "COMPARTMENT_ID"
+}
+
+variable "announcement_subscription_filter_groups_filters_value" {
+  default = "value"
+}
+
+variable "announcement_subscription_freeform_tags" {
+  default = { "bar-key" = "value" }
+}
+
+variable "announcement_subscription_id" {
+  default = "id"
+}
+
+variable "announcement_subscription_state" {
+  default = "ACTIVE"
+}
+
+variable "announcement_subscriptions_filter_group_filters_type" {
+  default = "PLATFORM_TYPE"
+}
+
+variable "announcement_subscriptions_filter_group_filters_value" {
+  default = "IAAS"
+}
+
+variable "announcement_subscriptions_filter_group_name" {
+  default = "fg-name"
+}
+
+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
+}
+
+// Announcement Subscription Resource
+resource "oci_announcements_service_announcement_subscription" "test_announcement_subscription" {
+  #Required
+  compartment_id = var.compartment_id
+  display_name   = var.announcement_subscription_display_name
+  ons_topic_id   = oci_ons_notification_topic.test_notification_topic.id
+
+  #Optional
+  defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.announcement_subscription_defined_tags_value)
+  description  = var.announcement_subscription_description
+  filter_groups {
+    #Required
+    filters {
+      #Required
+      type  = var.announcement_subscription_filter_groups_filters_type
+      value = var.announcement_subscription_filter_groups_filters_value
+    }
+  }
+  freeform_tags = var.announcement_subscription_freeform_tags
+}
+
+// Announcement Subscription Change Compartment Resource
+resource "oci_announcements_service_announcement_subscriptions_actions_change_compartment" "test_announcement_subscriptions_actions_change_compartment" {
+  #Required
+  announcement_subscription_id = oci_announcements_service_announcement_subscription.test_announcement_subscription.id
+  compartment_id               = var.compartment_id
+}
+
+// Announcement Subscription Filter Group Resource
+resource "oci_announcements_service_announcement_subscriptions_filter_group" "test_announcement_subscriptions_filter_group" {
+  #Required
+  announcement_subscription_id = oci_announcements_service_announcement_subscription.test_announcement_subscription.id
+  filters {
+    #Required
+    type  = var.announcement_subscriptions_filter_group_filters_type
+    value = var.announcement_subscriptions_filter_group_filters_value
+  }
+  name = var.announcement_subscriptions_filter_group_name
+}
+
+data "oci_announcements_service_announcement_subscriptions" "test_announcement_subscriptions" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name = var.announcement_subscription_display_name
+  id           = var.announcement_subscription_id
+  state        = var.announcement_subscription_state
+}

examples/big_data_service/bds_instance_patch/main.tf

@@ -0,0 +1,34 @@
+variable "bds_instance_patch_action_cluster_admin_password" {
+  default = "V2VsY29tZTE="
+}
+
+variable "bds_instance_patch_action_version" {
+  default = "ODH-1.1.0.379"
+}
+
+variable "bds_instance_patch_history_patch_version" {}
+
+variable "bds_instance_patch_history_state" {}
+
+variable "bds_instance_id" {}
+
+resource "oci_bds_bds_instance_patch_action" "test_bds_instance_patch_action" {
+  #Required
+  bds_instance_id        = var.bds_instance_id
+  cluster_admin_password = var.bds_instance_patch_action_cluster_admin_password
+  version                = var.bds_instance_patch_action_version
+}
+
+data "oci_bds_bds_instance_patches" "test_bds_instance_patches" {
+  #Required
+  bds_instance_id = var.bds_instance_id
+}
+
+data "oci_bds_bds_instance_patch_histories" "test_bds_instance_patch_histories" {
+  #Required
+  bds_instance_id = var.bds_instance_id
+
+  #Optional
+  patch_version = var.bds_instance_patch_history_patch_version
+  state         = var.bds_instance_patch_history_state
+}

examples/datascience/job/artifact.zip

@@ -0,0 +1,49 @@
+# https://orahub.oci.oraclecorp.com/ateam/jobs/-/raw/master/python_jobs/job_std_logs.py
+
+import oci
+import datetime
+import os
+import time
+import sys
+from oci.loggingingestion import LoggingClient
+
+OCI_RESOURCE_PRINCIPAL_VERSION = "OCI_RESOURCE_PRINCIPAL_VERSION"
+JOB_RUN_OCID_KEY = "JOB_RUN_OCID"
+LOG_OBJECT_OCID_KEY = "LOG_OCID"
+
+class Job:
+    def __init__(self):
+        # Auto switch between local and job
+        rp_version = os.environ.get(OCI_RESOURCE_PRINCIPAL_VERSION, "UNDEFINED")
+        if rp_version == "UNDEFINED":
+            # RUN LOCAL TEST
+            self.signer = oci.config.from_file("~/.oci/config", "DEFAULT")
+            self.log_client = LoggingClient(config=self.signer)
+        else:
+            # RUN AS JOB
+            self.signer = oci.auth.signers.get_resource_principals_signer()
+            self.log_client = LoggingClient(config={}, signer=self.signer)
+try:
+    job = Job()
+
+    try:
+        print(
+            "Start logging for job run: {}".format(
+                os.environ.get(JOB_RUN_OCID_KEY, "UNDEFINED")
+            )
+        )
+        print("Current timestamp in UTC: {}".format(str(datetime.datetime.utcnow())))
+
+        print("Delay 5s")
+
+        time.sleep(5)
+
+        print("Log after delay...")
+
+        print("Job Done.")
+    except Exception as e:
+        print(e)
+        raise e
+except Exception as e:
+    print(e)
+    raise e

examples/datascience/job/job-artifact.py

@@ -61,43 +61,43 @@ resource "oci_core_security_list" "regional_with_natgw" {
   egress_security_rules {
     destination = "0.0.0.0/0"
     protocol    = "all"
-    stateless = false
+    stateless   = false
   }
 }
 
 resource "oci_logging_log_group" "job" {
   compartment_id = var.compartment_ocid
-  display_name = "jobs"
+  display_name   = "jobs"
 }
 
 resource "oci_datascience_project" "job" {
   compartment_id = var.compartment_ocid
 }
 
 resource "oci_datascience_job" "job" {
-  compartment_id = var.compartment_ocid
-  project_id = oci_datascience_project.job.id
-  job_artifact = "${path.root}/job-artifact.py"
-  artifact_content_length = 1380
+  compartment_id               = var.compartment_ocid
+  project_id                   = oci_datascience_project.job.id
+  job_artifact                 = "${path.root}/job-artifact.py"
+  artifact_content_length      = 1380
   artifact_content_disposition = "attachment; filename=job_artifact.py"
-  delete_related_job_runs = true
+  delete_related_job_runs      = true
 
   job_configuration_details {
-    job_type = "DEFAULT"
+    job_type                   = "DEFAULT"
     maximum_runtime_in_minutes = 30
   }
 
   job_infrastructure_configuration_details {
-    job_infrastructure_type = "STANDALONE"
-    shape_name     = "VM.Standard2.2"
-    subnet_id      = oci_core_subnet.regional_with_natgw.id
+    job_infrastructure_type   = "STANDALONE"
+    shape_name                = "VM.Standard2.2"
+    subnet_id                 = oci_core_subnet.regional_with_natgw.id
     block_storage_size_in_gbs = 66
   }
 
   job_log_configuration_details {
-    enable_logging = true
+    enable_logging           = true
     enable_auto_log_creation = true
-    log_group_id = oci_logging_log_group.job.id
+    log_group_id             = oci_logging_log_group.job.id
   }
 }
 
@@ -116,28 +116,28 @@ data "oci_datascience_jobs" "by_compartment" {
 # terraform will wait until the JobRun reaches completion.
 resource "oci_datascience_job_run" "sync" {
   compartment_id = var.compartment_ocid
-  project_id = oci_datascience_project.job.id
-  job_id = oci_datascience_project.job.id
-  asynchronous = false
+  project_id     = oci_datascience_project.job.id
+  job_id         = oci_datascience_project.job.id
+  asynchronous   = false
 }
 
 # terraform will NOT wait for completion before returning.
 # it will move on once the JobRun has reached "In Progress" status.
 resource "oci_datascience_job_run" "async" {
   compartment_id = var.compartment_ocid
-  project_id = oci_datascience_project.job.id
-  job_id = oci_datascience_project.job.id
-  asynchronous = true
+  project_id     = oci_datascience_project.job.id
+  job_id         = oci_datascience_project.job.id
+  asynchronous   = true
 }
 
 data "oci_datascience_job_runs" "by_compartment" {
   #Required
   compartment_id = var.compartment_ocid
 
-#   #Optional
-#   created_by   = var.job_run_created_by
-#   display_name = var.job_run_display_name
-#   id           = var.job_run_id
-#   job_id       = oci_datascience_job.job.id
-#   state        = var.job_run_state
-# }
+  #   #Optional
+  #   created_by   = var.job_run_created_by
+  #   display_name = var.job_run_display_name
+  #   id           = var.job_run_id
+  #   job_id       = oci_datascience_job.job.id
+  #   state        = var.job_run_state
+}

examples/datascience/job.tf renamed to examples/datascience/job/job.tf

@@ -71,10 +71,10 @@ resource "oci_datascience_model" "tf_model" {
   project_id              = var.project_ocid
   # Optional
   artifact_content_disposition = var.content_disposition
-  defined_tags  = var.model_defined_tags
-  description   = var.model_description
-  display_name  = var.model_display_name
-  freeform_tags = var.model_freeform_tag
+  defined_tags                 = var.model_defined_tags
+  description                  = var.model_description
+  display_name                 = var.model_display_name
+  freeform_tags                = var.model_freeform_tag
 }
 
 # A data resource for the list of models in a specified compartment
@@ -103,9 +103,6 @@ variable "model_deployment_description" {
   default = "Model Deployment for terraform testing"
 }
 
-variable "shape" {
-}
-
 variable "log_group_id" {
 }