From cabb43d5d887d8179b249dc9db4dde8790667d4e Mon Sep 17 00:00:00 2001
From: Eric Paulsen <ericpaulsen@coder.com>
Date: Mon, 29 Aug 2022 17:52:49 -0500
Subject: [PATCH 1/2] update: google provider to latest

---
 examples/templates/gcp-linux/main.tf        | 24 ++++++++++++++++-----
 examples/templates/gcp-vm-container/main.tf |  4 ++--
 examples/templates/gcp-windows/main.tf      |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
index 465441c43d2c4..d01fd0ca42124 100644
--- a/examples/templates/gcp-linux/main.tf
+++ b/examples/templates/gcp-linux/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.15"
+      version = "~> 4.34.0"
     }
   }
 }
@@ -39,16 +39,30 @@ resource "google_compute_disk" "root" {
   name  = "coder-${lower(data.coder_workspace.me.owner)}-${lower(data.coder_workspace.me.name)}-root"
   type  = "pd-ssd"
   zone  = var.zone
-  image = "debian-cloud/debian-10"
+  image = "debian-cloud/debian-11"
   lifecycle {
     ignore_changes = [image]
   }
 }
 
 resource "coder_agent" "main" {
-  auth = "google-instance-identity"
-  arch = "amd64"
-  os   = "linux"
+  auth  = "google-instance-identity"
+  arch  = "amd64"
+  os    = "linux"
+  startup_script = <<EOT
+    #!/bin/bash
+
+    # install and start code-server
+    curl -fsSL https://code-server.dev/install.sh | sh  | tee code-server-install.log
+    code-server --auth none --port 13337 | tee code-server-install.log &
+  EOT
+}
+
+resource "coder_app" "code-server" {
+  agent_id = coder_agent.main.id
+  name     = "code-server"
+  url      = "http://localhost:13337/?folder=/home/coder"
+  icon     = "/icon/code.svg"
 }
 
 resource "google_compute_instance" "dev" {
diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf
index c186a8c09c7d4..dd737cd8c392e 100644
--- a/examples/templates/gcp-vm-container/main.tf
+++ b/examples/templates/gcp-vm-container/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.15"
+      version = "~> 4.34.0"
     }
   }
 }
@@ -46,7 +46,7 @@ module "gce-container" {
   version = "3.0.0"
 
   container = {
-    image   = "mcr.microsoft.com/vscode/devcontainers/go:1"
+    image   = "codercom/enterprise-base:ubuntu"
     command = ["sh"]
     args    = ["-c", coder_agent.main.init_script]
     securityContext = {
diff --git a/examples/templates/gcp-windows/main.tf b/examples/templates/gcp-windows/main.tf
index 1850a86861f45..1421edc6f17ba 100644
--- a/examples/templates/gcp-windows/main.tf
+++ b/examples/templates/gcp-windows/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.15"
+      version = "~> 4.34.0"
     }
   }
 }

From 814a92fe6a63405b4269b8975edd6896c1b23e22 Mon Sep 17 00:00:00 2001
From: Eric Paulsen <ericpaulsen@coder.com>
Date: Mon, 29 Aug 2022 18:57:07 -0500
Subject: [PATCH 2/2] rm: code-server

---
 examples/templates/gcp-linux/main.tf | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf
index d01fd0ca42124..c177d673ffb10 100644
--- a/examples/templates/gcp-linux/main.tf
+++ b/examples/templates/gcp-linux/main.tf
@@ -49,20 +49,6 @@ resource "coder_agent" "main" {
   auth  = "google-instance-identity"
   arch  = "amd64"
   os    = "linux"
-  startup_script = <<EOT
-    #!/bin/bash
-
-    # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh  | tee code-server-install.log
-    code-server --auth none --port 13337 | tee code-server-install.log &
-  EOT
-}
-
-resource "coder_app" "code-server" {
-  agent_id = coder_agent.main.id
-  name     = "code-server"
-  url      = "http://localhost:13337/?folder=/home/coder"
-  icon     = "/icon/code.svg"
 }
 
 resource "google_compute_instance" "dev" {