update tf provider

f0ssel · f0ssel · commit 8cfef1a3f66d · 2022-09-22T17:52:52.000Z
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.5"
+      version = "0.4.15"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     digitalocean = {
       source  = "digitalocean/digitalocean"
diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
@@ -9,7 +9,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     docker = {
       source  = "kreuzwerker/docker"
diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     google = {
       source  = "hashicorp/google"
diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -1,6 +1,8 @@
 package terraform
 
 import (
+	"encoding/json"
+	"fmt"
 	"strings"
 
 	"github.com/awalterschulze/gographviz"
@@ -25,13 +27,13 @@ type agentAttributes struct {
 
 // A mapping of attributes on the "coder_app" resource.
 type agentAppAttributes struct {
-	AgentID      string                    `mapstructure:"agent_id"`
-	Name         string                    `mapstructure:"name"`
-	Icon         string                    `mapstructure:"icon"`
-	URL          string                    `mapstructure:"url"`
-	Command      string                    `mapstructure:"command"`
-	RelativePath bool                      `mapstructure:"relative_path"`
-	Healthcheck  *appHealthcheckAttributes `mapstructure:"healthcheck"`
+	AgentID      string                     `mapstructure:"agent_id"`
+	Name         string                     `mapstructure:"name"`
+	Icon         string                     `mapstructure:"icon"`
+	URL          string                     `mapstructure:"url"`
+	Command      string                     `mapstructure:"command"`
+	RelativePath bool                       `mapstructure:"relative_path"`
+	Healthcheck  []appHealthcheckAttributes `mapstructure:"healthcheck"`
 }
 
 // A mapping of attributes on the "healthcheck" resource.
@@ -220,18 +222,20 @@ func ConvertResources(module *tfjson.StateModule, rawGraph string) ([]*proto.Res
 		var attrs agentAppAttributes
 		err = mapstructure.Decode(resource.AttributeValues, &attrs)
 		if err != nil {
+			d, _ := json.MarshalIndent(resource.AttributeValues, "", "    ")
+			fmt.Print(string(d))
 			return nil, xerrors.Errorf("decode app attributes: %w", err)
 		}
 		if attrs.Name == "" {
 			// Default to the resource name if none is set!
 			attrs.Name = resource.Name
 		}
 		var healthcheck *proto.Healthcheck
-		if attrs.Healthcheck != nil {
+		if len(attrs.Healthcheck) != 0 {
 			healthcheck = &proto.Healthcheck{
-				Url:       attrs.Healthcheck.URL,
-				Interval:  attrs.Healthcheck.Interval,
-				Threshold: attrs.Healthcheck.Threshold,
+				Url:       attrs.Healthcheck[0].URL,
+				Interval:  attrs.Healthcheck[0].Interval,
+				Threshold: attrs.Healthcheck[0].Threshold,
 			}
 		}
 		for _, agents := range resourceAgents {
diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
@@ -112,6 +112,11 @@ func TestConvertResources(t *testing.T) {
 					Name: "app1",
 				}, {
 					Name: "app2",
+					Healthcheck: &proto.Healthcheck{
+						Url:       "http://localhost:13337/healthz",
+						Interval:  5,
+						Threshold: 6,
+					},
 				}},
 				Auth: &proto.Agent_Token{},
 			}},
diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tf b/provisioner/terraform/testdata/calling-module/calling-module.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json b/provisioner/terraform/testdata/calling-module/calling-module.tfstate.json
diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json b/provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json
diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json b/provisioner/terraform/testdata/conflicting-resources/conflicting-resources.tfstate.json
diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tf b/provisioner/terraform/testdata/instance-id/instance-id.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json b/provisioner/terraform/testdata/instance-id/instance-id.tfstate.json
diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.11"
+      version = "0.4.15"
     }
   }
 }
diff --git a/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json b/provisioner/terraform/testdata/multiple-agents/multiple-agents.tfstate.json
diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tf b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tf
diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfplan.json
diff --git a/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json b/provisioner/terraform/testdata/multiple-apps/multiple-apps.tfstate.json
diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tf b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tf
diff --git a/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json b/provisioner/terraform/testdata/resource-metadata/resource-metadata.tfstate.json

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ terraform {`
`2`	`2`	`required_providers {`
`3`	`3`	`coder = {`
`4`	`4`	`source = "coder/coder"`
`5`		`- version = "0.4.5"`
	`5`	`+ version = "0.4.15"`
`6`	`6`	`}`
`7`	`7`	`docker = {`
`8`	`8`	`source = "kreuzwerker/docker"`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ terraform {`
`6`	`6`	`}`
`7`	`7`	`coder = {`
`8`	`8`	`source = "coder/coder"`
`9`		`- version = "0.4.11"`
	`9`	`+ version = "0.4.15"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`coder = {`
`5`	`5`	`source = "coder/coder"`
`6`		`- version = "0.4.11"`
	`6`	`+ version = "0.4.15"`
`7`	`7`	`}`
`8`	`8`	`docker = {`
`9`	`9`	`source = "kreuzwerker/docker"`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ terraform {`
`9`	`9`	`required_providers {`
`10`	`10`	`coder = {`
`11`	`11`	`source = "coder/coder"`
`12`		`- version = "0.4.11"`
	`12`	`+ version = "0.4.15"`
`13`	`13`	`}`
`14`	`14`	`docker = {`
`15`	`15`	`source = "kreuzwerker/docker"`