Skip to content

Commit 853f693

Browse files
thevilledevthevilledev
authored
chore(deps): upgrade UpCloud Go API from v6 to v8 (#65)
Updates the UpCloud Go API client from v6.11.0 to v8.18.0 and adapts the codebase to use context-based timeout handling instead of request parameter timeouts. This change aligns with the v8 API requirements while maintaining the same functionality. Signed-off-by: Ville Vesilehto <ville.vesilehto@upcloud.com>
1 parent 134c426 commit 853f693

File tree

15 files changed

+48
-34
lines changed

15 files changed

+48
-34
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
1212
### Changed
1313

1414
- Update `packer-plugin-sdk` to [v0.6.1](https://github.com/hashicorp/packer-plugin-sdk/releases/tag/v0.6.1)
15+
- Update `upcloud-go-api` to [v8.18.0](https://github.com/UpCloudLtd/upcloud-go-api/releases/tag/v8.18.0)
1516

1617
## [1.5.3] - 2024-01-02
1718

‎builder/upcloud/artifact.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77

88
"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
9-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
9+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
1010
"github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
1111
)
1212

‎builder/upcloud/artifact_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
7+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
88
packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
99
"github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
1010
"github.com/stretchr/testify/assert"

‎builder/upcloud/builder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"time"
77

88
"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
9-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
9+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
1010
"github.com/hashicorp/hcl/v2/hcldec"
1111
"github.com/hashicorp/packer-plugin-sdk/communicator"
1212
"github.com/hashicorp/packer-plugin-sdk/multistep"

‎builder/upcloud/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"time"
88

99
"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
10-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
11-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
10+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
11+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
1212
"github.com/hashicorp/packer-plugin-sdk/common"
1313
"github.com/hashicorp/packer-plugin-sdk/communicator"
1414
"github.com/hashicorp/packer-plugin-sdk/packer"

‎builder/upcloud/step_create_template.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66

77
"github.com/UpCloudLtd/packer-plugin-upcloud/internal/driver"
8-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
8+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
99
"github.com/hashicorp/packer-plugin-sdk/multistep"
1010
"github.com/hashicorp/packer-plugin-sdk/packer"
1111
"github.com/hashicorp/packer-plugin-sdk/packerbuilderdata"

‎builder/upcloud/utils.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"fmt"
77
"time"
88

9-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
10-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
9+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
10+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
1111
"github.com/hashicorp/packer-plugin-sdk/multistep"
1212
"github.com/hashicorp/packer-plugin-sdk/packer"
1313
)

‎builder/upcloud/utils_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"reflect"
55
"testing"
66

7-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud"
8-
"github.com/UpCloudLtd/upcloud-go-api/v6/upcloud/request"
7+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud"
8+
"github.com/UpCloudLtd/upcloud-go-api/v8/upcloud/request"
99
"github.com/hashicorp/packer-plugin-sdk/multistep"
1010
)
1111

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/UpCloudLtd/packer-plugin-upcloud
33
go 1.24
44

55
require (
6-
github.com/UpCloudLtd/upcloud-go-api/v6 v6.11.0
6+
github.com/UpCloudLtd/upcloud-go-api/v8 v8.18.0
77
github.com/hashicorp/hcl/v2 v2.19.1
88
github.com/hashicorp/packer-plugin-sdk v0.6.1
99
github.com/stretchr/testify v1.10.0
@@ -78,6 +78,7 @@ require (
7878
github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db // indirect
7979
github.com/pkg/sftp v1.13.4 // indirect
8080
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
81+
github.com/rogpeppe/go-internal v1.9.0 // indirect
8182
github.com/ryanuber/go-glob v1.0.0 // indirect
8283
github.com/ugorji/go/codec v1.2.6 // indirect
8384
github.com/ulikunitz/xz v0.5.10 // indirect

‎go.sum‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod h1:nu
1717
github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6 h1:w0E0fgc1YafGEh5cROhlROMWXiNoZqApk2PDN0M1+Ns=
1818
github.com/ChrisTrenkamp/goxpath v0.0.0-20210404020558-97928f7e12b6/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4=
1919
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
20-
github.com/UpCloudLtd/upcloud-go-api/v6 v6.11.0 h1:8KvsimMoPPBx8IVebtHJHavrJPoJfNL5jsyW4TAC5m4=
21-
github.com/UpCloudLtd/upcloud-go-api/v6 v6.11.0/go.mod h1:I8rWmBBl+OhiY3AGzKbrobiE5TsLCLNYkCQxE4eJcTg=
20+
github.com/UpCloudLtd/upcloud-go-api/v8 v8.18.0 h1:+/V1XlqK3fLdxTSU+rCc2N5pSBj+NxUE6gpRtCbhK3E=
21+
github.com/UpCloudLtd/upcloud-go-api/v8 v8.18.0/go.mod h1:bFnrOkfsDDmsb94nnBV5eSQjjsfDnwAzLnCt9+b4t/4=
2222
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
2323
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
2424
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -219,8 +219,8 @@ github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
219219
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
220220
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
221221
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
222-
github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
223-
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
222+
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
223+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
224224
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
225225
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
226226
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -305,6 +305,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
305305
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
306306
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
307307
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
308+
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
309+
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
308310
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
309311
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
310312
github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
@@ -475,15 +477,16 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh
475477
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
476478
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
477479
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
478-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
479480
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
481+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
482+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
480483
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
481484
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
482485
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
483486
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
484487
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
485-
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
486-
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
488+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
489+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
487490
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
488491
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
489492
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)