fixes for demo account action

OpsLevel · Jan 13, 2025 · 26d4805 · 26d4805
1 parent 3be9f9d
commit 26d4805
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ terraform.rc
 
 # Ignore IDE configuration files
 .idea
+.DS_Store
diff --git a/modules/demo_account/rubric_bronze.tf b/modules/demo_account/rubric_bronze.tf
@@ -4,7 +4,7 @@ module "service_owner_defined" {
   name     = "Owner is Defined"
   category = opslevel_rubric_category.all["quality"].id
   level    = opslevel_rubric_level.all["bronze"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 }
 
@@ -15,7 +15,7 @@ module "service_repo_defined" {
   name     = "Repository is Defined"
   category = opslevel_rubric_category.all["quality"].id
   level    = opslevel_rubric_level.all["bronze"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 }
 
@@ -25,7 +25,7 @@ module "service_tier_defined" {
   name     = "Tier is Defined"
   category = opslevel_rubric_category.all["quality"].id
   level    = opslevel_rubric_level.all["bronze"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   property = "tier_index"
@@ -38,7 +38,7 @@ module "branch_protection" {
   name     = "Default Branch is Protected"
   category = opslevel_rubric_category.all["security"].id
   level    = opslevel_rubric_level.all["bronze"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 }
 
@@ -48,7 +48,7 @@ module "has_sentry" {
   name     = "Has Error Tracking"
   category = opslevel_rubric_category.all["reliability"].id
   level    = opslevel_rubric_level.all["bronze"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tool_category = "errors"
@@ -64,7 +64,7 @@ module "has_deployed_this_qtr" {
   name     = "[UPCOMING] Has Deployed this Quarter"
   category = opslevel_rubric_category.all["observability"].id
   level    = opslevel_rubric_level.all["bronze"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = false
 
   days = 90
@@ -76,7 +76,7 @@ module "has_dependencies" {
   name     = "Has Defined Dependencies"
   category = opslevel_rubric_category.all["observability"].id
   level    = opslevel_rubric_level.all["bronze"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 }
 

diff --git a/modules/demo_account/rubric_gold.tf b/modules/demo_account/rubric_gold.tf
@@ -4,7 +4,7 @@ module "service_product_defined" {
   name     = "Product is Defined"
   category = opslevel_rubric_category.all["quality"].id
   level    = opslevel_rubric_level.all["gold"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   property = "product"
@@ -16,7 +16,7 @@ module "service_system_defined" {
   name     = "System is Defined"
   category = opslevel_rubric_category.all["quality"].id
   level    = opslevel_rubric_level.all["gold"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   property = "system"
@@ -28,7 +28,7 @@ module "has_runbooks" {
   name     = "Runbooks Defined"
   category = opslevel_rubric_category.all["reliability"].id
   level    = opslevel_rubric_level.all["gold"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tool_category = "runbooks"
@@ -40,7 +40,7 @@ module "slos_defined" {
   name     = "[UPCOMING] Has SLOs Defined"
   category = opslevel_rubric_category.all["reliability"].id
   level    = opslevel_rubric_level.all["gold"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = false
 }
 
@@ -50,7 +50,7 @@ module "fast_deploys" {
   name     = "CD is Fast"
   category = opslevel_rubric_category.all["performance"].id
   level    = opslevel_rubric_level.all["gold"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tag_key = "deploy_speed"
@@ -66,7 +66,7 @@ module "has_deployed_this_sprint" {
   name     = "Has Deployed this Sprint"
   category = opslevel_rubric_category.all["observability"].id
   level    = opslevel_rubric_level.all["gold"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   days = 14
@@ -78,7 +78,7 @@ module "check_package_version_testutils" {
   name     = "Uses Latest Test Framework"
   category = opslevel_rubric_category.all["security"].id
   level    = opslevel_rubric_level.all["gold"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   package_constraint     = "matches_version"

diff --git a/modules/demo_account/rubric_platinum.tf b/modules/demo_account/rubric_platinum.tf
@@ -5,7 +5,7 @@ module "manual_approval" {
   notes    = "Approving this check you solemnly swear you have finished all your homework!"
   category = opslevel_rubric_category.all["misc"].id
   level    = opslevel_rubric_level.all["platinum"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 }
 
@@ -15,7 +15,7 @@ module "has_gremlin" {
   name     = "Performs Choas Experiments"
   category = opslevel_rubric_category.all["reliability"].id
   level    = opslevel_rubric_level.all["platinum"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tool_category = "other"
@@ -35,7 +35,7 @@ module "has_sentry_stg" {
   name     = "Has Error Tracking in Staging"
   category = opslevel_rubric_category.all["reliability"].id
   level    = opslevel_rubric_level.all["platinum"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tool_category = "errors"
@@ -51,7 +51,7 @@ module "mttr" {
   name     = "MTTR < 2 hours"
   category = opslevel_rubric_category.all["performance"].id
   level    = opslevel_rubric_level.all["platinum"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tag_key = "mttr"
@@ -67,7 +67,7 @@ module "check_package_version_codecov" {
   name     = "Uses Latest CodeCov"
   category = opslevel_rubric_category.all["security"].id
   level    = opslevel_rubric_level.all["platinum"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   package_constraint     = "matches_version"

diff --git a/modules/demo_account/rubric_silver.tf b/modules/demo_account/rubric_silver.tf
@@ -4,7 +4,7 @@ module "service_lifecycle_defined" {
   name     = "Lifecycle is Defined"
   category = opslevel_rubric_category.all["quality"].id
   level    = opslevel_rubric_level.all["silver"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   property = "lifecycle_index"
@@ -16,7 +16,7 @@ module "has_splunk" {
   name     = "Has Logging Dashboard"
   category = opslevel_rubric_category.all["observability"].id
   level    = opslevel_rubric_level.all["silver"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tool_category = "logs"
@@ -32,7 +32,7 @@ module "has_datadog" {
   name     = "Has Monitoring Dashboard"
   category = opslevel_rubric_category.all["observability"].id
   level    = opslevel_rubric_level.all["silver"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tool_category = "metrics"
@@ -48,7 +48,7 @@ module "has_pagerduty" {
   name     = "Has Alerting/Paging System"
   category = opslevel_rubric_category.all["reliability"].id
   level    = opslevel_rubric_level.all["silver"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tool_category = "incidents"
@@ -64,7 +64,7 @@ module "fast_builds" {
   name     = "CI is Fast"
   category = opslevel_rubric_category.all["performance"].id
   level    = opslevel_rubric_level.all["silver"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   tag_key = "build_speed"
@@ -80,7 +80,7 @@ module "package_version_github_checkout" {
   name     = "Uses Latest GA Checkout"
   category = opslevel_rubric_category.all["security"].id
   level    = opslevel_rubric_level.all["silver"].id
-  owner    = module.teams_from_csv["internal-tools"].this.id
+  owner    = module.teams_from_csv["Internal Tools"].this.id
   enabled  = true
 
   package_constraint     = "matches_version"

diff --git a/modules/demo_account/services.tf b/modules/demo_account/services.tf
@@ -6,6 +6,7 @@ locals {
       lower(replace(key, " ", "_")) => value
     }
   ]
+  csv_teams = toset([for svc in local.csv_services : svc.team_owner])
 }
 
 module "services_from_csv" {
@@ -18,7 +19,7 @@ module "services_from_csv" {
   framework       = each.value.framework
   language        = each.value.language
   lifecycle_alias = each.value.lifecycle
-  owner           = module.teams_from_csv[each.key].this.id
+  owner           = module.teams_from_csv[each.value.team_owner].this.id
   tier_alias      = each.value.tier
   tags            = ["db:mysql", "k8s:true", "build_speed:fast"]
   tools = [
@@ -34,11 +35,11 @@ module "services_from_csv" {
 }
 
 module "teams_from_csv" {
-  for_each = { for svc in local.csv_services : svc.service_name => svc }
+  for_each = {for team in local.csv_teams : team => team }
 
   source = "../team"
 
-  name   = each.value.team_owner
+  name   = each.value
   parent = module.company-all.this.id
 }
 

diff --git a/modules/hierarchy/system/main.tf b/modules/hierarchy/system/main.tf
@@ -8,9 +8,9 @@ resource "opslevel_system" "this" {
   owner       = local.owner
 }
 
-//resource "opslevel_service_relationship" "this" {
-//  for_each = { for service in var.services : service => service }
-//
-//  system  = opslevel_system.this.id
-//  service = each.value
-//}
+# resource "opslevel_service_relationship" "this" {
+#  for_each = toset(var.services)
+#
+#  system  = opslevel_system.this.id
+#  service = each.value
+# }
diff --git a/workspace/versions.tf b/workspace/versions.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     opslevel = {
       source  = "OpsLevel/opslevel"
-      version = "1.3.5"
+      version = "1.3.6"
     }
   }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,3 +38,4 @@ terraform.rc

		# Ignore IDE configuration files
		.idea
		.DS_Store