Merge branch 'main' into ethan/user-data

.github/workflows/cla.yaml

@@ -1,26 +1,27 @@
-name: "CLA Assistant"
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened,closed,synchronize]
+# uncomment when configured correctly
+# name: "CLA Assistant"
+# on:
+#   issue_comment:
+#     types: [created]
+#   pull_request_target:
+#     types: [opened,closed,synchronize]
 
-jobs:
-  CLAssistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: contributor-assistant/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
-          PERSONAL_ACCESS_TOKEN : ${{ secrets.CDRCOMMUNITY_GITHUB_TOKEN }}
-        with:
-          remote-organization-name: 'coder'
-          remote-repository-name: 'cla'
-          path-to-signatures: 'v2022-09-04/signatures.json'
-          path-to-document: 'https://github.com/coder/cla/blob/main/README.md'
-          # branch should not be protected
-          branch: 'main'
-          allowlist: dependabot*
+# jobs:
+#   CLAssistant:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - name: "CLA Assistant"
+#         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+#         uses: contributor-assistant/[email protected]
+#         env:
+#           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#           # the below token should have repo scope and must be manually added by you in the repository's secret
+#           PERSONAL_ACCESS_TOKEN : ${{ secrets.CDRCOMMUNITY_GITHUB_TOKEN }}
+#         with:
+#           remote-organization-name: 'coder'
+#           remote-repository-name: 'cla'
+#           path-to-signatures: 'v2022-09-04/signatures.json'
+#           path-to-document: 'https://github.com/coder/cla/blob/main/README.md'
+#           # branch should not be protected
+#           branch: 'main'
+#           allowlist: dependabot*

internal/provider/user_data_source_test.go

@@ -59,12 +59,20 @@ func TestAccUserDataSource(t *testing.T) {
 }
 
 type testAccUserDataSourceConfig struct {
+	URL      string
+	Token    string
+
 	ID       string
 	Username string
 }
 
 func (c testAccUserDataSourceConfig) String(t *testing.T) string {
 	tpl := `
+provider coderd {
+	url = "{{.URL}}"
+	token = "{{.Token}}"
+}
+
 data "coderd_user" "test" {
 {{- if .ID }}
   id = "{{ .ID }}"