ECI-201 Update README and remove compartment creation (#821)

* Update README.md

* Remove compartment creation from the setup

Author: kanishktripathi

oci/README.md

@@ -1,3 +1,8 @@
 # Overview
 
 Repository of OCI functions that process OCI metrics and send data to Datadog as metrics events for further processing.
+
+# Deploy to OCI
+
+[![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/kanishktripathi/datadog-serverless-functions/releases/latest/download/datadog-oci-orm.zip)
+

oci/datadog-oci-orm/metrics-setup/compartment.tf

@@ -6,16 +6,16 @@ resource "null_resource" "Login2OCIR" {
 }
 
 ### Repository in the Container Image Registry for the container images underpinning the function 
-# resource "oci_artifacts_container_repository" "function_repo" {
-#   # note: repository = store for all images versions of a specific container image - so it included the function name
-#   depends_on     = [null_resource.Login2OCIR]
-#   count          = local.user_image_provided ? 0 : 1
-#   compartment_id = oci_identity_compartment.datadog-compartment.id
-#   display_name   = local.ocir_repo_name
-#   is_public      = false
-#   defined_tags   = {}
-#   freeform_tags  = local.freeform_tags
-# }
+resource "oci_artifacts_container_repository" "function_repo" {
+  # note: repository = store for all images versions of a specific container image - so it included the function name
+  depends_on     = [null_resource.Login2OCIR]
+  count          = local.user_image_provided ? 0 : 1
+  compartment_id = var.compartment_ocid
+  display_name   = local.ocir_repo_name
+  is_public      = false
+  defined_tags   = {}
+  freeform_tags  = local.freeform_tags
+}
 
 # ### build the function into a container image and push that image to the repository in the OCI Container Image Registry
 resource "null_resource" "FnImagePushToOCIR" {

oci/datadog-oci-orm/metrics-setup/function_setup.tf

@@ -1,6 +1,6 @@
 resource "oci_functions_application" "metrics_function_app" {
   depends_on     = [data.oci_core_subnet.input_subnet]
-  compartment_id = oci_identity_compartment.datadog-compartment.id
+  compartment_id = var.compartment_ocid
   config = {
     "DD_API_KEY"     = var.datadog_api_key
     "DD_COMPRESS"    = "true"
@@ -10,7 +10,7 @@ resource "oci_functions_application" "metrics_function_app" {
     "TENANCY_OCID"   = var.tenancy_ocid
   }
   defined_tags  = {}
-  display_name  = "${var.datadog_compartment}-function-app"
+  display_name  = "${var.resource_name_prefix}-function-app"
   freeform_tags = local.freeform_tags
   network_security_group_ids = [
   ]

oci/datadog-oci-orm/metrics-setup/functions.tf

@@ -1,14 +1,14 @@
 locals {
   # Names for the network infra
-  vcn_name        = "${var.datadog_compartment}-vcn"
+  vcn_name        = "${var.resource_name_prefix}-vcn"
   nat_gateway     = "${local.vcn_name}-natgateway"
   service_gateway = "${local.vcn_name}-servicegateway"
   subnet          = "${local.vcn_name}-private-subnet"
 }
 
 locals {
   # Names for the service connector
-  connector_name = "${var.datadog_compartment}-connector"
+  connector_name = "${var.resource_name_prefix}-connector"
 }
 
 locals {
@@ -33,7 +33,7 @@ locals {
   # OCI docker repository
   oci_docker_repository = "${local.oci_region_key}.ocir.io/${local.ocir_namespace}"
   oci_docker_host       = "${local.oci_region_key}.ocir.io"
-  ocir_repo_name        = "datadog-functions"
+  ocir_repo_name        = "${var.resource_name_prefix}-functions"
   function_name         = "datadog-function-metrics"
   docker_image_path     = "${local.oci_docker_repository}/${local.ocir_repo_name}/${local.function_name}:latest"
   # custom_image_path     = "${local.oci_region_key}.ocir.io/${var.function_image_path}"

oci/datadog-oci-orm/metrics-setup/locals.tf

@@ -8,14 +8,6 @@ output "tenancy_object_storage_namespace" {
   value = local.ocir_namespace
 }
 
-output "compartment_name" {
-  value = oci_identity_compartment.datadog-compartment.name
-}
-
-output "compartment_OCID" {
-  value = oci_identity_compartment.datadog-compartment.id
-}
-
 output "vcn_network_details" {
   depends_on  = [module.vcn]
   description = "Output of the created network infra"

oci/datadog-oci-orm/metrics-setup/outputs.tf

@@ -29,11 +29,12 @@ variableGroups:
       - ${oci_docker_password}
 
 variables:
-  datadog_compartment:
+  resource_name_prefix:
     type: string
-    title: Compartment Name
-    description: The name of the compartment that will be created for the resource.
+    title: Resource prefix
+    description: The prefix for the name of all of the resources.
     required: true
+    default: datadog-metrics
   create_vcn:
     title: Create VCN
     description: Optional variable to create virtual network for the setup. Otherwise, choose an existing subnet from VCN

oci/datadog-oci-orm/metrics-setup/schema.yaml

@@ -1,7 +1,7 @@
 resource "oci_sch_service_connector" "metrics_service_connector" {
   depends_on = [oci_functions_function.metrics_function]
   #Required
-  compartment_id = oci_identity_compartment.datadog-compartment.id
+  compartment_id = var.compartment_ocid
   display_name   = local.connector_name
   source {
     #Required
@@ -41,6 +41,4 @@ resource "oci_sch_service_connector" "metrics_service_connector" {
   defined_tags  = {}
   description   = "Terraform created connector hub to distribute metrics"
   freeform_tags = local.freeform_tags
-  state         = "INACTIVE"
-
 }

oci/datadog-oci-orm/metrics-setup/serviceconnector.tf

@@ -1,6 +1,6 @@
-variable "datadog_compartment" {
+variable "resource_name_prefix" {
   type        = string
-  description = "The name of the compartment created to hold all of the resources"
+  description = "The prefix for the name of all of the resources"
   default     = "datadog-metrics"
 }
 

oci/datadog-oci-orm/metrics-setup/variables.tf

@@ -3,7 +3,7 @@ module "vcn" {
   source                   = "oracle-terraform-modules/vcn/oci"
   version                  = "3.6.0"
   count                    = var.create_vcn ? 1 : 0
-  compartment_id           = oci_identity_compartment.datadog-compartment.id
+  compartment_id           = var.compartment_ocid
   defined_tags             = {}
   freeform_tags            = local.freeform_tags
   vcn_cidrs                = ["10.0.0.0/16"]