update paths

ethanndickson · ethanndickson · commit 89412192aa60 · 2024-08-16T05:19:54.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -168,7 +168,7 @@ jobs:
 
       - name: Get golangci-lint cache dir
         run: |
-          linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
+          linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
           go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
           dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
           echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV
diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml
@@ -56,7 +56,7 @@ jobs:
           project: b4q6ltmpzh
           token: ${{ secrets.DEPOT_TOKEN }}
           buildx-fallback: true
-          context: "{{defaultContext}}:dogfood"
+          context: "{{defaultContext}}:dogfood/contents"
           pull: true
           save: true
           push: ${{ github.ref == 'refs/heads/main' }}
@@ -69,7 +69,7 @@ jobs:
           token: ${{ secrets.DEPOT_TOKEN }}
           buildx-fallback: true
           context: "."
-          file: "dogfood/Dockerfile.nix"
+          file: "dogfood/contents/Dockerfile.nix"
           pull: true
           save: true
           push: ${{ github.ref == 'refs/heads/main' }}
@@ -113,7 +113,7 @@ jobs:
           CODER_URL: https://dev.coder.com
           CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}
           # Template source & details
-          TF_VAR_coder_template_name: ${{ secrets.CODER_TEMPLATE_NAME }}
-          TF_VAR_coder_template_version: ${{ steps.vars.outputs.sha_short }}
-          TF_VAR_coder_template_dir: ./dogfood
-          TF_VAR_coder_template_message: ${{ steps.message.outputs.pr_title }}
+          TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
+          TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
+          TF_VAR_CODER_TEMPLATE_DIR: ./dogfood/contents
+          TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
diff --git a/Makefile b/Makefile
@@ -451,7 +451,7 @@ lint/ts:
 
 lint/go:
 	./scripts/check_enterprise_imports.sh
-	linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
+	linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
 	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
 .PHONY: lint/go
 
diff --git a/dogfood/contents/update-keys.sh b/dogfood/contents/update-keys.sh
@@ -15,7 +15,7 @@ gpg_flags=(
 	--yes
 )
 
-pushd "$PROJECT_ROOT/dogfood/files/usr/share/keyrings"
+pushd "$PROJECT_ROOT/dogfood/contents/files/usr/share/keyrings"
 
 # Ansible PPA signing key
 curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367" |
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -12,6 +12,11 @@ import {
   id = "0d286645-29aa-4eaf-9b52-cc5d2740c90b"
 }
 
+provider "coderd" {
+  url = "https://dev.coder.com"
+  token = "A2BkGi3oDN-rqs3H7k6J5mrFOih4f7kA7"
+}
+
 data "coderd_organization" "default" {
   is_default = true
 }
@@ -20,33 +25,33 @@ data "coderd_user" "machine" {
   username = "machine"
 }
 
