Added - Add support for private and 3rd party software repositories and rebooting of instances to OS Management Hub

Author: Zhigang Wang

examples/os_management_hub/entitlement/main.tf

@@ -6,9 +6,7 @@ variable "user_ocid" {}
 variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
-variable "compartment_id" {}
-variable "lifecycle_stage_id" {} 
-
+variable "compartment_ocid" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -19,8 +17,6 @@ provider "oci" {
 }
 
 # List all entitlements in a compartment
-# --------------------------------------
 data "oci_os_management_hub_entitlements" "test_entitlements" {
-  compartment_id = "${var.compartment_id}"
+  compartment_id = "${var.compartment_ocid}"
 }
-

examples/os_management_hub/erratum/main.tf

@@ -6,7 +6,7 @@ variable "user_ocid" {}
 variable "fingerprint" {}
 variable "private_key_path" {}
 variable "region" {}
-variable "compartment_id" {}
+variable "compartment_ocid" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -19,28 +19,28 @@ provider "oci" {
 
 data "oci_os_management_hub_errata" "test_errata" {
   #Required
-  compartment_id = "${var.compartment_id}"
+  compartment_id = "${var.compartment_ocid}"
 
   #Optional
-  name = ["ELBA-2024-12244"]
+  name          = ["ELBA-2024-12244"]
   name_contains = "ELBA-2024-12244"
 }
 
 data "oci_os_management_hub_errata" "test_errata_2" {
   #Required
-  compartment_id = "${var.compartment_id}"
+  compartment_id = "${var.compartment_ocid}"
 
   #Optional
-  classification_type = ["BUGFIX"]
-  name = ["ELBA-2024-12244"]
-  name_contains = "ELBA-2024-12244"
-  os_family = "ORACLE_LINUX_9"
-  time_issue_date_end = "2024-04-01T00:00:00.000Z"
+  classification_type   = ["BUGFIX"]
+  name                  = ["ELBA-2024-12244"]
+  name_contains         = "ELBA-2024-12244"
+  os_family             = "ORACLE_LINUX_9"
+  time_issue_date_end   = "2024-04-01T00:00:00.000Z"
   time_issue_date_start = "2024-03-20T00:00:00.000Z"
 }
 
 
 data "oci_os_management_hub_erratum" "test_erratum" {
-  compartment_id = "${var.compartment_id}"
-  name = "ELBA-2024-12244"
+  compartment_id = "${var.compartment_ocid}"
+  name           = "ELBA-2024-12244"
 }

examples/os_management_hub/event/create-osmh-event.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# set -x -e
+
+# . ~/venv-amd64/bin/activate
+
+response="$(oci raw-request --http-method POST --target-uri "https://osmh.us-ashburn-1.oci.oraclecloud.com/20220901/events" --request-body '
+{
+    "eventSummary": "Manually created event 2 for testing caused by <Yijiu>",
+    "type": "EXPLOIT_ATTEMPT",
+    "data": {
+        "content": {
+            "type": "EXPLOIT_ATTEMPT",
+            "exploitDetectionLogContent": "exploitDetectionLogContent",
+            "contentLocation": "/var/lib/oracle-cloud-agent/plugins/oci-alx/oops/reports/2488906d741741b3349615959ddfa7b3cd047d50.2020-07-14T01:38:28.000Z"
+        },
+        "count": 2,
+        "additionalDetails": {
+            "exploitCves": [
+                "CVE-1234",
+                "CVE-2222"
+            ]
+        }
+    },
+    "eventDetails": "Autonomous instance has an exploit",
+    "timeOccurred": "2024-01-25T23:00:49.382Z",
+    "timeCreated": "2023-12-05T03:31:09.844Z",
+    "timeUpdated": "2023-12-04T22:52:50.411Z",
+    "compartmentId": "ocid1.tenancy.oc1..aaaaaaaatajukaw53bfyxan7qlhje4u6v5hvfa3la7jbh7cok3qukw7rirbq",
+    "resourceId": "ocid1.instance.oc1.iad.anuwcljt22fr4bicxlufr5l3xmrts2ttuvn2cmx3ozrhopindb25jgfwyg3q",
+    "systemDetails": {
+        "architecture": "X86_64",
+        "kspliceEffectiveKernelVersion": "5.4.17-2102.201.3.el7uek.x86_64",
+        "osFamily": "ORACLE_LINUX_8",
+        "osName": "ORACLE_LINUX_SERVER",
+        "osKernelRelease": "#2 SMP Fri Apr 23 09:05:55 PDT 2021",
+        "osKernelVersion": "5.4.17-2102.201.3.el7uek.x86_64",
+        "osSystemVersion": "8.2"
+    },
+    "isManagedByAutonomousLinux": true,
+    "freeformTags": {
+        "Department": "Finance"
+    }
+}
+')"
+
+id="$(echo "$response" | jq -r '.data.id')"
+
+cat <<EOF
+{
+  "id": "$id"
+}
+EOF

examples/os_management_hub/event/main.tf

@@ -1,14 +1,23 @@
 // Copyright (c) 2017, 2024, 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 "event_id" {}
+variable "compartment_ocid" {}
 variable "osmh_managed_instance_ocid" {}
 
+# terraform {
+#   required_providers {
+#     oci = {
+#       source  = "oracle/oci"
+#       version = "0.0.1"
+#     }
+#   }
+# }
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -17,40 +26,53 @@ provider "oci" {
   region           = var.region
 }
 
-
 # Event has no public create API. Refer to https://confluence.oci.oraclecorp.com/x/Q5W15Q for creating events.
 
-### Event
+locals {
+  has_event_id = data.external.create_osmh_event.result.id != null && data.external.create_osmh_event.result.id != ""
+}
+
+data "external" "create_osmh_event" {
+  program = ["bash", "${path.module}/create-osmh-event.sh"]
+}
+
+output "osmh_event_id" {
+  value = data.external.create_osmh_event.result.id
+}
+
 # Update tag and compartment
 resource "oci_os_management_hub_event" "test_event" {
-  compartment_id = "${var.compartment_id}"
-  event_id = "${var.event_id}"
+  count = local.has_event_id ? 1 : 0
+
+  compartment_id = var.compartment_ocid
+  event_id       = data.external.create_osmh_event.result.id
   freeform_tags = {
     "Department" = "Finance"
   }
 }
 
 # List Event
-
 data "oci_os_management_hub_events" "test_events" {
-  compartment_id = "${var.compartment_id}"
-  event_summary = "Manually created event 2 for testing caused by <Yijiu>"
+  compartment_id         = var.compartment_ocid
+  event_summary          = "Manually created event 2 for testing caused by <Yijiu>"
   event_summary_contains = "testing"
   filter {
-    name = "id"
-    values = ["${var.event_id}"]
+    name   = "id"
+    values = [data.external.create_osmh_event.result.id]
   }
-  id = "${var.event_id}"
-  is_managed_by_autonomous_linux = "true"
-  resource_id = "${var.osmh_managed_instance_ocid}"
-  state = "ACTIVE"
+  id                                    = data.external.create_osmh_event.result.id
+  is_managed_by_autonomous_linux        = "true"
+  resource_id                           = var.osmh_managed_instance_ocid
+  state                                 = "ACTIVE"
   time_created_greater_than_or_equal_to = "2018-01-01T00:00:00.000Z"
-  time_created_less_than = "2088-01-01T00:00:00.000Z"
-  type = ["EXPLOIT_ATTEMPT"]
+  time_created_less_than                = "2088-01-01T00:00:00.000Z"
+  type                                  = ["EXPLOIT_ATTEMPT"]
 }
 
 # Get Event
 data "oci_os_management_hub_event" "test_event" {
+  count = local.has_event_id ? 1 : 0
+
   # Required
-  event_id = "${var.event_id}"
+  event_id = data.external.create_osmh_event.result.id
 }