Upgrade iot client GO to version 3.0.0 (#169)

rjtokenring · web-flow · commit 1df3c4608fd1 · 2024-11-06T11:29:27.000+01:00
diff --git a/.github/workflows/check-dependencies-task.yml b/.github/workflows/check-dependencies-task.yml
@@ -34,7 +34,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install licensed
         uses: jonabc/setup-licensed@v1
@@ -43,7 +43,7 @@ jobs:
           version: 3.x
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -81,7 +81,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install licensed
         uses: jonabc/setup-licensed@v1
@@ -90,7 +90,7 @@ jobs:
           version: 3.x
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
diff --git a/.github/workflows/release-go-task.yml b/.github/workflows/release-go-task.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download artifacts
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/test-go-task.yml b/.github/workflows/test-go-task.yml
@@ -75,10 +75,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
diff --git a/.licenses/go/github.com/arduino/iot-client-go/v3.dep.yml b/.licenses/go/github.com/arduino/iot-client-go/v3.dep.yml
@@ -1,9 +1,9 @@
 ---
-name: github.com/arduino/iot-client-go/v2
-version: v2.0.3
+name: github.com/arduino/iot-client-go/v3
+version: v3.0.1
 type: go
 summary: 
-homepage: https://pkg.go.dev/github.com/arduino/iot-client-go/v2
+homepage: https://pkg.go.dev/github.com/arduino/iot-client-go/v3
 license: apache-2.0
 licenses:
 - sources: LICENSE
diff --git a/.licenses/go/golang.org/x/oauth2.dep.yml b/.licenses/go/golang.org/x/oauth2.dep.yml
@@ -1,6 +1,6 @@
 ---
 name: golang.org/x/oauth2
-version: v0.21.0
+version: v0.23.0
 type: go
 summary: Package oauth2 provides support for making OAuth2 authorized and authenticated
   HTTP requests, as specified in RFC 6749.
@@ -9,7 +9,7 @@ license: bsd-3-clause
 licenses:
 - sources: LICENSE
   text: |
-    Copyright (c) 2009 The Go Authors. All rights reserved.
+    Copyright 2009 The Go Authors.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -21,7 +21,7 @@ licenses:
     copyright notice, this list of conditions and the following disclaimer
     in the documentation and/or other materials provided with the
     distribution.
-       * Neither the name of Google Inc. nor the names of its
+       * Neither the name of Google LLC nor the names of its
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.
 
diff --git a/.licenses/go/golang.org/x/oauth2/clientcredentials.dep.yml b/.licenses/go/golang.org/x/oauth2/clientcredentials.dep.yml
@@ -1,15 +1,15 @@
 ---
 name: golang.org/x/oauth2/clientcredentials
-version: v0.21.0
+version: v0.23.0
 type: go
 summary: Package clientcredentials implements the OAuth2.0 "client credentials" token
   flow, also known as the "two-legged OAuth 2.0".
 homepage: https://pkg.go.dev/golang.org/x/oauth2/clientcredentials
 license: bsd-3-clause
 licenses:
-- sources: oauth2@v0.21.0/LICENSE
+- sources: oauth2@v0.23.0/LICENSE
   text: |
-    Copyright (c) 2009 The Go Authors. All rights reserved.
+    Copyright 2009 The Go Authors.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -21,7 +21,7 @@ licenses:
     copyright notice, this list of conditions and the following disclaimer
     in the documentation and/or other materials provided with the
     distribution.
-       * Neither the name of Google Inc. nor the names of its
+       * Neither the name of Google LLC nor the names of its
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.
 
diff --git a/.licenses/go/golang.org/x/oauth2/internal.dep.yml b/.licenses/go/golang.org/x/oauth2/internal.dep.yml
@@ -1,14 +1,14 @@
 ---
 name: golang.org/x/oauth2/internal
-version: v0.21.0
+version: v0.23.0
 type: go
 summary: Package internal contains support packages for oauth2 package.
 homepage: https://pkg.go.dev/golang.org/x/oauth2/internal
 license: bsd-3-clause
 licenses:
-- sources: oauth2@v0.21.0/LICENSE
+- sources: oauth2@v0.23.0/LICENSE
   text: |
-    Copyright (c) 2009 The Go Authors. All rights reserved.
+    Copyright 2009 The Go Authors.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are
@@ -20,7 +20,7 @@ licenses:
     copyright notice, this list of conditions and the following disclaimer
     in the documentation and/or other materials provided with the
     distribution.
-       * Neither the name of Google Inc. nor the names of its
+       * Neither the name of Google LLC nor the names of its
     contributors may be used to endorse or promote products derived from
     this software without specific prior written permission.
 
diff --git a/command/dashboard/dashboard.go b/command/dashboard/dashboard.go
@@ -18,7 +18,7 @@
 package dashboard
 
 import (
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 )
 
 // DashboardInfo contains the most interesting
diff --git a/command/device/createlora.go b/command/device/createlora.go
@@ -26,7 +26,7 @@ import (
 	"github.com/arduino/arduino-cloud-cli/arduino/cli"
 	"github.com/arduino/arduino-cloud-cli/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 	"github.com/sirupsen/logrus"
 	"go.bug.st/serial"
 )
diff --git a/command/device/device.go b/command/device/device.go
@@ -19,7 +19,7 @@ package device
 
 import (
 	"github.com/arduino/arduino-cloud-cli/command/tag"
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 )
 
 // DeviceInfo contains the most interesting
diff --git a/command/device/provision.go b/command/device/provision.go
@@ -29,7 +29,7 @@ import (
 	"github.com/arduino/arduino-cloud-cli/internal/binary"
 	"github.com/arduino/arduino-cloud-cli/internal/serial"
 	"github.com/arduino/go-paths-helper"
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/command/ota/massupload.go b/command/ota/massupload.go
@@ -31,7 +31,7 @@ import (
 	"github.com/arduino/arduino-cloud-cli/internal/ota"
 	otaapi "github.com/arduino/arduino-cloud-cli/internal/ota-api"
 
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 )
 
 const (
diff --git a/command/ota/massupload_test.go b/command/ota/massupload_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 
 	otaapi "github.com/arduino/arduino-cloud-cli/internal/ota-api"
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 	"github.com/gofrs/uuid"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/command/template/apply.go b/command/template/apply.go
@@ -31,7 +31,7 @@ import (
 	"github.com/arduino/arduino-cloud-cli/config"
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
 	storageapi "github.com/arduino/arduino-cloud-cli/internal/storage-api"
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 	"github.com/gofrs/uuid"
 	"github.com/sirupsen/logrus"
 )
diff --git a/command/thing/bind.go b/command/thing/bind.go
@@ -23,7 +23,7 @@ import (
 	"github.com/arduino/arduino-cloud-cli/config"
 
 	"github.com/arduino/arduino-cloud-cli/internal/iot"
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 )
 
 // BindParams contains the parameters needed to
diff --git a/command/thing/thing.go b/command/thing/thing.go
@@ -19,7 +19,7 @@ package thing
 
 import (
 	"github.com/arduino/arduino-cloud-cli/command/tag"
-	iotclient "github.com/arduino/iot-client-go/v2"
+	iotclient "github.com/arduino/iot-client-go/v3"
 )
 
 // ThingInfo contains the main parameters of
diff --git a/go.mod b/go.mod
@@ -1,12 +1,12 @@
 module github.com/arduino/arduino-cloud-cli
 
-go 1.23.0
+go 1.23
 
 require (
 	github.com/arduino/arduino-cli v0.0.0-20240927141754-d9dd4ba1ed71
 	github.com/arduino/go-paths-helper v1.12.1
 	github.com/arduino/go-win32-utils v1.0.0
-	github.com/arduino/iot-client-go/v2 v2.0.3
+	github.com/arduino/iot-client-go/v3 v3.0.1
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/google/go-cmp v0.6.0
 	github.com/howeyc/crc16 v0.0.0-20171223171357-2b2a61e366a6
@@ -19,7 +19,7 @@ require (
 	go.bug.st/cleanup v1.0.0
 	go.bug.st/serial v1.6.2
 	golang.org/x/crypto v0.18.0
-	golang.org/x/oauth2 v0.21.0
+	golang.org/x/oauth2 v0.23.0
 	google.golang.org/grpc v1.61.0
 	gopkg.in/yaml.v3 v3.0.1
 	gotest.tools v2.2.0+incompatible
diff --git a/go.sum b/go.sum
@@ -71,8 +71,8 @@ github.com/arduino/go-properties-orderedmap v1.7.1 h1:HQ9Pn/mk3+XyfrE39EEvaZwJkr
 github.com/arduino/go-properties-orderedmap v1.7.1/go.mod h1:DKjD2VXY/NZmlingh4lSFMEYCVubfeArCsGPGDwb2yk=
 github.com/arduino/go-win32-utils v1.0.0 h1:/cXB86sOJxOsCHP7sQmXGLkdValwJt56mIwOHYxgQjQ=
 github.com/arduino/go-win32-utils v1.0.0/go.mod h1:0jqM7doGEAs6DaJCxxhLBUDS5OawrqF48HqXkcEie/Q=
-github.com/arduino/iot-client-go/v2 v2.0.3 h1:/mYkInEgr2a4s3bSFhjCzynBApPcYlpDwsuTQiyMbag=
-github.com/arduino/iot-client-go/v2 v2.0.3/go.mod h1:kwX4B2AVEWl5ug94QbQ087xbvLFa9Co//jhbM/Z2eSQ=
+github.com/arduino/iot-client-go/v3 v3.0.1 h1:AwkctEtP7ilVXBOF2yZPJZpjpuUmKNGr/OdYxPx/4QQ=
+github.com/arduino/iot-client-go/v3 v3.0.1/go.mod h1:r2QEAP5Jalkr0YWNPhFl0EJzFRQNy24wN5CVbn11f64=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
@@ -582,8 +582,8 @@ golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
-golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
+golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/internal/iot/client.go b/internal/iot/client.go
diff --git a/internal/iot/error.go b/internal/iot/error.go
diff --git a/internal/iot/token.go b/internal/iot/token.go
diff --git a/internal/template/dashboard.go b/internal/template/dashboard.go
diff --git a/internal/template/extract.go b/internal/template/extract.go
diff --git a/internal/template/load.go b/internal/template/load.go
diff --git a/internal/template/load_test.go b/internal/template/load_test.go

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`package dashboard`
`19`	`19`
`20`	`20`	`import (`
`21`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`21`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// DashboardInfo contains the most interesting`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/arduino/arduino-cloud-cli/arduino/cli"`
`27`	`27`	`"github.com/arduino/arduino-cloud-cli/config"`
`28`	`28`	`"github.com/arduino/arduino-cloud-cli/internal/iot"`
`29`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`29`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`30`	`30`	`"github.com/sirupsen/logrus"`
`31`	`31`	`"go.bug.st/serial"`
`32`	`32`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package device`
`19`	`19`
`20`	`20`	`import (`
`21`	`21`	`"github.com/arduino/arduino-cloud-cli/command/tag"`
`22`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`22`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// DeviceInfo contains the most interesting`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`"github.com/arduino/arduino-cloud-cli/internal/binary"`
`30`	`30`	`"github.com/arduino/arduino-cloud-cli/internal/serial"`
`31`	`31`	`"github.com/arduino/go-paths-helper"`
`32`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`32`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`33`	`33`	`"github.com/sirupsen/logrus"`
`34`	`34`	`)`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`"github.com/arduino/arduino-cloud-cli/internal/ota"`
`32`	`32`	`otaapi "github.com/arduino/arduino-cloud-cli/internal/ota-api"`
`33`	`33`
`34`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`34`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"testing"`
`26`	`26`
`27`	`27`	`otaapi "github.com/arduino/arduino-cloud-cli/internal/ota-api"`
`28`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`28`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`29`	`29`	`"github.com/gofrs/uuid"`
`30`	`30`	`"github.com/stretchr/testify/assert"`
`31`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"github.com/arduino/arduino-cloud-cli/config"`
`24`	`24`
`25`	`25`	`"github.com/arduino/arduino-cloud-cli/internal/iot"`
`26`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`26`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`// BindParams contains the parameters needed to`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package thing`
`19`	`19`
`20`	`20`	`import (`
`21`	`21`	`"github.com/arduino/arduino-cloud-cli/command/tag"`
`22`		`- iotclient "github.com/arduino/iot-client-go/v2"`
	`22`	`+ iotclient "github.com/arduino/iot-client-go/v3"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// ThingInfo contains the main parameters of`