-variable "coder_template_name" {
+variable "CODER_TEMPLATE_NAME" {
   type = string
 }
 
-variable "coder_template_version" {
+variable "CODER_TEMPLATE_VERSION" {
   type = string
 }
 
-variable "coder_template_dir" {
+variable "CODER_TEMPLATE_DIR" {
   type = string
 }
 
-variable "coder_template_message" {
+variable "CODER_TEMPLATE_MESSAGE" {
   type = string
 }
 
 resource "coderd_template" "dogfood" {
-  name            = var.coder_template_name
+  name            = var.CODER_TEMPLATE_NAME
   display_name    = "Write Coder on Coder"
   description     = "The template to use when developing Coder on Coder!"
   icon            = "/emojis/1f3c5.png"
   organization_id = "703f72a1-76f6-4f89-9de6-8a3989693fe5"
   versions = [
     {
-      name      = var.coder_template_version
-      message   = var.coder_template_message
-      directory = var.coder_template_dir
+      name      = var.CODER_TEMPLATE_VERSION
+      message   = var.CODER_TEMPLATE_MESSAGE
+      directory = var.CODER_TEMPLATE_DIR
       active    = true
     }
   ]
diff --git a/envbuilder-dogfood/main.tf b/envbuilder-dogfood/main.tf
@@ -40,7 +40,7 @@ data "coder_parameter" "devcontainer_repo" {
 data "coder_parameter" "devcontainer_dir" {
   type        = "string"
   name        = "Devcontainer Directory"
-  default     = "dogfood/"
+  default     = "dogfood/contents/"
   description = "Directory containing a devcontainer.json relative to the repository root"
   mutable     = true
 }
@@ -255,7 +255,7 @@ resource "coder_agent" "dev" {
       sleep 1
     done
     sudo chmod a+rw /var/run/docker.sock
-    
+
     # Install playwright dependencies
     # We want to use the playwright version from site/package.json
     # Check if the directory exists At workspace creation as the coder_script runs in parallel so clone might not exist yet.

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ gpg_flags=(`
`15`	`15`	`--yes`
`16`	`16`	`)`
`17`	`17`
`18`		`-pushd "$PROJECT_ROOT/dogfood/files/usr/share/keyrings"`
	`18`	`+pushd "$PROJECT_ROOT/dogfood/contents/files/usr/share/keyrings"`
`19`	`19`
`20`	`20`	`# Ansible PPA signing key`
`21`	`21`	`curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367" \|`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,11 @@ import {`
`12`	`12`	`id = "0d286645-29aa-4eaf-9b52-cc5d2740c90b"`
`13`	`13`	`}`
`14`	`14`
	`15`	`+provider "coderd" {`
	`16`	`+ url = "https://dev.coder.com"`
	`17`	`+ token = "A2BkGi3oDN-rqs3H7k6J5mrFOih4f7kA7"`
	`18`	`+}`
	`19`	`+`
`15`	`20`	`data "coderd_organization" "default" {`
`16`	`21`	`is_default = true`
`17`	`22`	`}`
`@@ -20,33 +25,33 @@ data "coderd_user" "machine" {`
`20`	`25`	`username = "machine"`
`21`	`26`	`}`
`22`	`27`
`23`		`-variable "coder_template_name" {`
	`28`	`+variable "CODER_TEMPLATE_NAME" {`
`24`	`29`	`type = string`
`25`	`30`	`}`
`26`	`31`
`27`		`-variable "coder_template_version" {`
	`32`	`+variable "CODER_TEMPLATE_VERSION" {`
`28`	`33`	`type = string`
`29`	`34`	`}`
`30`	`35`
`31`		`-variable "coder_template_dir" {`
	`36`	`+variable "CODER_TEMPLATE_DIR" {`
`32`	`37`	`type = string`
`33`	`38`	`}`
`34`	`39`
`35`		`-variable "coder_template_message" {`
	`40`	`+variable "CODER_TEMPLATE_MESSAGE" {`
`36`	`41`	`type = string`
`37`	`42`	`}`
`38`	`43`
`39`	`44`	`resource "coderd_template" "dogfood" {`
`40`		`- name = var.coder_template_name`
	`45`	`+ name = var.CODER_TEMPLATE_NAME`
`41`	`46`	`display_name = "Write Coder on Coder"`
`42`	`47`	`description = "The template to use when developing Coder on Coder!"`
`43`	`48`	`icon = "/emojis/1f3c5.png"`
`44`	`49`	`organization_id = "703f72a1-76f6-4f89-9de6-8a3989693fe5"`
`45`	`50`	`versions = [`
`46`	`51`	`{`
`47`		`- name = var.coder_template_version`
`48`		`- message = var.coder_template_message`
`49`		`- directory = var.coder_template_dir`
	`52`	`+ name = var.CODER_TEMPLATE_VERSION`
	`53`	`+ message = var.CODER_TEMPLATE_MESSAGE`
	`54`	`+ directory = var.CODER_TEMPLATE_DIR`
`50`	`55`	`active = true`
`51`	`56`	`}`
`52`	`57`	`]`