feat(vault-github): use coder_env to set VAULT_ADDR in workspace (#112)

matifali · web-flow · commit f8faea1855fb · 2023-12-16T19:00:50.000+03:00
diff --git a/vault-github/README.md b/vault-github/README.md
@@ -17,16 +17,6 @@ module "vault" {
     agent_id   = coder_agent.example.id
     vault_addr = "https://vault.example.com"
 }
-
-# A workaround until we have https://github.com/coder/terraform-provider-coder/issues/170
-resource "coder_agent" "example" {
-    ...
-    env = {
-        VAULT_ADDR = "https://vault.example.com"
-    }
-    ...
-}
-
 ```
 
 Then you can use the Vault CLI in your workspaces to fetch secrets from Vault:
diff --git a/vault-github/main.tf b/vault-github/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = ">= 0.12"
+      version = ">= 0.12.4"
     }
   }
 }
@@ -43,6 +43,7 @@ variable "vault_cli_version" {
 }
 
 data "coder_workspace" "me" {}
+
 resource "coder_script" "vault" {
   agent_id     = var.agent_id
   display_name = "Vault (GitHub)"
@@ -57,6 +58,12 @@ resource "coder_script" "vault" {
   start_blocks_login = true
 }
 
+resource "coder_env" "vault_addr" {
+  agent_id = var.agent_id
+  name     = "VAULT_ADDR"
+  value    = var.vault_addr
+}
+
 data "coder_external_auth" "github" {
   id = var.coder_github_auth_id
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`coder = {`
`6`	`6`	`source = "coder/coder"`
`7`		`- version = ">= 0.12"`
	`7`	`+ version = ">= 0.12.4"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`
`@@ -43,6 +43,7 @@ variable "vault_cli_version" {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`data "coder_workspace" "me" {}`
	`46`	`+`
`46`	`47`	`resource "coder_script" "vault" {`
`47`	`48`	`agent_id = var.agent_id`
`48`	`49`	`display_name = "Vault (GitHub)"`
`@@ -57,6 +58,12 @@ resource "coder_script" "vault" {`
`57`	`58`	`start_blocks_login = true`
`58`	`59`	`}`
`59`	`60`
	`61`	`+resource "coder_env" "vault_addr" {`
	`62`	`+ agent_id = var.agent_id`
	`63`	`+ name = "VAULT_ADDR"`
	`64`	`+ value = var.vault_addr`
	`65`	`+}`
	`66`	`+`
`60`	`67`	`data "coder_external_auth" "github" {`
`61`	`68`	`id = var.coder_github_auth_id`
`62`	`69`	`}`