From ef6e164e13aa7e05cf8145fb9e4bfee8a4f9ed5a Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Wed, 29 Mar 2023 11:50:06 -0400 Subject: [PATCH 1/8] Update CODEOWNERS --- CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 4a1b8cd..ff57feb 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @hashicorp/packer @shawnmssu +* @schnell18 From b6259abbdac0012e572a126ee54666a88cd21aca Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Wed, 29 Mar 2023 12:49:03 -0400 Subject: [PATCH 2/8] Replace internal signore with public gpg-import release step --- .github/workflows/release.yml | 13 +++++++------ .goreleaser.yml | 15 +++++++++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bc8bea..09a78e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,17 +29,18 @@ jobs: - name: Describe plugin id: plugin_describe run: echo "::set-output name=api_version::$(go run . describe | jq -r '.api_version')" - - name: Install signore - uses: hashicorp/setup-signore-package@v1 - + - name: Import GPG key + id: import_gpg + uses: crazy-max/ghaction-import-gpg@v5 + with: + gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} + passphrase: ${{ secrets.GPG_PASSPHRASE }} - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2 with: version: latest args: release --rm-dist env: + GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} API_VERSION: ${{ steps.plugin_describe.outputs.api_version }} - SIGNORE_CLIENT_ID: ${{ secrets.SIGNORE_CLIENT_ID }} - SIGNORE_CLIENT_SECRET: ${{ secrets.SIGNORE_CLIENT_SECRET }} - SIGNORE_SIGNER: ${{ secrets.SIGNORE_SIGNER }} diff --git a/.goreleaser.yml b/.goreleaser.yml index b8428ed..2dd8403 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -91,10 +91,17 @@ checksum: name_template: '{{ .ProjectName }}_v{{ .Version }}_SHA256SUMS' algorithm: sha256 signs: - - cmd: signore - args: ["sign", "--dearmor", "--file", "${artifact}", "--out", "${signature}"] - artifacts: checksum - signature: ${artifact}.sig + - artifacts: checksum + args: + # if you are using this is in a GitHub action or some other automated pipeline, you + # # need to pass the batch flag to indicate its not interactive. + - "--batch" + - "--local-user" + - "{{ .Env.GPG_FINGERPRINT }}" + - "--output" + - "${signature}" + - "--detach-sign" + - "${artifact}" release: # If you want to manually examine the release before its live, uncomment this line: # draft: true From f4c2432bd6bdf21abe666933bb83d5a9cc2a00b4 Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Wed, 29 Mar 2023 12:50:55 -0400 Subject: [PATCH 3/8] Remove doc preview generation command --- GNUmakefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 9701f86..b9bec13 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -4,7 +4,6 @@ BINARY=packer-plugin-${NAME} COUNT?=1 TEST?=$(shell go list ./...) HASHICORP_PACKER_PLUGIN_SDK_VERSION?=$(shell go list -m github.com/hashicorp/packer-plugin-sdk | cut -d " " -f2) - .PHONY: dev build: @@ -32,5 +31,4 @@ testacc: dev generate: install-packer-sdc @go generate ./... - packer-sdc renderdocs -src ./docs -dst ./.docs -partials ./docs-partials # checkout the .docs folder for a preview of the docs From f07322e10ada920c5642e40db08201dbbd829792 Mon Sep 17 00:00:00 2001 From: Wilken Rivera Date: Wed, 29 Mar 2023 15:23:41 -0400 Subject: [PATCH 4/8] Remove circleci configuration --- .circleci/config.yml | 95 -------------------------------------------- 1 file changed, 95 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index c5074a9..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,95 +0,0 @@ -version: 2.1 - -executors: - golang: - docker: - - image: docker.mirror.hashicorp.services/cimg/go:1.18 - resource_class: medium+ - -commands: - build-and-persist-plugin-binary: - parameters: - GOOS: - type: string - GOARCH: - default: "amd64" - type: string - steps: - - checkout - - run: GOOS=<< parameters.GOOS >> GOARCH=<> go build -o ./pkg/packer_plugin_ucloud_<< parameters.GOOS >>_<< parameters.GOARCH >> . - - run: zip ./pkg/packer_plugin_ucloud_<< parameters.GOOS >>_<< parameters.GOARCH >>.zip ./pkg/packer_plugin_ucloud_<< parameters.GOOS >>_<< parameters.GOARCH >> - - run: rm ./pkg/packer_plugin_ucloud_<< parameters.GOOS >>_<< parameters.GOARCH >> - - persist_to_workspace: - root: . - paths: - - ./pkg/ - -# Golang CircleCI 2.0 configuration file -# -# Check https://circleci.com/docs/2.0/language-go/ for more details -jobs: - build_linux: - executor: golang - steps: - - build-and-persist-plugin-binary: - GOOS: linux - build_windows: - executor: golang - working_directory: ~/go/src/github.com/hashicorp/packer-plugin-ucloud - steps: - - build-and-persist-plugin-binary: - GOOS: windows - build_darwin: - executor: golang - working_directory: ~/go/src/github.com/hashicorp/packer-plugin-ucloud - steps: - - build-and-persist-plugin-binary: - GOOS: darwin - - build-and-persist-plugin-binary: - GOOS: darwin - GOARCH: arm64 - build_freebsd: - executor: golang - working_directory: ~/go/src/github.com/hashicorp/packer-plugin-ucloud - steps: - - build-and-persist-plugin-binary: - GOOS: freebsd - build_solaris: - executor: golang - working_directory: ~/go/src/github.com/hashicorp/packer-plugin-ucloud - steps: - - build-and-persist-plugin-binary: - GOOS: solaris - build_openbsd: - executor: golang - working_directory: ~/go/src/github.com/hashicorp/packer-plugin-ucloud - steps: - - build-and-persist-plugin-binary: - GOOS: openbsd - store_artifacts: - executor: golang - steps: - - attach_workspace: - at: . - - store_artifacts: - path: ./pkg/ - destination: / - -workflows: - version: 2 - build_plugin_binaries: - jobs: - - build_darwin - - build_freebsd - - build_linux - - build_openbsd - - build_solaris - - build_windows - - store_artifacts: - requires: - - build_darwin - - build_freebsd - - build_linux - - build_openbsd - - build_solaris - - build_windows \ No newline at end of file From 67714ef7a8b22b60f489844a45e4429ad3816d44 Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Tue, 4 Apr 2023 22:30:57 +0800 Subject: [PATCH 5/8] Transfer ownership to UCloud - Fix go fmt error - Bump up version to 1.0.3 - Bump up golang version to 1.20.3 --- .github/workflows/go-validate.yml | 2 +- .gitignore | 1 + .go-version | 2 +- CODEOWNERS | 2 +- LICENSE | 2 +- README.md | 45 +++++++++++++++---- builder/ucloud/common/access_config.go | 2 +- builder/ucloud/uhost/builder.go | 2 +- builder/ucloud/uhost/builder.hcl2spec.go | 2 +- builder/ucloud/uhost/builder_acc_test.go | 4 +- builder/ucloud/uhost/builder_test.go | 2 +- .../ucloud/uhost/step_check_source_image.go | 2 +- .../uhost/step_config_security_group.go | 2 +- builder/ucloud/uhost/step_config_subnet.go | 2 +- builder/ucloud/uhost/step_config_vpc.go | 2 +- builder/ucloud/uhost/step_copy_image.go | 2 +- builder/ucloud/uhost/step_create_image.go | 2 +- builder/ucloud/uhost/step_create_instance.go | 2 +- builder/ucloud/uhost/step_pre_validate.go | 2 +- builder/ucloud/uhost/step_stop_instance.go | 2 +- go.mod | 2 +- main.go | 6 +-- .../ucloud-import/post-processor.go | 2 +- version/version.go | 2 +- 24 files changed, 62 insertions(+), 34 deletions(-) diff --git a/.github/workflows/go-validate.yml b/.github/workflows/go-validate.yml index 50ab32b..20524a4 100644 --- a/.github/workflows/go-validate.yml +++ b/.github/workflows/go-validate.yml @@ -48,7 +48,7 @@ jobs: go-version: ${{ needs.get-go-version.outputs.go-version }} - uses: golangci/golangci-lint-action@v3 with: - version: v1.47.3 + version: v1.52.2 only-new-issues: true check-fmt: needs: diff --git a/.gitignore b/.gitignore index 158e8a6..37705ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ main dist/* packer-plugin-scaffolding +packer-plugin-ucloud .docs diff --git a/.go-version b/.go-version index a63f36d..23486c3 100644 --- a/.go-version +++ b/.go-version @@ -1,2 +1,2 @@ -1.18.8 +1.20.3 diff --git a/CODEOWNERS b/CODEOWNERS index ff57feb..b126ce8 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1 +1 @@ -* @schnell18 +* @ucloud diff --git a/LICENSE b/LICENSE index 15eba9d..9aebd02 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2021 HashiCorp, Inc. +Copyright (c) 2023 UCloud. Mozilla Public License Version 2.0 ================================== diff --git a/README.md b/README.md index c3d5da1..173fa2a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Packer Plugin Ucloud -The `Ucloud` multi-component plugin can be used with HashiCorp [Packer](https://www.packer.io) -to create custom images. For the full list of available features for this plugin see [docs](docs). +The `Ucloud` multi-component plugin can be used with HashiCorp +[Packer](https://www.packer.io) to create custom images. For the full list of +available features for this plugin see [docs](docs). ## Installation @@ -19,8 +20,8 @@ Then, run [`packer init`](https://www.packer.io/docs/commands/init). packer { required_plugins { ucloud = { - version = ">= 1.0.2" - source = "github.com/hashicorp/ucloud" + version = ">= 1.0.3" + source = "github.com/ucloud/ucloud" } } } @@ -29,11 +30,12 @@ packer { #### Manual installation -You can find pre-built binary releases of the plugin [here](https://github.com/hashicorp/packer-plugin-ucloud/releases). -Once you have downloaded the latest archive corresponding to your target OS, -uncompress it to retrieve the plugin binary file corresponding to your platform. -To install the plugin, please follow the Packer documentation on -[installing a plugin](https://www.packer.io/docs/extending/plugins/#installing-plugins). +You can find pre-built binary releases of the plugin +[here](https://github.com/ucloud/packer-plugin-ucloud/releases). Once you have +downloaded the latest archive corresponding to your target OS, uncompress it to +retrieve the plugin binary file corresponding to your platform. To install the +plugin, please follow the Packer documentation on [installing a +plugin](https://www.packer.io/docs/extending/plugins/#installing-plugins). ### From Sources @@ -61,3 +63,28 @@ documentation located in the [`docs/`](docs) directory. fix a bug, please do so by opening a Pull Request in this GitHub repository. In case of feature contribution, we kindly ask you to open an issue to discuss it beforehand. + +## GPG public key +You may verify the released binaries with this GPG public key: + + -----BEGIN PGP PUBLIC KEY BLOCK----- + + mDMEZCbtBxYJKwYBBAHaRw8BAQdAzED5JgKHHe17uuPWzoU8IJRK0bqBF9S+KdVn + aCq1tg+0N0p1c3RpbiBaaGFuZyAoVUNsb3VkIHdvcmsgR1BHKSA8anVzdGluLnpo + YW5nQHVjbG91ZC5jbj6ImgQTFgoAQhYhBPi+ba2/BwN794NuPH7pFs0ifsLFBQJk + Ju0HAhsDBQkDwmcABQsJCAcCAyICAQYVCgkICwIEFgIDAQIeBwIXgAAKCRB+6RbN + In7CxTwnAQD739fTMO0e4LSvBYYqMT0OEel4/MYJMVXdftLB9CnfQAEAkel163cV + YCaW553KyQOJCI9aJSasopYju3lIUvkWfgGJATMEEAEIAB0WIQRFzhtgzKPwfHuQ + /nYgH5GJOOn1+gUCZCwziwAKCRAgH5GJOOn1+nG4CACT066mVIGq2dBPmf/7oNQS + JTZt1IdbYAkP3E7YhLolCDinDHjaw25JevR3iDIhPqqlaogrlIC2RBxsDg7zrv+q + SSEIkebW8BYYgc7K+1hpse4/V/jXJ1b+aFPKC3uvtQX8wU5bgOIctvhxl9agXHqd + MLtlbsGav0KGu65DElTLsoyEhaakWVatyGZ4tigc13o3CH6uUJCgaptYPc6J4p6N + we6q0s1FnNRYe3+ov+WvJvz+k2Qjr5o4n9HFajlueZcs1rAf6Eehpa/Imcp5NXCT + 0q453b0atLykK567Xc9v+gRRsJtDXV+rHNV38eAHazfwrEyVapkQ/JGJtAPI1/5n + uDgEZCbtBxIKKwYBBAGXVQEFAQEHQLZykGFXbDtodQLzuIclSAK4//NnT6F3kXC5 + M7flA55EAwEIB4h+BBgWCgAmFiEE+L5trb8HA3v3g248fukWzSJ+wsUFAmQm7QcC + GwwFCQPCZwAACgkQfukWzSJ+wsU9HwD+NAsTt8Odq4arxJd1t+bflUFqplvqbBwB + eXTsLTAKa2QBAI/ODojRoHtRU/rka6kiQJzFjN4nEINvoNyeem/PMaoE + =6uAG + -----END PGP PUBLIC KEY BLOCK----- + diff --git a/builder/ucloud/common/access_config.go b/builder/ucloud/common/access_config.go index 8864184..75c9c8e 100644 --- a/builder/ucloud/common/access_config.go +++ b/builder/ucloud/common/access_config.go @@ -11,7 +11,7 @@ import ( "runtime" "github.com/hashicorp/packer-plugin-sdk/template/interpolate" - "github.com/hashicorp/packer-plugin-ucloud/version" + "github.com/ucloud/packer-plugin-ucloud/version" "github.com/ucloud/ucloud-sdk-go/external" "github.com/ucloud/ucloud-sdk-go/private/protocol/http" "github.com/ucloud/ucloud-sdk-go/services/uaccount" diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go index 56760de..0ff1817 100644 --- a/builder/ucloud/uhost/builder.go +++ b/builder/ucloud/uhost/builder.go @@ -15,7 +15,7 @@ import ( packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer-plugin-sdk/template/interpolate" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" ) // The unique ID for this builder diff --git a/builder/ucloud/uhost/builder.hcl2spec.go b/builder/ucloud/uhost/builder.hcl2spec.go index 7940ed5..2822bb3 100644 --- a/builder/ucloud/uhost/builder.hcl2spec.go +++ b/builder/ucloud/uhost/builder.hcl2spec.go @@ -4,7 +4,7 @@ package uhost import ( "github.com/hashicorp/hcl/v2/hcldec" - "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/zclconf/go-cty/cty" ) diff --git a/builder/ucloud/uhost/builder_acc_test.go b/builder/ucloud/uhost/builder_acc_test.go index 7b30ae4..6fa02fe 100644 --- a/builder/ucloud/uhost/builder_acc_test.go +++ b/builder/ucloud/uhost/builder_acc_test.go @@ -10,9 +10,9 @@ import ( "github.com/hashicorp/packer-plugin-sdk/acctest" "github.com/hashicorp/packer-plugin-sdk/acctest/testutils" "github.com/hashicorp/packer-plugin-sdk/version" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" - pluginVersion "github.com/hashicorp/packer-plugin-ucloud/version" "github.com/stretchr/testify/assert" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" + pluginVersion "github.com/ucloud/packer-plugin-ucloud/version" ) func TestAccBuilder_validateRegion(t *testing.T) { diff --git a/builder/ucloud/uhost/builder_test.go b/builder/ucloud/uhost/builder_test.go index 8a31830..9c060bf 100644 --- a/builder/ucloud/uhost/builder_test.go +++ b/builder/ucloud/uhost/builder_test.go @@ -5,7 +5,7 @@ import ( "testing" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" ) func testBuilderConfig() map[string]interface{} { diff --git a/builder/ucloud/uhost/step_check_source_image.go b/builder/ucloud/uhost/step_check_source_image.go index d0eb6dd..e5b26f9 100644 --- a/builder/ucloud/uhost/step_check_source_image.go +++ b/builder/ucloud/uhost/step_check_source_image.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" ) type stepCheckSourceImageId struct { diff --git a/builder/ucloud/uhost/step_config_security_group.go b/builder/ucloud/uhost/step_config_security_group.go index bf59f08..f9d4c7a 100644 --- a/builder/ucloud/uhost/step_config_security_group.go +++ b/builder/ucloud/uhost/step_config_security_group.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_config_subnet.go b/builder/ucloud/uhost/step_config_subnet.go index a0f6c5e..f803f84 100644 --- a/builder/ucloud/uhost/step_config_subnet.go +++ b/builder/ucloud/uhost/step_config_subnet.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" ) type stepConfigSubnet struct { diff --git a/builder/ucloud/uhost/step_config_vpc.go b/builder/ucloud/uhost/step_config_vpc.go index 536a78e..1bcc7e9 100644 --- a/builder/ucloud/uhost/step_config_vpc.go +++ b/builder/ucloud/uhost/step_config_vpc.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" diff --git a/builder/ucloud/uhost/step_copy_image.go b/builder/ucloud/uhost/step_copy_image.go index c4afa0e..2345016 100644 --- a/builder/ucloud/uhost/step_copy_image.go +++ b/builder/ucloud/uhost/step_copy_image.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/packer-plugin-sdk/retry" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" diff --git a/builder/ucloud/uhost/step_create_image.go b/builder/ucloud/uhost/step_create_image.go index 7c01b98..663ea3d 100644 --- a/builder/ucloud/uhost/step_create_image.go +++ b/builder/ucloud/uhost/step_create_image.go @@ -6,7 +6,7 @@ import ( "time" "github.com/hashicorp/packer-plugin-sdk/retry" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" diff --git a/builder/ucloud/uhost/step_create_instance.go b/builder/ucloud/uhost/step_create_instance.go index 0427055..affe85d 100644 --- a/builder/ucloud/uhost/step_create_instance.go +++ b/builder/ucloud/uhost/step_create_instance.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" "github.com/hashicorp/packer-plugin-sdk/retry" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" ) diff --git a/builder/ucloud/uhost/step_pre_validate.go b/builder/ucloud/uhost/step_pre_validate.go index 055ebcd..ae744f1 100644 --- a/builder/ucloud/uhost/step_pre_validate.go +++ b/builder/ucloud/uhost/step_pre_validate.go @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" ) type stepPreValidate struct { diff --git a/builder/ucloud/uhost/step_stop_instance.go b/builder/ucloud/uhost/step_stop_instance.go index 020b0c2..4f9c33c 100644 --- a/builder/ucloud/uhost/step_stop_instance.go +++ b/builder/ucloud/uhost/step_stop_instance.go @@ -6,7 +6,7 @@ import ( "time" "github.com/hashicorp/packer-plugin-sdk/retry" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/hashicorp/packer-plugin-sdk/multistep" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" diff --git a/go.mod b/go.mod index b80fad7..711de51 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/hashicorp/packer-plugin-ucloud +module github.com/ucloud/packer-plugin-ucloud go 1.18 diff --git a/main.go b/main.go index ef22e6d..5e169d6 100644 --- a/main.go +++ b/main.go @@ -6,9 +6,9 @@ import ( "github.com/hashicorp/packer-plugin-sdk/plugin" - "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/uhost" - ucloudimport "github.com/hashicorp/packer-plugin-ucloud/post-processor/ucloud-import" - "github.com/hashicorp/packer-plugin-ucloud/version" + "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/uhost" + ucloudimport "github.com/ucloud/packer-plugin-ucloud/post-processor/ucloud-import" + "github.com/ucloud/packer-plugin-ucloud/version" ) func main() { diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go index 767c824..3cd020d 100644 --- a/post-processor/ucloud-import/post-processor.go +++ b/post-processor/ucloud-import/post-processor.go @@ -17,7 +17,7 @@ import ( "github.com/hashicorp/packer-plugin-sdk/retry" "github.com/hashicorp/packer-plugin-sdk/template/config" "github.com/hashicorp/packer-plugin-sdk/template/interpolate" - ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common" + ucloudcommon "github.com/ucloud/packer-plugin-ucloud/builder/ucloud/common" "github.com/ucloud/ucloud-sdk-go/services/ufile" "github.com/ucloud/ucloud-sdk-go/services/uhost" "github.com/ucloud/ucloud-sdk-go/ucloud" diff --git a/version/version.go b/version/version.go index a9cf652..53812de 100644 --- a/version/version.go +++ b/version/version.go @@ -4,7 +4,7 @@ import "github.com/hashicorp/packer-plugin-sdk/version" var ( // Version is the main version number that is being run at the moment. - Version = "1.0.2" + Version = "1.0.3" // VersionPrerelease is A pre-release marker for the Version. If this is "" // (empty string) then it means that it is a final release. Otherwise, this From 77852dcbdb0fb198a70619683976a58326a2c39b Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Wed, 5 Apr 2023 10:33:02 +0800 Subject: [PATCH 6/8] Bump version to 1.0.4 --- .github/workflows/release.yml | 3 ++- README.md | 2 +- version/version.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 09a78e5..96ca086 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,7 @@ on: - 'v*' jobs: goreleaser: + environment: production runs-on: ubuntu-latest steps: - name: Checkout @@ -25,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.20 - name: Describe plugin id: plugin_describe run: echo "::set-output name=api_version::$(go run . describe | jq -r '.api_version')" diff --git a/README.md b/README.md index 173fa2a..ee4ee99 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Then, run [`packer init`](https://www.packer.io/docs/commands/init). packer { required_plugins { ucloud = { - version = ">= 1.0.3" + version = ">= 1.0.4" source = "github.com/ucloud/ucloud" } } diff --git a/version/version.go b/version/version.go index 53812de..471d608 100644 --- a/version/version.go +++ b/version/version.go @@ -4,7 +4,7 @@ import "github.com/hashicorp/packer-plugin-sdk/version" var ( // Version is the main version number that is being run at the moment. - Version = "1.0.3" + Version = "1.0.4" // VersionPrerelease is A pre-release marker for the Version. If this is "" // (empty string) then it means that it is a final release. Otherwise, this From 2f2a1156e330cc6a478bdfdcda950460cbbea590 Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Wed, 5 Apr 2023 11:13:23 +0800 Subject: [PATCH 7/8] Bump up version to 1.0.5 - Upgrade goreleaser-action to v5 --- .github/workflows/release.yml | 2 +- .gitignore | 1 + version/version.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96ca086..148aaa8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: uses: goreleaser/goreleaser-action@v2 with: version: latest - args: release --rm-dist + args: release --clean env: GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 37705ba..b10e3d8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ dist/* packer-plugin-scaffolding packer-plugin-ucloud .docs +*.zip diff --git a/version/version.go b/version/version.go index 471d608..3bee951 100644 --- a/version/version.go +++ b/version/version.go @@ -4,7 +4,7 @@ import "github.com/hashicorp/packer-plugin-sdk/version" var ( // Version is the main version number that is being run at the moment. - Version = "1.0.4" + Version = "1.0.5" // VersionPrerelease is A pre-release marker for the Version. If this is "" // (empty string) then it means that it is a final release. Otherwise, this From dae9a8422f3bf03bc795ae25021a030c4228dab7 Mon Sep 17 00:00:00 2001 From: Justin Zhang Date: Wed, 5 Apr 2023 11:54:42 +0800 Subject: [PATCH 8/8] Bump up version to 1.0.6 - Fix golang version --- .github/workflows/release.yml | 7 ++++--- docs/README.md | 4 ++-- version/version.go | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 148aaa8..113d16e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: - name: Unshallow run: git fetch --prune --unshallow - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.20 + go-version: '1.20.3' - name: Describe plugin id: plugin_describe run: echo "::set-output name=api_version::$(go run . describe | jq -r '.api_version')" @@ -37,8 +37,9 @@ jobs: gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} passphrase: ${{ secrets.GPG_PASSPHRASE }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@v4 with: + distribution: goreleaser version: latest args: release --clean env: diff --git a/docs/README.md b/docs/README.md index bc5c946..7b259cc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -11,7 +11,7 @@ The Scaffolding plugin is intended as a starting point for creating Packer plugi - [ucloud-uhost](/docs/builders/uhost.mdx) - The `ucloud-uhost` builder provides the capability to build customized images based on an existing base image for use in UHost Instance. - + ### Post-processors - [ucloud-import](/docs/post-processors/import.mdx) - The UCloud Import post-processor takes the RAW, VHD, VMDK, or qcow2 @@ -35,7 +35,7 @@ Then, run [`packer init`](https://www.packer.io/docs/commands/init). packer { required_plugins { ucloud = { - version = ">= 1.0.0" + version = ">= 1.0.6" source = "github.com/hashicorp/ucloud" } } diff --git a/version/version.go b/version/version.go index 3bee951..9ee8fb3 100644 --- a/version/version.go +++ b/version/version.go @@ -4,7 +4,7 @@ import "github.com/hashicorp/packer-plugin-sdk/version" var ( // Version is the main version number that is being run at the moment. - Version = "1.0.5" + Version = "1.0.6" // VersionPrerelease is A pre-release marker for the Version. If this is "" // (empty string) then it means that it is a final release. Otherwise, this