Releasing version 4.15.0

Releasing version 4.15.0

Author: rashik-bhasin

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 4.15.0 (Unreleased)
+
+### Added
+- Support for New compute shape E4-Dense
+- Support for Cloud Advisor Fix It actions for V1 recommendations
+- Support for Cloud Advisor customization at resource/compartment level
+- Support for `artifacts` service
+
 ## 4.14.0 (February 17, 2021)
 
 ### Added

examples/artifacts/ContainerConfiguration/container_configuration.tf

@@ -0,0 +1,33 @@
+// 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 "is_repository_created_on_first_push" {
+  default = true
+}
+
+
+
+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_artifacts_container_configuration" "test_container_configuration" {
+  #Required
+  compartment_id                      = var.tenancy_ocid
+  is_repository_created_on_first_push = var.is_repository_created_on_first_push
+}
+
+data "oci_artifacts_container_configuration" "test_container_configuration" {
+  #Required
+  compartment_id = var.tenancy_ocid
+}

examples/artifacts/ContainerRepository/container_repository.tf

@@ -0,0 +1,77 @@
+// 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" {}
+
+variable "container_repository_compartment_id_in_subtree" {
+  default = false
+}
+
+variable "container_repository_is_immutable" {
+  default = false
+}
+
+variable "container_repository_is_public" {
+  default = false
+}
+
+variable "container_repository_readme_content" {
+  default = "content"
+}
+
+variable "container_repository_readme_format" {
+  default = "TEXT_MARKDOWN"
+}
+
+variable "container_repository_state" {
+  default = "AVAILABLE"
+}
+
+
+
+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
+}
+
+// repository displayName needs to be unique within a tenant, so generate random string here to avoid collision
+resource "random_string" "container_repository_display_name" {
+  length  = 5
+  number  = false
+  special = false
+  upper = false
+}
+
+resource "oci_artifacts_container_repository" "test_container_repository" {
+  #Required
+  compartment_id = var.compartment_ocid
+  display_name   = random_string.container_repository_display_name.result
+
+  #Optional
+  is_immutable = var.container_repository_is_immutable
+  is_public    = var.container_repository_is_public
+  readme {
+    #Required
+    content = var.container_repository_readme_content
+    format  = var.container_repository_readme_format
+  }
+}
+
+data "oci_artifacts_container_repositories" "test_container_repositories" {
+  #Required
+  compartment_id = var.compartment_ocid
+
+  #Optional
+  compartment_id_in_subtree = var.container_repository_compartment_id_in_subtree
+  is_public                 = var.container_repository_is_public
+  repository_id             = oci_artifacts_container_repository.test_container_repository.id
+  state                     = var.container_repository_state
+}

examples/compute/instance/platform_config.tf

@@ -0,0 +1,73 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+# Defines the number of instances to deploy
+variable "num_platform_config_instances" {
+  default = "1"
+}
+
+variable "platform_config_instance_shape" {
+  default = "BM.DenseIO.E4.128"
+}
+
+variable "instance_platform_config_numa_nodes_per_socket" {
+  default = "NPS1"
+}
+
+variable "instance_platform_config_type" {
+  default = "AMD_MILAN_BM"
+}
+
+resource "oci_core_instance" "test_instance_with_platform_config" {
+  count               = var.num_platform_config_instances
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  display_name        = "TestInstance${count.index}"
+  shape               = var.platform_config_instance_shape
+
+
+  platform_config {
+    type = "${var.instance_platform_config_type}"
+    numa_nodes_per_socket = "${var.instance_platform_config_numa_nodes_per_socket}"
+  }
+
+  create_vnic_details {
+    subnet_id        = oci_core_subnet.test_subnet.id
+    display_name     = "Primaryvnic"
+    assign_public_ip = true
+    hostname_label   = "tfexampleinstance${count.index}"
+  }
+
+  source_details {
+    source_type = "image"
+    source_id   = data.oci_core_images.supported_platform_config_shape_images.images[0]["id"]
+  }
+
+  # Apply the following flag only if you wish to preserve the attached boot volume upon destroying this instance
+  # Setting this and destroying the instance will result in a boot volume that should be managed outside of this config.
+  # When changing this value, make sure to run 'terraform apply' so that it takes effect before the resource is destroyed.
+  #preserve_boot_volume = true
+
+  metadata = {
+    ssh_authorized_keys = var.ssh_public_key
+    user_data           = base64encode(file("./userdata/bootstrap"))
+  }
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag2.name}" = "awesome-app-server"
+  }
+
+  freeform_tags = {
+    "freeformkey${count.index}" = "freeformvalue${count.index}"
+  }
+  timeouts {
+    create = "60m"
+  }
+}
+
+# Gets a list of all images that support a given Instance shape
+data "oci_core_images" "supported_platform_config_shape_images" {
+  compartment_id   = var.tenancy_ocid
+  shape            = var.platform_config_instance_shape
+  operating_system = "Oracle Linux"
+
+}

