From 031a47e1b35f1e40d99b3f48ddf8a67681749657 Mon Sep 17 00:00:00 2001
From: Rodrigue Koffi <bonclay7@users.noreply.github.com>
Date: Wed, 10 Aug 2022 00:00:15 +0200
Subject: [PATCH] Fix dependency issue

---
 .../main.tf                                   | 25 +++++++++++--------
 providers.tf                                  |  2 +-
 workloads/infra/main.tf                       |  7 +-----
 workloads/infra/variables.tf                  | 11 --------
 workloads/java/main.tf                        |  3 +--
 5 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/examples/existing-cluster-with-base-and-infra/main.tf b/examples/existing-cluster-with-base-and-infra/main.tf
index 00dec7b..87c328e 100644
--- a/examples/existing-cluster-with-base-and-infra/main.tf
+++ b/examples/existing-cluster-with-base-and-infra/main.tf
@@ -28,7 +28,7 @@ terraform {
   required_providers {
     grafana = {
       source  = "grafana/grafana"
-      version = "1.24.0"
+      version = "1.25.0"
     }
   }
 }
@@ -78,6 +78,17 @@ module "eks_observability_accelerator" {
   tags = local.tags
 }
 
+# https://www.terraform.io/language/modules/develop/providers
+# A module intended to be called by one or more other modules must not contain
+# any provider blocks.
+# This allows forcing depedency between base and workloads module
+provider "grafana" {
+  url = module.eks_observability_accelerator.managed_grafana_workspace_endpoint
+
+  # TODO: manage with Secrets manager
+  auth = var.grafana_api_key
+}
+
 module "workloads_infra" {
   source = "../../workloads/infra"
   # source = "aws-ia/terrarom-aws-observability-accelerator/workloads/infra"
@@ -91,16 +102,10 @@ module "workloads_infra" {
   managed_prometheus_workspace_endpoint = module.eks_observability_accelerator.managed_prometheus_workspace_endpoint
   managed_prometheus_workspace_region   = module.eks_observability_accelerator.managed_prometheus_workspace_region
 
-
-  managed_grafana_workspace_endpoint = module.eks_observability_accelerator.managed_grafana_workspace_endpoint
-
-  # TODO: manage with Secrets manager
-  grafana_api_key = var.grafana_api_key
-
   # module custom configuration, check module documentation
   # config               = {}
 
-  # depends_on = [
-  #   module.eks_observability_accelerator
-  # ]
+  depends_on = [
+    module.eks_observability_accelerator
+  ]
 }
diff --git a/providers.tf b/providers.tf
index 5d3dec0..3f4e291 100644
--- a/providers.tf
+++ b/providers.tf
@@ -11,7 +11,7 @@ terraform {
     }
     grafana = {
       source  = "grafana/grafana"
-      version = "1.24.0"
+      version = "1.25.0"
     }
   }
 }
diff --git a/workloads/infra/main.tf b/workloads/infra/main.tf
index 6103eea..6405fb3 100644
--- a/workloads/infra/main.tf
+++ b/workloads/infra/main.tf
@@ -3,16 +3,11 @@ terraform {
   required_providers {
     grafana = {
       source  = "grafana/grafana"
-      version = "1.24.0"
+      version = "1.25.0"
     }
   }
 }
 
-provider "grafana" {
-  url  = var.managed_grafana_workspace_endpoint
-  auth = var.grafana_api_key
-}
-
 resource "helm_release" "kube_state_metrics" {
   count            = var.config.enable_kube_state_metrics ? 1 : 0
   chart            = var.config.ksm_helm_chart_name
diff --git a/workloads/infra/variables.tf b/workloads/infra/variables.tf
index 1e67e7c..efe042c 100644
--- a/workloads/infra/variables.tf
+++ b/workloads/infra/variables.tf
@@ -3,7 +3,6 @@ variable "eks_cluster_id" {
   type        = string
 }
 
-
 variable "helm_config" {
   description = "Helm Config for Prometheus"
   type        = any
@@ -39,16 +38,6 @@ variable "managed_prometheus_workspace_region" {
   default     = null
 }
 
-variable "managed_grafana_workspace_endpoint" {
-  type    = string
-  default = ""
-}
-
-variable "grafana_api_key" {
-  type    = string
-  default = null
-}
-
 variable "dashboards_folder_id" {
   type = string
 }
diff --git a/workloads/java/main.tf b/workloads/java/main.tf
index 2f1d050..dfc135b 100644
--- a/workloads/java/main.tf
+++ b/workloads/java/main.tf
@@ -1,4 +1,3 @@
-
 locals {
   name      = "adot-collector-java"
   namespace = try(var.helm_config.namespace, local.name)
@@ -8,7 +7,7 @@ terraform {
   required_providers {
     grafana = {
       source  = "grafana/grafana"
-      version = "1.24.0"
+      version = "1.25.0"
     }
   }
 }