refactor: making things elegant

darklab8 · Jul 29, 2024 · 91785ed · 91785ed
1 parent d20f99f
commit 91785ed
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 26 deletions.
diff --git a/tf/production/main.tf b/tf/production/main.tf
@@ -7,10 +7,6 @@ module "server" {
   name   = "node-arm"
 }
 
-data "aws_ssm_parameter" "darkbot" {
-  name = "/terraform/hetzner/darkbot/production"
-}
-
 data "external" "secrets_darkbot" {
   program = ["pass", "api/personal/terraform/hetzner/darkbot/production"]
 }

diff --git a/tf/production/providers.tf b/tf/production/providers.tf
@@ -19,16 +19,20 @@ terraform {
   }
 }
 
-data "external" "secrets_providers" {
-  program = ["bash", "${path.module}/secrets_providers.sh"]
+data "external" "secrets_cloudflare" {
+  program = ["pass", "api/personal/terraform/cloudflare/dd84ai"]
+}
+
+data "external" "secrets_hetzner" {
+  program = ["pass", "api/personal/terraform/hetzner/production"]
 }
 
 provider "hcloud" {
-  token = data.external.secrets_providers.result["hetzner_token"]
+  token = data.external.secrets_hetzner.result["token"]
 }
 
 provider "cloudflare" {
-  api_token = data.external.secrets_providers.result["cloudflare_token"]
+  api_token = data.external.secrets_cloudflare.result["token"]
 }
 
 provider "kubernetes" {

diff --git a/tf/production/secrets_providers.sh b/tf/production/secrets_providers.sh
diff --git a/tf/staging/providers.tf b/tf/staging/providers.tf
@@ -22,16 +22,20 @@ terraform {
   }
 }
 
-data "external" "secrets_providers" {
-  program = ["bash", "${path.module}/secrets_providers.sh"]
+data "external" "secrets_cloudflare" {
+  program = ["pass", "api/personal/terraform/cloudflare/dd84ai"]
+}
+
+data "external" "secrets_hetzner" {
+  program = ["pass", "api/personal/terraform/hetzner/production"]
 }
 
 provider "hcloud" {
-  token = data.external.secrets_providers.result["hetzner_token"]
+  token = data.external.secrets_hetzner.result["token"]
 }
 
 provider "cloudflare" {
-  api_token = data.external.secrets_providers.result["cloudflare_token"]
+  api_token = data.external.secrets_cloudflare.result["token"]
 }
 
 provider "kubernetes" {

diff --git a/tf/staging/secrets_providers.sh b/tf/staging/secrets_providers.sh