fix(oci): update Docker image path and newrelic_endpoint validation (#2942)

Author: msivant

examples/modules/cloud-integrations/oci/metrics-integration/main.tf

@@ -25,7 +25,7 @@ resource "oci_functions_function" "metrics_function" {
   memory_in_mbs  = "128"
   defined_tags   = {}
   freeform_tags  = local.freeform_tags
-  image          = "${var.region}.ocir.io/idms1yfytybe/public-newrelic-repo:${var.image_version}"
+  image          = "${var.region}.ocir.io/${var.image_bucket}/newrelic-metrics-integration/oci-metrics-forwarder:${var.image_version}"
 }
 
 resource "oci_sch_service_connector" "service_connector" {

examples/modules/cloud-integrations/oci/metrics-integration/variables.tf

@@ -21,11 +21,11 @@ variable "region" {
 
 variable "newrelic_endpoint" {
   type        = string
-  default     = "newrelic-metric-api"
+  default     = "US"
   description = "The endpoint to hit for sending the metrics. Varies by region [US|EU]"
   validation {
-    condition     = contains(["newrelic-staging-metric-api", "newrelic-metric-api", "newrelic-eu-metric-api"], var.newrelic_endpoint)
-    error_message = "Valid values for var: newrelic_endpoint are (newrelic-staging-metric-api, newrelic-staging-vortex-metric-api, newrelic-metric-api, newrelic-eu-metric-api)."
+    condition     = contains(["US", "EU"], var.newrelic_endpoint)
+    error_message = "Valid values for var: newrelic_endpoint are (US, EU)."
   }
 }
 
@@ -72,4 +72,10 @@ variable "image_version" {
   type = string
   description = "The version of the Docker image for the New Relic function for the region."
   default = "latest"
-}
+}
+
+variable "image_bucket" {
+  type = string
+  description = "The name of the bucket where the Docker image for the New Relic function is stored."
+  default = "idptojlonu4e"
+}

website/docs/guides/cloud_integrations_guide.html.markdown

@@ -249,7 +249,7 @@ module "oci_metrics_integration" {
   private_key       = "USER_PVT_KEY"
 
   # Endpoint selection (validated internally)
-  newrelic_endpoint = "newrelic-metric-api" # or newrelic-eu-metric-api
+  newrelic_endpoint = "US" # or EU
 
   # Networking
   create_vcn         = true