.github/workflows/release.yml

@@ -1,37 +1,36 @@
 name: release
 
 on:
-    push:
-        tags:
-            - 'v*'
+  push:
+    tags:
+      - "v*"
 
 permissions:
-    contents: write
+  contents: write
 
 jobs:
-    goreleaser:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Unshallow
-              run: git fetch --prune --unshallow
-            - name: Setup Go
-              uses: actions/setup-go@v5
-              with:
-                go-version: 1.22.4
-            - name: Import GPG Key
-              id: import_gpg
-              uses: crazy-max/ghaction-import-gpg@v6.1.0
-              with:
-                gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-            - name: Run GoReleaser
-              uses: goreleaser/goreleaser-action@v6.0.0
-              with:
-                version: latest
-                args: release --clean
-              env:
-                GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
-                # GitHub sets this automatically
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Unshallow
+        run: git fetch --prune --unshallow
+      - name: Setup Go
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        with:
+          go-version: "1.22"
+      - name: Import GPG Key
+        id: import_gpg
+        uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec # v6.3.0
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6.3.0
+        with:
+          version: latest
+          args: release --clean
+        env:
+          GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}
+          # GitHub sets this automatically
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -24,31 +24,42 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: "go.mod"
           cache: true
+
       - run: go mod download
+
       - run: go build -v .
+
       - name: Run linters
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
         with:
           version: latest
 
   generate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: "go.mod"
           cache: true
+
+      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
+
       - run: go generate ./...
+
       - name: git diff
         run: |
-          git diff --compact-summary --exit-code || \
-            (echo; echo "Unexpected difference in directories after code generation. Run 'go generate ./...' command and commit."; exit 1)
+          if [[ -n $(git ls-files --other --modified --exclude-standard) ]]; then
+            echo "Unexpected difference in directories after code generation. Run 'make gen' and include the output in the commit."
+            exit 1
+          fi
 
   # Run acceptance tests in a matrix with Terraform CLI versions
   test:
@@ -72,41 +83,43 @@ jobs:
           - "1.8.*"
           - "1.9.*"
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: "go.mod"
           cache: true
-      - uses: hashicorp/setup-terraform@v3
+
+      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
         with:
           terraform_version: ${{ matrix.terraform }}
           terraform_wrapper: false
+
       - run: go mod download
-      - env:
+
+      - run: go test -v -cover ./internal/provider/
+        env:
           TF_ACC: "1"
           CODER_ENTERPRISE_LICENSE: ${{ secrets.CODER_ENTERPRISE_LICENSE }}
-        run: go test -v -cover ./internal/provider/
         timeout-minutes: 10
 
   lint:
     name: Lint
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version: "1.22"
         id: go
 
-      - uses: hashicorp/setup-terraform@v3
+      - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
         with:
           terraform_version: "1.9.*"
           terraform_wrapper: false
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
       - name: Get dependencies
         run: |
           go mod download

.gitignore

@@ -39,3 +39,10 @@ terraform-provider-coderd
 integration/integration.tfrc
 
 *.tfstate
