add git via user_data :(

bpmct · bpmct · commit 02db9dc49c97 · 2022-11-27T23:45:54.000Z
diff --git a/examples/templates/aws-windows/README.md b/examples/templates/aws-windows/README.md
@@ -8,6 +8,26 @@ tags: [cloud, aws]
 
 <img src="./screenshot.png" width="600" />
 
+## Installing Packages
+
+This template will add the [Chocolatey Package Manager](https://chocolatey.org/) via the user data. This can be used to add software to your workspace.
+
+**ex. Firefox**:
+
+```powershell
+choco install firefox
+```
+
+**ex. Visual Studio 2019 + Managed Desktop Tools**:
+
+```powershell
+choco install visualstudio2019community --package-parameters "--add=Microsoft.VisualStudio.Workload.ManagedDesktop;includeRecommended --passive --locale en-US"
+```
+
+> You can pre-install packages in the `startup_script` to add them to all workspaces! `git` is added this way.
+
+To remove chocolatey from this template,
+
 ## Connecting via RDP
 
 You can connect to your workspace over a RDP tunnel. First, ensure
diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
@@ -87,9 +87,6 @@ Enable-NetFirewallRule -DisplayGroup "Remote Desktop"
 # Disable Network Level Authentication (NLA)
 # Clients will connect via Coder's tunnel
 (Get-WmiObject -class "Win32_TSGeneralSetting" -Namespace root\cimv2\terminalservices -ComputerName $env:COMPUTERNAME -Filter "TerminalName='RDP-tcp'").SetUserAuthenticationRequired(0)
-
-# Install Chocolatey package manager
-Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 EOF
 }
 
@@ -104,6 +101,18 @@ locals {
   # https://github.com/hashicorp/terraform-provider-aws/issues/22
   user_data_start = <<EOT
 <powershell>
+
+# Install Chocolatey package manager before
+# the agent starts to use via startup_script
+Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+
+# Reload path so sessions include "choco" and "refreshenv"
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
+
+# Install Git and reload path
+choco install -y git
+$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
+
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 ${coder_agent.main.init_script}
 </powershell>