examples/compute/instance_pool/instance_pool_platform_config.tf

@@ -0,0 +1,94 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "instance_configuration_platform_config_instance_shape" {
+  default = "BM.DenseIO.E4.128"
+}
+
+variable "instance_configuration_platform_config_numa_nodes_per_socket" {
+  default = "NPS1"
+}
+
+variable "instance_configuration_platform_config_type" {
+  default = "AMD_MILAN_BM"
+}
+
+resource "oci_core_instance_configuration" "test_instance_configuration_platform_config" {
+  compartment_id = var.compartment_ocid
+  display_name   = "TestInstanceConfigurationPlatformConfig"
+
+  instance_details {
+    instance_type = "compute"
+
+    block_volumes {
+      create_details {
+        compartment_id      = var.compartment_ocid
+        display_name        = "TestCreateVolumeDetails"
+        availability_domain = data.oci_identity_availability_domain.ad.name
+        size_in_gbs         = 50
+        vpus_per_gb         = 2
+      }
+
+      attach_details {
+        type                                = "paravirtualized"
+        display_name                        = "TestAttachVolumeDetails"
+        is_read_only                        = true
+        device                              = "TestDeviceName"
+        is_pv_encryption_in_transit_enabled = true
+        is_shareable                        = true
+      }
+    }
+
+    launch_details {
+      compartment_id                      = var.compartment_ocid
+      ipxe_script                         = "ipxeScript"
+      shape                               = var.instance_configuration_platform_config_instance_shape
+      display_name                        = "TestInstanceConfigurationPlatformConfigLaunchDetails"
+      is_pv_encryption_in_transit_enabled = false
+      preferred_maintenance_action        = "LIVE_MIGRATE"
+      launch_mode                         = "NATIVE"
+
+      agent_config {
+        is_management_disabled = false
+        is_monitoring_disabled = false
+      }
+
+      launch_options {
+        network_type = "PARAVIRTUALIZED"
+      }
+
+      instance_options {
+        are_legacy_imds_endpoints_disabled = false
+      }
+
+      platform_config {
+        type = var.instance_configuration_platform_config_type
+        numa_nodes_per_socket = var.instance_configuration_platform_config_numa_nodes_per_socket
+      }
+
+      create_vnic_details {
+        assign_public_ip       = true
+        display_name           = "TestInstanceConfigurationPlatformConfigVNIC"
+        skip_source_dest_check = false
+      }
+
+      extended_metadata = {
+        some_string   = "stringA"
+        nested_object = "{\"some_string\": \"stringB\", \"object\": {\"some_string\": \"stringC\"}}"
+      }
+
+      source_details {
+        source_type = "image"
+        image_id    = data.oci_core_images.instance_config_supported_platform_config_shape_images.images[0]["id"]
+      }
+    }
+  }
+}
+
+# Gets a list of all images that support a given Instance shape
+data "oci_core_images" "instance_config_supported_platform_config_shape_images" {
+  compartment_id   = var.tenancy_ocid
+  shape            = var.instance_configuration_platform_config_instance_shape
+  operating_system = "Oracle Linux"
+
+}