+
+# Local .terraform directories
+**/.terraform/*
+
+
+# Ignore transient lock info files created by terraform apply
+.terraform.tfstate.lock.info

.golangci.yml

@@ -1,27 +1,33 @@
-# Visit https://golangci-lint.run/ for usage documentation
-# and information on other useful linters
+# Visit https://golangci-lint.run/ for usage documentation and information on
+# other useful linters
 issues:
-  max-per-linter: 0
+  max-issues-per-linter: 0
   max-same-issues: 0
 
 linters:
   disable-all: true
   enable:
     - durationcheck
     - errcheck
-    - exportloopref
     - forcetypeassert
     - godot
     - gofmt
     - gosimple
+    - govet
     - ineffassign
     - makezero
     - misspell
     - nilerr
+    - paralleltest
     - predeclared
     - staticcheck
-    - tenv
     - unconvert
     - unparam
     - unused
-    - vet
+    - usetesting
+
+linters-settings:
+  paralleltest:
+    # Terraform acceptance subtests all share a Coder instance, and cannot run
+    # in parallel.
+    ignore-missing-subtests: true

Makefile

@@ -1,8 +1,12 @@
 default: testacc
 
 fmt:
+	go fmt ./...
 	terraform fmt -recursive
 
+lint:
+	golangci-lint run ./...
+
 gen:
 	go generate ./...
 
@@ -11,7 +15,10 @@ build: terraform-provider-coderd
 terraform-provider-coderd: internal/provider/*.go main.go
 	CGO_ENABLED=0 go build .
 
+test: testacc
+.PHONY: test
+
 # Run acceptance tests
-.PHONY: testacc
 testacc:
 	TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m
+.PHONY: testacc

README.md

@@ -7,7 +7,7 @@ The provider currently supports resources and data sources for:
 - Templates + Template Versions
 - Groups
 - Workspace Proxies
-- Organizations (Data Source only)
+- Organizations
 
 ## Requirements
 

docs/data-sources/group.md

@@ -10,7 +10,38 @@ description: |-
 
 An existing group on the Coder deployment.
 
+## Example Usage
 
+```terraform
+// Get a group on the provider default organization by `id`
+data "coderd_group" "employees" {
+  id = "abcd-efg-hijk"
+}
+
+// Get a group on the provider default organization by `name` + `organization_id`
+data "coderd_group" "bosses" {
+  name = "bosses"
+}
+
+// Use them to apply ACL to a template
+resource "coderd_template" "example" {
+  name     = "example-template"
+  versions = [/* ... */]
+  acl = {
+    groups = [
+      {
+        id   = data.coderd_group.employees.id
+        role = "use"
+      },
+      {
+        id   = data.coderd_group.bosses.id
+        role = "admin"
+      }
+    ]
+    users = []
+  }
+}
+```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema
@@ -27,7 +58,7 @@ An existing group on the Coder deployment.
 - `display_name` (String)
 - `members` (Attributes Set) Members of the group. (see [below for nested schema](#nestedatt--members))
 - `quota_allowance` (Number) The number of quota credits to allocate to each user in the group.
-- `source` (String) The source of the group. Either 'oidc' or 'user'.
+- `source` (String) The source of the group. Either `oidc` or `user`.
 
 <a id="nestedatt--members"></a>
 ### Nested Schema for `members`
@@ -38,7 +69,6 @@ Read-Only:
 - `email` (String)
 - `id` (String)
 - `last_seen_at` (Number) Unix timestamp of when the member was last seen.
-- `login_type` (String) The login type of the member. Can be 'oidc', 'token', 'password', 'github' or 'none'.
-- `status` (String) The status of the member. Can be 'active', 'dormant' or 'suspended'.
-- `theme_preference` (String)
+- `login_type` (String) The login type of the member. Can be `oidc`, `token`, `password`, `github` or `none`.
+- `status` (String) The status of the member. Can be `active`, `dormant` or `suspended`.
 - `username` (String)

docs/data-sources/organization.md

@@ -15,7 +15,30 @@ An existing organization on the Coder deployment.
 ~> **Warning**
 This data source is only compatible with Coder version [2.13.0](https://github.com/coder/coder/releases/tag/v2.13.0) and later.
 
-
+## Example Usage
+
+```terraform
+// Get the default (first) organization for the coder deployment
+data "coderd_organization" "default" {
+  is_default = true
+}
+
+// Get another organization by `id`
+data "coderd_organization" "example" {
+  id = "abcd-efg-hijk"
+}
+
+// Or get by name
+data "coderd_organization" "example2" {
+  name = "example-organization-2"
+}
+
+// Create a group on a specific organization
+resource "coderd_group" "example" {
+  name            = "example-group"
+  organization_id = data.coderd_organization.example.id
+}
+```
 
 <!-- schema generated by tfplugindocs -->
 ## Schema