remove contents dirs

coder · johnstcn · Mar 11, 2025 · Mar 7, 2025 · Mar 7, 2025 · Mar 7, 2025
commit c43a047d468b4de015713f96252986f2c0156e48
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -37,8 +37,8 @@ updates:
   # Update our Dockerfile.
   - package-ecosystem: "docker"
     directories:
-      - "/dogfood/coder/contents"
-      - "/dogfood/coder-envbuilder/contents"
+      - "/dogfood/coder"
+      - "/dogfood/coder-envbuilder"
       - "/scripts"
       - "/examples/templates/docker/build"
       - "/examples/parameters/build"

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -172,7 +172,7 @@ jobs:
 
       - name: Get golangci-lint cache dir
         run: |
-          linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/contents/Dockerfile | cut -d '=' -f 2)
+          linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/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
@@ -68,7 +68,7 @@ jobs:
           project: b4q6ltmpzh
           token: ${{ secrets.DEPOT_TOKEN }}
           buildx-fallback: true
-          context: "{{defaultContext}}:dogfood/coder/contents"
+          context: "{{defaultContext}}:dogfood/coder"
           pull: true
           save: true
           push: ${{ github.ref == 'refs/heads/main' }}
@@ -114,15 +114,15 @@ jobs:
       - name: Terraform init and validate
         run: |
           pushd dogfood/
-          terraform init -upgrade
+          terraform init
           terraform validate
           popd
-          pushd coder/contents
-          terraform init -upgrade
+          pushd coder
+          terraform init
           terraform validate
           popd
-          pushd coder-envbuilder/contents
-          terraform init -upgrade
+          pushd coder-envbuilder
+          terraform init
           terraform validate
           popd
 
@@ -148,6 +148,6 @@ jobs:
           # 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: ./contents
+          TF_VAR_CODER_TEMPLATE_DIR: ./dogfood
           TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
           TF_LOG: info
diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml
@@ -99,7 +99,7 @@ jobs:
           # version in the comments will differ. This is also defined in
           # ci.yaml.
           set -euxo pipefail
-          cd dogfood/coder/contents
+          cd dogfood/coder
           mkdir -p /usr/local/bin
           mkdir -p /usr/local/include
 

diff --git a/Makefile b/Makefile
@@ -505,7 +505,7 @@ lint/ts: site/node_modules/.installed
 lint/go:
 	./scripts/check_enterprise_imports.sh
 	./scripts/check_codersdk_imports.sh
-	linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/contents/Dockerfile | cut -d '=' -f 2)
+	linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/Dockerfile | cut -d '=' -f 2)
 	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
 .PHONY: lint/go
 
@@ -963,5 +963,5 @@ else
 endif
 .PHONY: test-e2e
 