examples/load_balancer/lb_full/lb_full.tf

@@ -317,7 +317,7 @@ resource "oci_load_balancer_backend_set" "lb-bes1" {
 }
 
 resource "oci_load_balancer_backend_set" "lb-bes2" {
-  name             = "lb-bes1"
+  name             = "lb-bes2"
   load_balancer_id = oci_load_balancer.lb2.id
   policy           = "ROUND_ROBIN"
 
@@ -445,8 +445,8 @@ resource "oci_load_balancer_backend" "lb-be1" {
 }
 
 resource "oci_load_balancer_backend" "lb-be2" {
-  load_balancer_id = oci_load_balancer.lb1.id
-  backendset_name  = oci_load_balancer_backend_set.lb-bes1.name
+  load_balancer_id = oci_load_balancer.lb2.id
+  backendset_name  = oci_load_balancer_backend_set.lb-bes2.name
   ip_address       = oci_core_instance.instance2.private_ip
   port             = 80
   backup           = false

examples/optimizer/main.tf

@@ -43,8 +43,8 @@ data "oci_optimizer_recommendations" "test_recommendations" {
   compartment_id = "${var.tenancy_ocid}"
   compartment_id_in_subtree = "true"
   filter {
-    name   = "importance"
-    values = ["HIGH"]
+    name   = "name"
+    values = ["cost-management-compute-host-underutilized-name"]
   }
 }
 
@@ -63,8 +63,8 @@ data "oci_optimizer_resource_actions" "test_resource_actions" {
   compartment_id_in_subtree = "true"
   recommendation_id = "${oci_optimizer_recommendation.test_recommendation.recommendation_id}"
   filter {
-    name   = "name"
-    values = ["inst-host-underutilized"]
+    name   = "status"
+    values = ["PENDING", "DISMISSED", "POSTPONED"]
   }
 }
 
@@ -99,15 +99,34 @@ resource "oci_identity_tag" "tag1" {
 }
 
 resource "oci_optimizer_profile" "test_profile" {
+  #Required
   compartment_id = "${var.tenancy_ocid}"
   description = "description"
   levels_configuration {
     items {
-      level = "cost-compute_aggressive_average"
-      recommendation_id = "${oci_optimizer_recommendation.test_recommendation.recommendation_id}"
+      level = "cost-compute_standard_average"
+      recommendation_id = "${data.oci_optimizer_recommendation.test_recommendation.recommendation_id}"
     }
   }
   name = "name"
+
+  #Optional
+  target_compartments {
+    #Required
+    items = ["${var.compartment_ocid}"]
+  }
+  target_tags {
+    #Required
+    items {
+      #Required
+      tag_definition_name = "tagDefinitionName"
+      tag_namespace_name  = "tagNamespaceName"
+      tag_value_type      = "VALUE"
+
+      #Optional
+      tag_values = ["tagValue"]
+    }
+  }
 }
 
 data "oci_optimizer_profile" "test_profile" {
@@ -134,4 +153,14 @@ resource "oci_optimizer_enrollment_status" "test_enrollment_status" {
 data "oci_optimizer_histories" "test_histories" {
   compartment_id = "${var.tenancy_ocid}"
   compartment_id_in_subtree = "true"
+  filter {
+    name = "limit"
+    values = [100]
+  }
+}
+
+data "oci_optimizer_recommendation_strategies" "test_recommendation_strategies" {
+  #Required
+  compartment_id            = "${var.tenancy_ocid}"
+  compartment_id_in_subtree = "true"
 }

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/hashicorp/hcl2 v0.0.0-20190618163856-0b64543c968c
 	github.com/hashicorp/terraform-exec v0.6.0
 	github.com/hashicorp/terraform-plugin-sdk v1.15.0
-	github.com/oracle/oci-go-sdk/v35 v35.2.0
+	github.com/oracle/oci-go-sdk/v35 v35.3.0
 	github.com/stretchr/objx v0.1.1 // indirect
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/mod v0.3.0