chore: update Go SDK to v6 (#54)

kangasta · web-flow · commit 0bbeb670cbb0 · 2024-01-02T11:00:43.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+### Fixed
+- Update UpCloud Go SDK to v6 and fix security vulnerabilities
+
 ## [1.5.2] - 2022-12-15
 
 ### Fixed
diff --git a/builder/upcloud/artifact.go b/builder/upcloud/artifact.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 	"github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
 )
 
diff --git a/builder/upcloud/artifact_test.go b/builder/upcloud/artifact_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
 	"github.com/stretchr/testify/assert"
diff --git a/builder/upcloud/builder.go b/builder/upcloud/builder.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer-plugin-sdk/communicator"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
diff --git a/builder/upcloud/config.go b/builder/upcloud/config.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
 	"github.com/hashicorp/packer-plugin-sdk/common"
 	"github.com/hashicorp/packer-plugin-sdk/communicator"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
diff --git a/builder/upcloud/step_create_template.go b/builder/upcloud/step_create_template.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"
diff --git a/builder/upcloud/utils.go b/builder/upcloud/utils.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
diff --git a/builder/upcloud/utils_test.go b/builder/upcloud/utils_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 )
 
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/UpCloudLtd/packer-plugin-upcloud
 go 1.20
 
 require (
-	github.com/UpCloudLtd/upcloud-go-api/v5 v5.1.0
+	github.com/UpCloudLtd/upcloud-go-api/v6 v6.11.0
 	github.com/hashicorp/hcl/v2 v2.16.2
 	github.com/hashicorp/packer-plugin-sdk v0.5.1
 	github.com/stretchr/testify v1.8.1
diff --git a/go.sum b/go.sum
@@ -18,8 +18,8 @@ github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod h1:nu
 github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6 h1:w0E0fgc1YafGEh5cROhlROMWXiNoZqApk2PDN0M1+Ns=
 github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/UpCloudLtd/upcloud-go-api/v5 v5.1.0 h1:8xsPsKvz88DbP8MPk8q18ZIBoiTzcbGEfmy0ZVsTbrY=
-github.com/UpCloudLtd/upcloud-go-api/v5 v5.1.0/go.mod h1:AujcayelvOLjiwbulTrC0wzbykpsrcNcc1HuZ3Tloek=
+github.com/UpCloudLtd/upcloud-go-api/v6 v6.11.0 h1:8KvsimMoPPBx8IVebtHJHavrJPoJfNL5jsyW4TAC5m4=
+github.com/UpCloudLtd/upcloud-go-api/v6 v6.11.0/go.mod h1:I8rWmBBl+OhiY3AGzKbrobiE5TsLCLNYkCQxE4eJcTg=
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
diff --git a/internal/driver/driver.go b/internal/driver/driver.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud/client"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud/request"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud/service"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/client"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/service"
 )
 
 const (
@@ -80,8 +80,8 @@ func (d *driver) CreateServer(ctx context.Context, opts *ServerOpts) (*upcloud.S
 	request := d.prepareCreateRequest(opts)
 	response, err := d.svc.CreateServer(ctx, request)
 	if err != nil {
-		var upcloudErr *upcloud.Error
-		if errors.As(err, &upcloudErr) && upcloudErr.ErrorCode == upcloudErrorCodeMetadataDisabled {
+		var upcloudErr *upcloud.Problem
+		if errors.As(err, &upcloudErr) && upcloudErr.ErrorCode() == upcloudErrorCodeMetadataDisabled {
 			request.Metadata = upcloud.True
 			if response, err = d.svc.CreateServer(ctx, request); err != nil {
 				return nil, fmt.Errorf("Error creating metadata enabled server: %s", err)
diff --git a/post-processor/upcloud-import/artifact.go b/post-processor/upcloud-import/artifact.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 )
 
 const artifactDestroyTimeout time.Duration = time.Minute * 30
diff --git a/post-processor/upcloud-import/post-processor.go b/post-processor/upcloud-import/post-processor.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
diff --git a/post-processor/upcloud-import/step_create_template.go b/post-processor/upcloud-import/step_create_template.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
diff --git a/post-processor/upcloud-import/utils.go b/post-processor/upcloud-import/utils.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
-	"github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"
+	"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 )

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"strings"`
`7`	`7`
`8`	`8`	`"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"`
`9`		`- "github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"`
	`9`	`+ "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"`
`10`	`10`	`"github.com/hashicorp/packer-plugin-sdk/packer/registry/image"`
`11`	`11`	`)`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ import (`
`4`	`4`	`"reflect"`
`5`	`5`	`"testing"`
`6`	`6`
`7`		`- "github.com/UpCloudLtd/upcloud-go-api/v5/upcloud"`
`8`		`- "github.com/UpCloudLtd/upcloud-go-api/v5/upcloud/request"`
	`7`	`+ "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"`
	`8`	`+ "github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"`
`9`	`9`	`"github.com/hashicorp/packer-plugin-sdk/multistep"`
`10`	`10`	`)`
`11`	`11`