-dogfood/coder/contents/nix.hash: flake.nix flake.lock
-	sha256sum flake.nix flake.lock >./dogfood/coder/contents/nix.hash
+dogfood/coder/nix.hash: flake.nix flake.lock
+	sha256sum flake.nix flake.lock >./dogfood/coder/nix.hash
diff --git a/dogfood/coder-envbuilder/contents/README.md → dogfood/coder-envbuilder/README.md b/dogfood/coder-envbuilder/contents/README.md → dogfood/coder-envbuilder/README.md
diff --git a/dogfood/coder-envbuilder/contents/main.tf → dogfood/coder-envbuilder/main.tf b/dogfood/coder-envbuilder/contents/main.tf → dogfood/coder-envbuilder/main.tf
diff --git a/dogfood/coder/contents/Dockerfile → dogfood/coder/Dockerfile b/dogfood/coder/contents/Dockerfile → dogfood/coder/Dockerfile
diff --git a/dogfood/coder/contents/Makefile → dogfood/coder/Makefile b/dogfood/coder/contents/Makefile → dogfood/coder/Makefile
diff --git a/dogfood/coder/contents/README.md → dogfood/coder/README.md b/dogfood/coder/contents/README.md → dogfood/coder/README.md
diff --git a/dogfood/coder/contents/devcontainer.json → dogfood/coder/devcontainer.json b/dogfood/coder/contents/devcontainer.json → dogfood/coder/devcontainer.json
diff --git a/...files/etc/apt/apt.conf.d/80-no-recommends → ...files/etc/apt/apt.conf.d/80-no-recommends b/...files/etc/apt/apt.conf.d/80-no-recommends → ...files/etc/apt/apt.conf.d/80-no-recommends
diff --git a/...tents/files/etc/apt/apt.conf.d/80-retries → ...coder/files/etc/apt/apt.conf.d/80-retries b/...tents/files/etc/apt/apt.conf.d/80-retries → ...coder/files/etc/apt/apt.conf.d/80-retries
diff --git a/...ts/files/etc/apt/preferences.d/containerd → ...er/files/etc/apt/preferences.d/containerd b/...ts/files/etc/apt/preferences.d/containerd → ...er/files/etc/apt/preferences.d/containerd
diff --git a/...ntents/files/etc/apt/preferences.d/docker → .../coder/files/etc/apt/preferences.d/docker b/...ntents/files/etc/apt/preferences.d/docker → .../coder/files/etc/apt/preferences.d/docker
diff --git a/...ts/files/etc/apt/preferences.d/github-cli → ...er/files/etc/apt/preferences.d/github-cli b/...ts/files/etc/apt/preferences.d/github-cli → ...er/files/etc/apt/preferences.d/github-cli
diff --git a/.../files/etc/apt/preferences.d/google-cloud → .../files/etc/apt/preferences.d/google-cloud b/.../files/etc/apt/preferences.d/google-cloud → .../files/etc/apt/preferences.d/google-cloud
diff --git a/...nts/files/etc/apt/preferences.d/hashicorp → ...der/files/etc/apt/preferences.d/hashicorp b/...nts/files/etc/apt/preferences.d/hashicorp → ...der/files/etc/apt/preferences.d/hashicorp
diff --git a/.../contents/files/etc/apt/preferences.d/ppa → ...ood/coder/files/etc/apt/preferences.d/ppa b/.../contents/files/etc/apt/preferences.d/ppa → ...ood/coder/files/etc/apt/preferences.d/ppa
diff --git a/.../files/etc/apt/sources.list.d/docker.list → .../files/etc/apt/sources.list.d/docker.list b/.../files/etc/apt/sources.list.d/docker.list → .../files/etc/apt/sources.list.d/docker.list
diff --git a/.../etc/apt/sources.list.d/google-cloud.list → .../etc/apt/sources.list.d/google-cloud.list b/.../etc/apt/sources.list.d/google-cloud.list → .../etc/apt/sources.list.d/google-cloud.list
diff --git a/...les/etc/apt/sources.list.d/hashicorp.list → ...les/etc/apt/sources.list.d/hashicorp.list b/...les/etc/apt/sources.list.d/hashicorp.list → ...les/etc/apt/sources.list.d/hashicorp.list
diff --git a/...es/etc/apt/sources.list.d/postgresql.list → ...es/etc/apt/sources.list.d/postgresql.list b/...es/etc/apt/sources.list.d/postgresql.list → ...es/etc/apt/sources.list.d/postgresql.list
diff --git a/...nts/files/etc/apt/sources.list.d/ppa.list → ...der/files/etc/apt/sources.list.d/ppa.list b/...nts/files/etc/apt/sources.list.d/ppa.list → ...der/files/etc/apt/sources.list.d/ppa.list
diff --git a/...der/contents/files/etc/docker/daemon.json → dogfood/coder/files/etc/docker/daemon.json b/...der/contents/files/etc/docker/daemon.json → dogfood/coder/files/etc/docker/daemon.json
diff --git a/...ents/files/usr/share/keyrings/ansible.gpg → ...oder/files/usr/share/keyrings/ansible.gpg b/...ents/files/usr/share/keyrings/ansible.gpg → ...oder/files/usr/share/keyrings/ansible.gpg
diff --git a/...tents/files/usr/share/keyrings/docker.gpg → ...coder/files/usr/share/keyrings/docker.gpg b/...tents/files/usr/share/keyrings/docker.gpg → ...coder/files/usr/share/keyrings/docker.gpg
diff --git a/...s/files/usr/share/keyrings/fish-shell.gpg → ...r/files/usr/share/keyrings/fish-shell.gpg b/...s/files/usr/share/keyrings/fish-shell.gpg → ...r/files/usr/share/keyrings/fish-shell.gpg
diff --git a/...nts/files/usr/share/keyrings/git-core.gpg → ...der/files/usr/share/keyrings/git-core.gpg b/...nts/files/usr/share/keyrings/git-core.gpg → ...der/files/usr/share/keyrings/git-core.gpg
diff --git a/...s/files/usr/share/keyrings/github-cli.gpg → ...r/files/usr/share/keyrings/github-cli.gpg b/...s/files/usr/share/keyrings/github-cli.gpg → ...r/files/usr/share/keyrings/github-cli.gpg
diff --git a/...files/usr/share/keyrings/google-cloud.gpg → ...files/usr/share/keyrings/google-cloud.gpg b/...files/usr/share/keyrings/google-cloud.gpg → ...files/usr/share/keyrings/google-cloud.gpg
diff --git a/...ts/files/usr/share/keyrings/hashicorp.gpg → ...er/files/usr/share/keyrings/hashicorp.gpg b/...ts/files/usr/share/keyrings/hashicorp.gpg → ...er/files/usr/share/keyrings/hashicorp.gpg
diff --git a/...ntents/files/usr/share/keyrings/helix.gpg → .../coder/files/usr/share/keyrings/helix.gpg b/...ntents/files/usr/share/keyrings/helix.gpg → .../coder/files/usr/share/keyrings/helix.gpg
diff --git a/...tents/files/usr/share/keyrings/neovim.gpg → ...coder/files/usr/share/keyrings/neovim.gpg b/...tents/files/usr/share/keyrings/neovim.gpg → ...coder/files/usr/share/keyrings/neovim.gpg
diff --git a/...s/files/usr/share/keyrings/postgresql.gpg → ...r/files/usr/share/keyrings/postgresql.gpg b/...s/files/usr/share/keyrings/postgresql.gpg → ...r/files/usr/share/keyrings/postgresql.gpg
diff --git a/dogfood/coder/contents/guide.md → dogfood/coder/guide.md b/dogfood/coder/contents/guide.md → dogfood/coder/guide.md
diff --git a/dogfood/coder/contents/main.tf → dogfood/coder/main.tf b/dogfood/coder/contents/main.tf → dogfood/coder/main.tf
diff --git a/dogfood/coder/contents/nix.hash → dogfood/coder/nix.hash b/dogfood/coder/contents/nix.hash → dogfood/coder/nix.hash
diff --git a/dogfood/coder/contents/update-keys.sh → dogfood/coder/update-keys.sh b/dogfood/coder/contents/update-keys.sh → dogfood/coder/update-keys.sh
diff --git a/dogfood/coder/contents/zed/main.tf → dogfood/coder/zed/main.tf b/dogfood/coder/contents/zed/main.tf → dogfood/coder/zed/main.tf
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -4,9 +4,9 @@ terraform {
       source = "coder/coderd"
     }
   }
-  backend "gcs" {
-    bucket = "coder-dogfood-tf-state"
-  }
+  # backend "gcs" {
+  # bucket = "coder-dogfood-tf-state"
+  # }
 }
 
 data "coderd_organization" "default" {

diff --git a/scripts/update-flake.sh b/scripts/update-flake.sh
@@ -37,6 +37,6 @@ echo "protoc-gen-go version: $PROTOC_GEN_GO_REV"
 PROTOC_GEN_GO_SHA256=$(nix-prefetch-git https://github.com/protocolbuffers/protobuf-go --rev "$PROTOC_GEN_GO_REV" | jq -r .hash)
 sed -i "s#\(sha256 = \"\)[^\"]*#\1${PROTOC_GEN_GO_SHA256}#" ./flake.nix
 
-make dogfood/coder/contents/nix.hash
+make dogfood/coder/nix.hash
 
 echo "Flake updated successfully!"