Fix versioning (#10)

* fix versioning

* Update version/version.go

Co-authored-by: Adrien Delorme <[email protected]>

Co-authored-by: Adrien Delorme <[email protected]>

Author: Sylvia Moss

.goreleaser.yml

@@ -25,7 +25,7 @@ builds:
     flags:
       - -trimpath #removes all file system paths from the compiled executable
     ldflags:
-      - '-s -w -X main.Version={{.Version}} -X main.VersionPrerelease= '
+      - '-s -w -X {{ .ModulePath }}/version.Version={{.Version}} -X {{ .ModulePath }}/version.VersionPrerelease= '
     goos:
       - linux
     goarch:
@@ -36,7 +36,7 @@ builds:
     flags:
       - -trimpath #removes all file system paths from the compiled executable
     ldflags:
-      - '-s -w -X main.version={{.Version}} -X main.VersionPrerelease= '
+      - '-s -w -X {{ .ModulePath }}/version.Version={{.Version}} -X {{ .ModulePath }}/version.VersionPrerelease= '
     goos:
       - freebsd
       - windows

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-sdk/version"
+	"github.com/hashicorp/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"
@@ -24,8 +24,6 @@ import (
 	"github.com/ucloud/ucloud-sdk-go/ucloud/log"
 )
 
-var UcloudPluginVersion *version.PluginVersion
-
 type AccessConfig struct {
 	// This is the UCloud public key. It must be provided unless `profile` is set,
 	// but it can also be sourced from the `UCLOUD_PUBLIC_KEY` environment variable.
@@ -70,7 +68,7 @@ func (c *AccessConfig) Client() (*UCloudClient, error) {
 		cfg.BaseUrl = c.BaseUrl
 	}
 	cfg.LogLevel = log.PanicLevel
-	cfg.UserAgent = fmt.Sprintf("Packer-UCloud/%s", UcloudPluginVersion.FormattedVersion())
+	cfg.UserAgent = fmt.Sprintf("Packer-UCloud/%s", version.PluginVersion.FormattedVersion())
 	// set default max retry count
 	cfg.MaxRetries = 3
 

builder/ucloud/uhost/builder_acc_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/acctest"
 	"github.com/hashicorp/packer-plugin-sdk/acctest/testutils"
 	"github.com/hashicorp/packer-plugin-sdk/version"
-	"github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common"
 	ucloudcommon "github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common"
+	pluginVersion "github.com/hashicorp/packer-plugin-ucloud/version"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -235,7 +235,7 @@ func testAccPreCheck() error {
 func TestUCloudClientBaseUrlConfigurable(t *testing.T) {
 	const url = "baseUrl"
 	access := &ucloudcommon.AccessConfig{BaseUrl: url, PublicKey: "test", PrivateKey: "test"}
-	common.UcloudPluginVersion = version.InitializePluginVersion("0.0.0", "dev")
+	pluginVersion.PluginVersion = version.InitializePluginVersion("0.0.0", "dev")
 	client, err := access.Client()
 	assert.Nil(t, err)
 	assert.Equal(t, url, client.UAccountConn.Client.GetConfig().BaseUrl, "account conn's base url not configurable")

main.go

@@ -5,32 +5,16 @@ import (
 	"os"
 
 	"github.com/hashicorp/packer-plugin-sdk/plugin"
-	"github.com/hashicorp/packer-plugin-sdk/version"
-	"github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/common"
 	"github.com/hashicorp/packer-plugin-ucloud/builder/ucloud/uhost"
 	ucloudimport "github.com/hashicorp/packer-plugin-ucloud/post-processor/ucloud-import"
-)
-
-var (
-	// Version is the main version number that is being run at the moment.
-	Version = "0.0.1"
-
-	// 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
-	// is a pre-release such as "dev" (in development), "beta", "rc1", etc.
-	VersionPrerelease = "dev"
-
-	// PluginVersion is used by the plugin set to allow Packer to recognize
-	// what version this plugin is.
-	PluginVersion = version.InitializePluginVersion(Version, VersionPrerelease)
+	"github.com/hashicorp/packer-plugin-ucloud/version"
 )
 
 func main() {
 	pps := plugin.NewSet()
 	pps.RegisterBuilder("uhost", new(uhost.Builder))
 	pps.RegisterPostProcessor("import", new(ucloudimport.PostProcessor))
-	pps.SetVersion(PluginVersion)
-	common.UcloudPluginVersion = PluginVersion
+	pps.SetVersion(version.PluginVersion)
 	err := pps.Run()
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())

version/version.go

@@ -0,0 +1,17 @@
+package version
+
+import "github.com/hashicorp/packer-plugin-sdk/version"
+
+var (
+	// Version is the main version number that is being run at the moment.
+	Version = "0.0.2"
+
+	// 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
+	// is a pre-release such as "dev" (in development), "beta", "rc1", etc.
+	VersionPrerelease = "dev"
+
+	// PluginVersion is used by the plugin set to allow Packer to recognize
+	// what version this plugin is.
+	PluginVersion = version.InitializePluginVersion(Version, VersionPrerelease)
+)