From 7b76818f708b5d1f585a9127a82f6a32e75004aa Mon Sep 17 00:00:00 2001 From: Ethan Dickson Date: Fri, 2 Aug 2024 08:05:06 +0000 Subject: [PATCH] chore: publishing setup --- .github/CODEOWNERS | 1 - .github/dependabot.yml | 7 ++--- .github/workflows/release.yml | 38 ++++++++++++++++++++++++ .goreleaser.yml | 5 ++-- LICENSE | 2 -- docs/data-sources/group.md | 2 +- docs/data-sources/organization.md | 2 +- docs/data-sources/template.md | 2 +- docs/data-sources/user.md | 2 +- docs/resources/group.md | 2 +- docs/resources/template.md | 2 +- docs/resources/user.md | 2 +- docs/resources/workspace_proxy.md | 2 +- internal/provider/group_resource.go | 3 -- internal/provider/group_resource_test.go | 3 -- internal/provider/provider_test.go | 3 -- main.go | 10 ++----- tools/tools.go | 3 -- 18 files changed, 53 insertions(+), 38 deletions(-) delete mode 100644 .github/CODEOWNERS create mode 100644 .github/workflows/release.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 922ee27..0000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @hashicorp/terraform-devex diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 73bb4d3..8bf8897 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,11 +5,8 @@ updates: - package-ecosystem: "gomod" directory: "/" schedule: - interval: "daily" + interval: "weekly" - package-ecosystem: "github-actions" directory: "/" schedule: - interval: "daily" - # TODO: Dependabot only updates hashicorp GHAs in the template repository, the following lines can be removed for consumers of this template - allow: - - dependency-name: "hashicorp/*" + interval: "weekly" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..e9c629f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,38 @@ +name: release + +on: + push: + tags: + - 'v*' + +permissions: + 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 }} + passphrase: ${{ secrets.GPG_PASSPHRASE }} + - 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 }} + diff --git a/.goreleaser.yml b/.goreleaser.yml index 7178be5..4143ffa 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,5 +1,6 @@ # Visit https://goreleaser.com for documentation on how to customize this # behavior. +version: 2 before: hooks: # this is just an example and not a requirement for provider building/publishing @@ -41,7 +42,7 @@ checksum: signs: - artifacts: checksum args: - # if you are using this in a GitHub action or some other automated pipeline, you + # if you are using this in a GitHub action or some other automated pipeline, you # need to pass the batch flag to indicate its not interactive. - "--batch" - "--local-user" @@ -57,4 +58,4 @@ release: # If you want to manually examine the release before its live, uncomment this line: # draft: true changelog: - skip: true + disable: true diff --git a/LICENSE b/LICENSE index 15eba9d..a612ad9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -Copyright (c) 2021 HashiCorp, Inc. - Mozilla Public License Version 2.0 ================================== diff --git a/docs/data-sources/group.md b/docs/data-sources/group.md index 419f195..eb790f5 100644 --- a/docs/data-sources/group.md +++ b/docs/data-sources/group.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_group Data Source - coderd" +page_title: "coderd_group Data Source - terraform-provider-coderd" subcategory: "" description: |- An existing group on the coder deployment. diff --git a/docs/data-sources/organization.md b/docs/data-sources/organization.md index 16059e3..f1fcac6 100644 --- a/docs/data-sources/organization.md +++ b/docs/data-sources/organization.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_organization Data Source - coderd" +page_title: "coderd_organization Data Source - terraform-provider-coderd" subcategory: "" description: |- An existing organization on the coder deployment. diff --git a/docs/data-sources/template.md b/docs/data-sources/template.md index 23f5794..33128fa 100644 --- a/docs/data-sources/template.md +++ b/docs/data-sources/template.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_template Data Source - coderd" +page_title: "coderd_template Data Source - terraform-provider-coderd" subcategory: "" description: |- An existing template on the Coder deployment. diff --git a/docs/data-sources/user.md b/docs/data-sources/user.md index 2b12670..b7b21db 100644 --- a/docs/data-sources/user.md +++ b/docs/data-sources/user.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_user Data Source - coderd" +page_title: "coderd_user Data Source - terraform-provider-coderd" subcategory: "" description: |- An existing user on the coder deployment diff --git a/docs/resources/group.md b/docs/resources/group.md index 92feeef..31044b2 100644 --- a/docs/resources/group.md +++ b/docs/resources/group.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_group Resource - coderd" +page_title: "coderd_group Resource - terraform-provider-coderd" subcategory: "" description: |- A group on the Coder deployment. If you want to have a group resource with unmanaged members, but still want to read the members in Terraform, use the data.coderd_group data source. diff --git a/docs/resources/template.md b/docs/resources/template.md index 6097800..fdd31ae 100644 --- a/docs/resources/template.md +++ b/docs/resources/template.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_template Resource - coderd" +page_title: "coderd_template Resource - terraform-provider-coderd" subcategory: "" description: |- A Coder template diff --git a/docs/resources/user.md b/docs/resources/user.md index a0eeac0..5672928 100644 --- a/docs/resources/user.md +++ b/docs/resources/user.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_user Resource - coderd" +page_title: "coderd_user Resource - terraform-provider-coderd" subcategory: "" description: |- A user on the Coder deployment. diff --git a/docs/resources/workspace_proxy.md b/docs/resources/workspace_proxy.md index 6047558..53f2685 100644 --- a/docs/resources/workspace_proxy.md +++ b/docs/resources/workspace_proxy.md @@ -1,6 +1,6 @@ --- # generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "coderd_workspace_proxy Resource - coderd" +page_title: "coderd_workspace_proxy Resource - terraform-provider-coderd" subcategory: "" description: |- A Workspace Proxy for the Coder deployment. diff --git a/internal/provider/group_resource.go b/internal/provider/group_resource.go index 552a20e..417fc8b 100644 --- a/internal/provider/group_resource.go +++ b/internal/provider/group_resource.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - package provider import ( diff --git a/internal/provider/group_resource_test.go b/internal/provider/group_resource_test.go index 60b2e2d..b6808f2 100644 --- a/internal/provider/group_resource_test.go +++ b/internal/provider/group_resource_test.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - package provider import ( diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go index 194e529..2f8b921 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_test.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - package provider import ( diff --git a/main.go b/main.go index d1e155e..beaf8d1 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - package main import ( @@ -20,7 +17,7 @@ import ( // Run the docs generation tool, check its repository for more information on how it works and how docs // can be customized. -//go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs generate -provider-name coderd +//go:generate go run github.com/hashicorp/terraform-plugin-docs/cmd/tfplugindocs var ( // these will be set by the goreleaser configuration @@ -38,10 +35,7 @@ func main() { flag.Parse() opts := providerserver.ServeOpts{ - // TODO: Update this string with the published name of your provider. - // Also update the tfplugindocs generate command to either remove the - // -provider-name flag or set its value to the updated provider name. - Address: "registry.terraform.io/hashicorp/scaffolding", + Address: "registry.terraform.io/coder/coderd", Debug: debug, } diff --git a/tools/tools.go b/tools/tools.go index 867d3a2..2c4f8fb 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -1,6 +1,3 @@ -// Copyright (c) HashiCorp, Inc. -// SPDX-License-Identifier: MPL-2.0 - //go:build tools package tools