Fixing examples integration.

spectrocloud · Oct 7, 2021 · 0d58803 · 0d58803
1 parent abf0ff4
commit 0d58803
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 138 deletions.
diff --git a/examples/config/cluster/cluster-eks-dev.yaml b/examples/config/cluster/cluster-eks-dev.yaml
@@ -2,7 +2,7 @@ name: eks-dev
 cloud_account: dev-030
 profiles:
   infra:
-    name: EKS-Base
+    name: profile_infra
     packs:
       - name: kubernetes-eks
         version: "1.20"

diff --git a/examples/config/profile/profile-addon-1.yaml b/examples/config/profile/profile-addon-1.yaml
@@ -1,5 +1,5 @@
-name: profile_addon
-description: profile_addon
+name: addon-profile-1
+description: addon-profile-1
 type: add-on
 defaultRepoURL: "${REPO_URL}"
 

diff --git a/examples/mod_spectro_org.tf b/examples/mod_spectro_org.tf
@@ -1,11 +1,5 @@
-/*module "fetcher_accounts" {
-  source     = "./modules/fetcher"
-  rsubfolder = local.accounts_folder
-  rprefix    = "account-"
-}*/
-
 locals {
-  accounts_params = { ACCOUNT_DEV_NAME = "ehs-dev-030", ACCOUNT_PROD_NAME = "ehs-stg-004" }
+  accounts_params = { ACCOUNT_DEV_NAME = "dev-030", ACCOUNT_PROD_NAME = "ehs-stg-004" }
 
   bsl_params = { BSL_NAME = "qa-sharma" }
 
@@ -30,17 +24,12 @@ locals {
 }
 
 module "SpectroOrg" {
-  source          = "../"
-  sc_host         = "api.stage.spectrocloud.com"    #e.g: api.spectrocloud.com (for SaaS)
-  sc_username     = "[email protected]" #e.g: [email protected]
-  sc_password     = "welcome2Spectr0!1"             #e.g: supereSecure1!
+  source          = "github.com/spectrocloud/terraform-spectrocloud-modules"
+  sc_host         = ""    #e.g: api.spectrocloud.com (for SaaS)
+  sc_username     = "" #e.g: [email protected]
+  sc_password     = ""             #e.g: supereSecure1!
   sc_project_name = "Default"                       #e.g: Default
 
-  /*accounts = tomap({
-    for k, v in module.fetcher_accounts.object_files :
-    k => yamldecode(templatefile(join("", [local.accounts_folder, "/${k}"]), local.accounts_params))
-  })*/
-
   accounts = {
     for k in fileset("config/account", "account-*.yaml") :
   trimsuffix(k, ".yaml") => yamldecode(templatefile("config/account/${k}", local.accounts_params))
@@ -67,7 +56,7 @@ module "SpectroOrg" {
   }
 
   clusters = {
-  for k in fileset("config/cluster", "team-*.yaml") :
-  trimsuffix(k, ".yaml") => yamldecode(templatefile("config/project/${k}", {}))
+  for k in fileset("config/cluster", "cluster-eks-*.yaml") :
+  trimsuffix(k, ".yaml") => yamldecode(file("config/cluster/${k}"))
   }
 }
diff --git a/examples/modules/fetch_replace/main.tf b/examples/modules/fetch_replace/main.tf
diff --git a/examples/modules/fetch_replace/output.tf b/examples/modules/fetch_replace/output.tf
diff --git a/examples/modules/fetch_replace/variables.tf b/examples/modules/fetch_replace/variables.tf
diff --git a/examples/modules/fetcher/main.tf b/examples/modules/fetcher/main.tf
diff --git a/examples/modules/fetcher/output.tf b/examples/modules/fetcher/output.tf
diff --git a/examples/modules/fetcher/variables.tf b/examples/modules/fetcher/variables.tf
diff --git a/examples/modules/replacer/main.tf b/examples/modules/replacer/main.tf
diff --git a/examples/modules/replacer/output.tf b/examples/modules/replacer/output.tf
diff --git a/examples/modules/replacer/variables.tf b/examples/modules/replacer/variables.tf
diff --git a/examples/providers.tf b/examples/providers.tf
@@ -18,7 +18,7 @@ variable "sc_username" {
 
 variable "sc_password" {
   description = "Spectro Cloud Password"
-  sensitive   = true
+  //sensitive   = true
 }
 
 variable "sc_project_name" {

diff --git a/main.tf b/main.tf
@@ -18,7 +18,7 @@ variable "sc_username" {
 
 variable "sc_password" {
   description = "Spectro Cloud Password"
-  sensitive   = true
+  //sensitive   = true
 }
 
 variable "sc_project_name" {

diff --git a/spectro-aws-account.tf b/spectro-aws-account.tf
@@ -12,6 +12,10 @@ data "spectrocloud_cloudaccount_aws" "this" {
   for_each = local.cloud_account_names
 
   name = each.value
+
+  depends_on = [
+    resource.spectrocloud_cloudaccount_aws.account
+  ]
 }
 
 resource "spectrocloud_cloudaccount_aws" "account" {

diff --git a/spectro-profile.tf b/spectro-profile.tf
@@ -53,9 +53,13 @@ data "spectrocloud_cluster_profile" "this" {
   for_each = local.profile_names
 
   name = each.value
+
+  depends_on = [
+    resource.spectrocloud_cluster_profile.profile_resource
+  ]
 }
 
-resource "spectrocloud_cluster_profile" "infra" {
+resource "spectrocloud_cluster_profile" "profile_resource" {
   for_each    = var.profiles
   name        = each.value.name
   description = each.value.description

diff --git a/spectro-s3-sts-backup.tf b/spectro-s3-sts-backup.tf
@@ -11,6 +11,10 @@ data "spectrocloud_backup_storage_location" "this" {
   for_each = local.bsl_names
 
   name = each.value
+
+  depends_on = [
+    resource.spectrocloud_backup_storage_location.bsl
+  ]
 }
 
 resource "spectrocloud_backup_storage_location" "bsl" {

diff --git a/variables.tf b/variables.tf
@@ -23,7 +23,6 @@ variable "teams" {
 }
 
 variable "clusters" {
-  type    = map(any)
   default = {}
 }