opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: use app wildcards for apps if configured (#4263)

Browse Source 
* feat: use app wildcards for apps if configured

* feat: relative_path -> subdomain

- rename relative_path -> subdomain when referring to apps
    - migrate workspace_apps.relative_path to workspace_apps.subdomain
- upgrade coder/coder terraform module to 0.5.0
This commit is contained in:
Dean Sheather
2022-10-05 19:23:01 +00:00
committed by GitHub
parent 4f3958c831
commit 2a66395fb7
57 changed files with 577 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
provisioner/terraform/testdata/calling-module/calling-module.tf
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.15"
version = "0.5.0"
}
}
}
provisioner/terraform/testdata/calling-module/calling-module.tfplan.json
Generated Vendored
+11 -24
View File
@@ -66,9 +66,7 @@
"name": "main",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -84,7 +82,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -95,9 +95,7 @@
"name": "script",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"read"
],
"actions": ["read"],
"before": null,
"after": {
"inputs": {}
@@ -127,9 +125,7 @@
"name": "example",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -147,7 +143,7 @@
"coder": {
"name": "coder",
"full_name": "registry.terraform.io/coder/coder",
"version_constraint": "0.4.11"
"version_constraint": "0.5.0"
},
"module.module:null": {
"name": "null",
@@ -179,10 +175,7 @@
"source": "./module",
"expressions": {
"script": {
"references": [
"coder_agent.main.init_script",
"coder_agent.main"
]
"references": ["coder_agent.main.init_script", "coder_agent.main"]
}
},
"module": {
@@ -194,9 +187,7 @@
"name": "example",
"provider_config_key": "module.module:null",
"schema_version": 0,
"depends_on": [
"data.null_data_source.script"
]
"depends_on": ["data.null_data_source.script"]
},
{
"address": "data.null_data_source.script",
@@ -206,9 +197,7 @@
"provider_config_key": "module.module:null",
"expressions": {
"inputs": {
"references": [
"var.script"
]
"references": ["var.script"]
}
},
"schema_version": 0
@@ -225,9 +214,7 @@
"relevant_attributes": [
{
"resource": "coder_agent.main",
"attribute": [
"init_script"
]
"attribute": ["init_script"]
}
]
}
provisioner/terraform/testdata/calling-module/calling-module.tfstate.json
Generated Vendored
+4 -4
View File
@@ -16,11 +16,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "f5435556-71b4-4e9c-a961-474ef4c70836",
"id": "b92bd0ce-d854-47af-a2f6-4941cd5dbd27",
"init_script": "",
"os": "linux",
"startup_script": null,
"token": "cbe1cec2-8c52-4411-ab1b-c7e9aa4e93ea"
"token": "3f1b6b3f-7ea9-4944-bef4-8be9b78db8ae"
},
"sensitive_values": {}
}
@@ -44,7 +44,7 @@
"outputs": {
"script": ""
},
"random": "2977741887145450154"
"random": "5257014674084238393"
},
"sensitive_values": {
"inputs": {},
@@ -59,7 +59,7 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "3098344175322958112",
"id": "6805057619323391144",
"triggers": null
},
"sensitive_values": {},
provisioner/terraform/testdata/chaining-resources/chaining-resources.tf
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.15"
version = "0.5.0"
}
}
}
provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json
Generated Vendored
+9 -17
View File
@@ -56,9 +56,7 @@
"name": "main",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -74,7 +72,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -84,9 +84,7 @@
"name": "a",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -105,9 +103,7 @@
"name": "b",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -125,7 +121,7 @@
"coder": {
"name": "coder",
"full_name": "registry.terraform.io/coder/coder",
"version_constraint": "0.4.11"
"version_constraint": "0.5.0"
},
"null": {
"name": "null",
@@ -157,9 +153,7 @@
"name": "a",
"provider_config_key": "null",
"schema_version": 0,
"depends_on": [
"null_resource.b"
]
"depends_on": ["null_resource.b"]
},
{
"address": "null_resource.b",
@@ -168,9 +162,7 @@
"name": "b",
"provider_config_key": "null",
"schema_version": 0,
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
}
]
}
provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json
Generated Vendored
+6 -11
View File
@@ -16,11 +16,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "846b2cd1-1dcc-4b26-ad71-8508c8d71738",
"id": "d8de89cb-bb6b-4f4f-80f8-e5d39e8c5f62",
"init_script": "",
"os": "linux",
"startup_script": null,
"token": "3a3e4e25-6be2-4b51-a369-957fdb243a4f"
"token": "4e877d5c-95c4-4365-b9a1-856348b54f43"
},
"sensitive_values": {}
},
@@ -32,14 +32,11 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "8441562949971496089",
"id": "2870641260310442024",
"triggers": null
},
"sensitive_values": {},
"depends_on": [
"coder_agent.main",
"null_resource.b"
]
"depends_on": ["coder_agent.main", "null_resource.b"]
},
{
"address": "null_resource.b",
@@ -49,13 +46,11 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "4737933879128730392",
"id": "7093709823890756895",
"triggers": null
},
"sensitive_values": {},
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
}
]
}
provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.15"
version = "0.5.0"
}
}
}
provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfplan.json
Generated Vendored
+9 -17
View File
@@ -56,9 +56,7 @@
"name": "main",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -74,7 +72,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -84,9 +84,7 @@
"name": "first",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -105,9 +103,7 @@
"name": "second",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -125,7 +121,7 @@
"coder": {
"name": "coder",
"full_name": "registry.terraform.io/coder/coder",
"version_constraint": "0.4.11"
"version_constraint": "0.5.0"
},
"null": {
"name": "null",
@@ -157,9 +153,7 @@
"name": "first",
"provider_config_key": "null",
"schema_version": 0,
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
},
{
"address": "null_resource.second",
@@ -168,9 +162,7 @@
"name": "second",
"provider_config_key": "null",
"schema_version": 0,
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
}
]
}
provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json
Generated Vendored
+6 -10
View File
@@ -16,11 +16,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "2efd4acf-bb30-4713-98b5-21fef293c995",
"id": "5c00c97c-7291-47b7-96cf-3ac7d7588a99",
"init_script": "",
"os": "linux",
"startup_script": null,
"token": "7db84d6e-c079-4b4a-99e0-e2414a70df84"
"token": "a1939d12-8b8a-414b-b745-3fac020e51c0"
},
"sensitive_values": {}
},
@@ -32,13 +32,11 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "6618109150570768254",
"id": "8930370582092686733",
"triggers": null
},
"sensitive_values": {},
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
},
{
"address": "null_resource.second",
@@ -48,13 +46,11 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "4505836003282545145",
"id": "8209925920170986769",
"triggers": null
},
"sensitive_values": {},
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
}
]
}
provisioner/terraform/testdata/instance-id/instance-id.tf
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.15"
version = "0.5.0"
}
}
}
provisioner/terraform/testdata/instance-id/instance-id.tfplan.json
Generated Vendored
+10 -21
View File
@@ -56,9 +56,7 @@
"name": "main",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -74,7 +72,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -84,9 +84,7 @@
"name": "main",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"instance_id": "example"
@@ -106,9 +104,7 @@
"name": "main",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -126,7 +122,7 @@
"coder": {
"name": "coder",
"full_name": "registry.terraform.io/coder/coder",
"version_constraint": "0.4.11"
"version_constraint": "0.5.0"
},
"null": {
"name": "null",
@@ -162,10 +158,7 @@
"provider_config_key": "coder",
"expressions": {
"agent_id": {
"references": [
"coder_agent.main.id",
"coder_agent.main"
]
"references": ["coder_agent.main.id", "coder_agent.main"]
},
"instance_id": {
"constant_value": "example"
@@ -180,9 +173,7 @@
"name": "main",
"provider_config_key": "null",
"schema_version": 0,
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
}
]
}
@@ -190,9 +181,7 @@
"relevant_attributes": [
{
"resource": "coder_agent.main",
"attribute": [
"id"
]
"attribute": ["id"]
}
]
}
provisioner/terraform/testdata/instance-id/instance-id.tfstate.json
Generated Vendored
+7 -11
View File
@@ -16,11 +16,11 @@
"auth": "google-instance-identity",
"dir": null,
"env": null,
"id": "e2d2e12e-1975-4bca-8a96-67d6b303b25b",
"id": "248ed639-3dbe-479e-909a-37d5d226529f",
"init_script": "",
"os": "linux",
"startup_script": null,
"token": "87ba2736-3519-4368-b9ee-4132bd042fe3"
"token": "8bee2595-095f-4965-ade2-deef475023d6"
},
"sensitive_values": {}
},
@@ -32,14 +32,12 @@
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 0,
"values": {
"agent_id": "e2d2e12e-1975-4bca-8a96-67d6b303b25b",
"id": "979121e7-2a41-432a-aa90-8b0d2d802b50",
"agent_id": "248ed639-3dbe-479e-909a-37d5d226529f",
"id": "edbfac7a-a88d-433a-ab7c-be3816656477",
"instance_id": "example"
},
"sensitive_values": {},
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
},
{
"address": "null_resource.main",
@@ -49,13 +47,11 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "3316746911978433294",
"id": "5674804341417746589",
"triggers": null
},
"sensitive_values": {},
"depends_on": [
"coder_agent.main"
]
"depends_on": ["coder_agent.main"]
}
]
}
provisioner/terraform/testdata/multiple-agents/multiple-agents.tf
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.15"
version = "0.5.0"
}
}
}
provisioner/terraform/testdata/multiple-agents/multiple-agents.tfplan.json
Generated Vendored
+14 -16
View File
@@ -78,9 +78,7 @@
"name": "dev1",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -96,7 +94,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -106,9 +106,7 @@
"name": "dev2",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -124,7 +122,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -134,9 +134,7 @@
"name": "dev3",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "arm64",
@@ -152,7 +150,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -162,9 +162,7 @@
"name": "dev",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -182,7 +180,7 @@
"coder": {
"name": "coder",
"full_name": "registry.terraform.io/coder/coder",
"version_constraint": "0.4.11"
"version_constraint": "0.5.0"
},
"null": {
"name": "null",
provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json
Generated Vendored
+7 -7
View File
@@ -16,11 +16,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "032d71aa-570d-4d0a-bce8-57b9d884b694",
"id": "882ce97a-3c12-410f-8916-e3bc03862162",
"init_script": "",
"os": "linux",
"startup_script": null,
"token": "7a0df6bf-313d-4f73-ba2c-6532d72cb808"
"token": "b24ba29b-8cb3-42da-91c5-599c7be310f7"
},
"sensitive_values": {}
},
@@ -36,11 +36,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "019ae4b9-ae5c-4837-be16-dae99b911acf",
"id": "8a26cec7-3189-4eaf-99a1-1dce00b756dc",
"init_script": "",
"os": "darwin",
"startup_script": null,
"token": "9f4adbf4-9113-42f4-bb84-d1621262b1e2"
"token": "6a155e3b-3279-40cb-9c16-4b827b561bc1"
},
"sensitive_values": {}
},
@@ -56,11 +56,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "8f2c3b12-e112-405e-9fbf-fe540ed3fe21",
"id": "57486477-64a5-4fea-8223-dbf3c259d710",
"init_script": "",
"os": "windows",
"startup_script": null,
"token": "1a6ddbc7-77a9-43c2-9e60-c84d3ecf512a"
"token": "0fa9933e-802a-4d6a-b273-43c05993e52a"
},
"sensitive_values": {}
},
@@ -72,7 +72,7 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "6351611769218065391",
"id": "8587500025119121667",
"triggers": null
},
"sensitive_values": {},
provisioner/terraform/testdata/multiple-apps/multiple-apps.tf
Vendored
+13 -2
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.15"
version = "0.5.0"
}
}
}
@@ -12,12 +12,17 @@ resource "coder_agent" "dev1" {
arch = "amd64"
}
# app1 is for testing subdomain default.
resource "coder_app" "app1" {
agent_id = coder_agent.dev1.id
# subdomain should default to false.
# subdomain = false
}
# app2 tests that subdomaincan be true, and that healthchecks work.
resource "coder_app" "app2" {
agent_id = coder_agent.dev1.id
agent_id = coder_agent.dev1.id
subdomain = true
healthcheck {
url = "http://localhost:13337/healthz"
interval = 5
@@ -25,6 +30,12 @@ resource "coder_app" "app2" {
}
}
# app3 tests that subdomain can explicitly be false.
resource "coder_app" "app3" {
agent_id = coder_agent.dev1.id
subdomain = false
}
resource "null_resource" "dev" {
depends_on = [
coder_agent.dev1
provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.dot
Generated Vendored
+3
View File
@@ -5,16 +5,19 @@ digraph {
"[root] coder_agent.dev1 (expand)" [label = "coder_agent.dev1", shape = "box"]
"[root] coder_app.app1 (expand)" [label = "coder_app.app1", shape = "box"]
"[root] coder_app.app2 (expand)" [label = "coder_app.app2", shape = "box"]
"[root] coder_app.app3 (expand)" [label = "coder_app.app3", shape = "box"]
"[root] null_resource.dev (expand)" [label = "null_resource.dev", shape = "box"]
"[root] provider[\"registry.terraform.io/coder/coder\"]" [label = "provider[\"registry.terraform.io/coder/coder\"]", shape = "diamond"]
"[root] provider[\"registry.terraform.io/hashicorp/null\"]" [label = "provider[\"registry.terraform.io/hashicorp/null\"]", shape = "diamond"]
"[root] coder_agent.dev1 (expand)" -> "[root] provider[\"registry.terraform.io/coder/coder\"]"
"[root] coder_app.app1 (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] coder_app.app2 (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] coder_app.app3 (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] null_resource.dev (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] null_resource.dev (expand)" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"]"
"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_app.app1 (expand)"
"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_app.app2 (expand)"
"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_app.app3 (expand)"
"[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)" -> "[root] null_resource.dev (expand)"
"[root] root" -> "[root] provider[\"registry.terraform.io/coder/coder\"] (close)"
"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json
Generated Vendored
+85 -37
View File
@@ -34,6 +34,7 @@
"icon": null,
"name": null,
"relative_path": null,
"subdomain": null,
"url": null
},
"sensitive_values": {
@@ -59,12 +60,31 @@
"icon": null,
"name": null,
"relative_path": null,
"subdomain": true,
"url": null
},
"sensitive_values": {
"healthcheck": [
{}
]
"healthcheck": [{}]
}
},
{
"address": "coder_app.app3",
"mode": "managed",
"type": "coder_app",
"name": "app3",
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 0,
"values": {
"command": null,
"healthcheck": [],
"icon": null,
"name": null,
"relative_path": null,
"subdomain": false,
"url": null
},
"sensitive_values": {
"healthcheck": []
}
},
{
@@ -90,9 +110,7 @@
"name": "dev1",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -120,9 +138,7 @@
"name": "app1",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"command": null,
@@ -130,6 +146,7 @@
"icon": null,
"name": null,
"relative_path": null,
"subdomain": null,
"url": null
},
"after_unknown": {
@@ -150,9 +167,7 @@
"name": "app2",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"command": null,
@@ -166,20 +181,46 @@
"icon": null,
"name": null,
"relative_path": null,
"subdomain": true,
"url": null
},
"after_unknown": {
"agent_id": true,
"healthcheck": [
{}
],
"healthcheck": [{}],
"id": true
},
"before_sensitive": false,
"after_sensitive": {
"healthcheck": [
{}
]
"healthcheck": [{}]
}
}
},
{
"address": "coder_app.app3",
"mode": "managed",
"type": "coder_app",
"name": "app3",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": ["create"],
"before": null,
"after": {
"command": null,
"healthcheck": [],
"icon": null,
"name": null,
"relative_path": null,
"subdomain": false,
"url": null
},
"after_unknown": {
"agent_id": true,
"healthcheck": [],
"id": true
},
"before_sensitive": false,
"after_sensitive": {
"healthcheck": []
}
}
},
@@ -190,9 +231,7 @@
"name": "dev",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -210,7 +249,7 @@
"coder": {
"name": "coder",
"full_name": "registry.terraform.io/coder/coder",
"version_constraint": "0.4.14"
"version_constraint": "0.5.0"
},
"null": {
"name": "null",
@@ -243,10 +282,7 @@
"provider_config_key": "coder",
"expressions": {
"agent_id": {
"references": [
"coder_agent.dev1.id",
"coder_agent.dev1"
]
"references": ["coder_agent.dev1.id", "coder_agent.dev1"]
}
},
"schema_version": 0
@@ -259,10 +295,7 @@
"provider_config_key": "coder",
"expressions": {
"agent_id": {
"references": [
"coder_agent.dev1.id",
"coder_agent.dev1"
]
"references": ["coder_agent.dev1.id", "coder_agent.dev1"]
},
"healthcheck": [
{
@@ -276,7 +309,26 @@
"constant_value": "http://localhost:13337/healthz"
}
}
]
],
"subdomain": {
"constant_value": true
}
},
"schema_version": 0
},
{
"address": "coder_app.app3",
"mode": "managed",
"type": "coder_app",
"name": "app3",
"provider_config_key": "coder",
"expressions": {
"agent_id": {
"references": ["coder_agent.dev1.id", "coder_agent.dev1"]
},
"subdomain": {
"constant_value": false
}
},
"schema_version": 0
},
@@ -287,9 +339,7 @@
"name": "dev",
"provider_config_key": "null",
"schema_version": 0,
"depends_on": [
"coder_agent.dev1"
]
"depends_on": ["coder_agent.dev1"]
}
]
}
@@ -297,9 +347,7 @@
"relevant_attributes": [
{
"resource": "coder_agent.dev1",
"attribute": [
"id"
]
"attribute": ["id"]
}
]
}
provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.dot
Generated Vendored
+3
View File
@@ -5,16 +5,19 @@ digraph {
"[root] coder_agent.dev1 (expand)" [label = "coder_agent.dev1", shape = "box"]
"[root] coder_app.app1 (expand)" [label = "coder_app.app1", shape = "box"]
"[root] coder_app.app2 (expand)" [label = "coder_app.app2", shape = "box"]
"[root] coder_app.app3 (expand)" [label = "coder_app.app3", shape = "box"]
"[root] null_resource.dev (expand)" [label = "null_resource.dev", shape = "box"]
"[root] provider[\"registry.terraform.io/coder/coder\"]" [label = "provider[\"registry.terraform.io/coder/coder\"]", shape = "diamond"]
"[root] provider[\"registry.terraform.io/hashicorp/null\"]" [label = "provider[\"registry.terraform.io/hashicorp/null\"]", shape = "diamond"]
"[root] coder_agent.dev1 (expand)" -> "[root] provider[\"registry.terraform.io/coder/coder\"]"
"[root] coder_app.app1 (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] coder_app.app2 (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] coder_app.app3 (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] null_resource.dev (expand)" -> "[root] coder_agent.dev1 (expand)"
"[root] null_resource.dev (expand)" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"]"
"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_app.app1 (expand)"
"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_app.app2 (expand)"
"[root] provider[\"registry.terraform.io/coder/coder\"] (close)" -> "[root] coder_app.app3 (expand)"
"[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)" -> "[root] null_resource.dev (expand)"
"[root] root" -> "[root] provider[\"registry.terraform.io/coder/coder\"] (close)"
"[root] root" -> "[root] provider[\"registry.terraform.io/hashicorp/null\"] (close)"
provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json
Generated Vendored
+36 -19
View File
@@ -16,11 +16,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "685dba1f-09de-40c0-8fc0-4d8ca00ef946",
"id": "ecf210c8-aaa7-4a14-9b44-2a5f805f0126",
"init_script": "",
"os": "linux",
"startup_script": null,
"token": "2c73d680-ef4c-4bc1-80f0-f6916e4e5255"
"token": "7e748146-cea2-45cb-927d-b4a90b0021b3"
},
"sensitive_values": {}
},
@@ -32,21 +32,20 @@
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 0,
"values": {
"agent_id": "685dba1f-09de-40c0-8fc0-4d8ca00ef946",
"agent_id": "ecf210c8-aaa7-4a14-9b44-2a5f805f0126",
"command": null,
"healthcheck": [],
"icon": null,
"id": "46f8d3cd-bcf7-4792-8d54-66e01e63018a",
"id": "95667002-bd60-4d2c-9313-0666f66c44ff",
"name": null,
"relative_path": null,
"subdomain": null,
"url": null
},
"sensitive_values": {
"healthcheck": []
},
"depends_on": [
"coder_agent.dev1"
]
"depends_on": ["coder_agent.dev1"]
},
{
"address": "coder_app.app2",
@@ -56,7 +55,7 @@
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 0,
"values": {
"agent_id": "685dba1f-09de-40c0-8fc0-4d8ca00ef946",
"agent_id": "ecf210c8-aaa7-4a14-9b44-2a5f805f0126",
"command": null,
"healthcheck": [
{
@@ -66,19 +65,39 @@
}
],
"icon": null,
"id": "e4556c74-2f67-4266-b1e8-7ee61d754583",
"id": "817c6904-69e1-485f-a057-4ddac83a9c5a",
"name": null,
"relative_path": null,
"subdomain": true,
"url": null
},
"sensitive_values": {
"healthcheck": [
{}
]
"healthcheck": [{}]
},
"depends_on": [
"coder_agent.dev1"
]
"depends_on": ["coder_agent.dev1"]
},
{
"address": "coder_app.app3",
"mode": "managed",
"type": "coder_app",
"name": "app3",
"provider_name": "registry.terraform.io/coder/coder",
"schema_version": 0,
"values": {
"agent_id": "ecf210c8-aaa7-4a14-9b44-2a5f805f0126",
"command": null,
"healthcheck": [],
"icon": null,
"id": "c4a502b3-cc82-4fdf-952b-4b429e711798",
"name": null,
"relative_path": null,
"subdomain": false,
"url": null
},
"sensitive_values": {
"healthcheck": []
},
"depends_on": ["coder_agent.dev1"]
},
{
"address": "null_resource.dev",
@@ -88,13 +107,11 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "2997000197756647168",
"id": "1281108380136021489",
"triggers": null
},
"sensitive_values": {},
"depends_on": [
"coder_agent.dev1"
]
"depends_on": ["coder_agent.dev1"]
}
]
}
provisioner/terraform/testdata/resource-metadata/resource-metadata.tf
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "0.4.15"
version = "0.5.0"
}
}
}
provisioner/terraform/testdata/resource-metadata/resource-metadata.tfplan.json
Generated Vendored
+11 -30
View File
@@ -55,12 +55,7 @@
]
},
"sensitive_values": {
"item": [
{},
{},
{},
{}
]
"item": [{}, {}, {}, {}]
}
},
{
@@ -86,9 +81,7 @@
"name": "main",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"arch": "amd64",
@@ -104,7 +97,9 @@
"token": true
},
"before_sensitive": false,
"after_sensitive": {}
"after_sensitive": {
"token": true
}
}
},
{
@@ -114,9 +109,7 @@
"name": "about_info",
"provider_name": "registry.terraform.io/coder/coder",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"hide": true,
@@ -164,12 +157,7 @@
},
"before_sensitive": false,
"after_sensitive": {
"item": [
{},
{},
{},
{}
]
"item": [{}, {}, {}, {}]
}
}
},
@@ -180,9 +168,7 @@
"name": "about",
"provider_name": "registry.terraform.io/hashicorp/null",
"change": {
"actions": [
"create"
],
"actions": ["create"],
"before": null,
"after": {
"triggers": null
@@ -200,7 +186,7 @@
"coder": {
"name": "coder",
"full_name": "registry.terraform.io/coder/coder",
"version_constraint": "0.4.11"
"version_constraint": "0.5.0"
},
"null": {
"name": "null",
@@ -273,10 +259,7 @@
}
],
"resource_id": {
"references": [
"null_resource.about.id",
"null_resource.about"
]
"references": ["null_resource.about.id", "null_resource.about"]
}
},
"schema_version": 0
@@ -295,9 +278,7 @@
"relevant_attributes": [
{
"resource": "null_resource.about",
"attribute": [
"id"
]
"attribute": ["id"]
}
]
}
provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json
Generated Vendored
+7 -14
View File
@@ -16,11 +16,11 @@
"auth": "token",
"dir": null,
"env": null,
"id": "50a0466c-d983-422f-8bed-9dd0bf705a9a",
"id": "0bfa269a-e373-4fbc-929a-07b8ed0f3477",
"init_script": "",
"os": "linux",
"startup_script": null,
"token": "aa714059-3579-49d1-a0e2-3519dbe43688"
"token": "4bc54f84-7d97-492a-ad98-40ae7dfbb300"
},
"sensitive_values": {}
},
@@ -34,7 +34,7 @@
"values": {
"hide": true,
"icon": "/icon/server.svg",
"id": "64a47d31-28d0-4a50-8e09-a3e705278305",
"id": "2ee6d253-dec1-4336-95ba-bd5e93cf4c84",
"item": [
{
"is_null": false,
@@ -61,19 +61,12 @@
"value": "squirrel"
}
],
"resource_id": "4887255791781048166"
"resource_id": "3043919679469754967"
},
"sensitive_values": {
"item": [
{},
{},
{},
{}
]
"item": [{}, {}, {}, {}]
},
"depends_on": [
"null_resource.about"
]
"depends_on": ["null_resource.about"]
},
{
"address": "null_resource.about",
@@ -83,7 +76,7 @@
"provider_name": "registry.terraform.io/hashicorp/null",
"schema_version": 0,
"values": {
"id": "4887255791781048166",
"id": "3043919679469754967",
"triggers": null
},
"sensitive_values": {}