update gcp

matifali · matifali · commit 4caa9ea672d5 · 2023-03-14T07:46:46.000+03:00
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.6.14"
+      version = "~> 0.6.17"
     }
     google = {
       source  = "hashicorp/google"
@@ -11,10 +11,14 @@ terraform {
   }
 }
 
-data "coder_parameter" "project_id" {
-  name        = "What Google Compute Project should your workspace live in?"
+provider "coder" {
+  feature_use_managed_variables = true
+}
+
+variable "project_id" {
+  type        = string
   description = "The Google Compute Project will be used to build your workspace."
-  type        = "string"
+  default     = ""
 }
 
 data "coder_parameter" "zone" {
@@ -51,7 +55,7 @@ data "coder_parameter" "zone" {
 
 provider "google" {
   zone    = data.coder_parameter.zone.value
-  project = data.coder_parameter.project_id.value
+  project = var.project_id
 }
 
 data "coder_workspace" "me" {
@@ -71,10 +75,9 @@ resource "google_compute_disk" "root" {
 }
 
 resource "coder_agent" "main" {
-  auth = "google-instance-identity"
-  arch = "amd64"
-  os   = "linux"
-
+  auth                   = "google-instance-identity"
+  arch                   = "amd64"
+  os                     = "linux"
   login_before_ready     = false
   startup_script_timeout = 180
   startup_script         = <<-EOT
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.6.14"
+      version = "~> 0.6.17"
     }
     google = {
       source  = "hashicorp/google"
@@ -11,10 +11,14 @@ terraform {
   }
 }
 
-data "coder_parameter" "project_id" {
-  name        = "What Google Compute Project should your workspace live in?"
+provider "coder" {
+  feature_use_managed_variables = true
+}
+
+variable "project_id" {
+  type        = string
   description = "The Google Compute Project will be used to build your workspace."
-  type        = "string"
+  default     = ""
 }
 
 data "coder_parameter" "zone" {
@@ -51,7 +55,7 @@ data "coder_parameter" "zone" {
 
 provider "google" {
   zone    = data.coder_parameter.zone.value
-  project = data.coder_parameter.project_id.value
+  project = var.project_id
 }
 
 data "coder_workspace" "me" {
@@ -60,7 +64,6 @@ data "coder_workspace" "me" {
 data "google_compute_default_service_account" "default" {
 }
 
-
 resource "coder_agent" "main" {
   auth = "google-instance-identity"
   arch = "amd64"
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.6.14"
+      version = "~> 0.6.17"
     }
     google = {
       source  = "hashicorp/google"
@@ -11,10 +11,14 @@ terraform {
   }
 }
 
-data "coder_parameter" "project_id" {
-  name        = "What Google Compute Project should your workspace live in?"
+provider "coder" {
+  feature_use_managed_variables = true
+}
+
+variable "project_id" {
+  type        = string
   description = "The Google Compute Project will be used to build your workspace."
-  type        = "string"
+  default     = ""
 }
 
 data "coder_parameter" "zone" {
@@ -51,7 +55,7 @@ data "coder_parameter" "zone" {
 
 provider "google" {
   zone    = data.coder_parameter.zone.value
-  project = data.coder_parameter.project_id.value
+  project = var.project_id
 }
 
 data "coder_workspace" "me" {
