upgrade-go-oauth2-and-storage-packages-versions (#96)

GoogleCloudPlatform · Apr 3, 2023 · 31d1aec · 31d1aec
1 parent 6bc5955
commit 31d1aec
Show file tree

Hide file tree

Showing 9 changed files with 3,497 additions and 174 deletions.
diff --git a/cli_tools/common/utils/storage/storage_client_test.go b/cli_tools/common/utils/storage/storage_client_test.go
@@ -205,7 +205,7 @@ func doTestFindGcsFile(t *testing.T, bucket, lookupPath string) {
 		CreateObjectIterator(bucket, lookupPath).
 		Return(mockObjectIterator)
 
-	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
+	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
 	storageObject, err := sc.FindGcsFile(
 		fmt.Sprintf("gs://%v/%v", bucket, lookupPath), ".ovf")
 
@@ -303,7 +303,7 @@ func TestFindGcsFileDepthLimitedFileInRoot(t *testing.T) {
 		CreateObjectIterator("sourcebucket", "").
 		Return(mockObjectIterator)
 
-	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
+	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
 	storageObject, err := sc.FindGcsFileDepthLimited(
 		"gs://sourcebucket/", ".ovf", 0)
 
@@ -372,7 +372,7 @@ func doTestFindGcsFileDepthLimitedFileInSubFolderlookupFromRoot(t *testing.T, gc
 		CreateObjectIterator("sourcebucket", "").
 		Return(mockObjectIterator)
 
-	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
+	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
 	storageObject, err := sc.FindGcsFileDepthLimited(
 		gcsDirectoryPath, ".ovf", 2)
 
@@ -410,7 +410,7 @@ func doTestFindGcsFileDepthLimitedFileInSubFolderlookupFromSubfolder(t *testing.
 		CreateObjectIterator(bucket, lookupPath).
 		Return(mockObjectIterator)
 
-	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
+	sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
 	storageObject, err := sc.FindGcsFileDepthLimited(
 		fmt.Sprintf("gs://%v/%v", bucket, lookupPath), ".ovf", 0)
 

diff --git a/cli_tools/go.mod b/cli_tools/go.mod
@@ -3,8 +3,8 @@ module github.com/GoogleCloudPlatform/compute-image-import/cli_tools
 go 1.13
 
 require (
-	cloud.google.com/go/compute v1.2.0
-	cloud.google.com/go/storage v1.14.0
+	cloud.google.com/go/compute/metadata v0.2.3
+	cloud.google.com/go/storage v1.30.1
 	cos.googlesource.com/cos/tools.git v0.0.0-20210104210903-4b3bc7d49b79 // indirect
 	github.com/GoogleCloudPlatform/compute-daisy v0.0.0-20220223233810-60345cd7065c
 	github.com/GoogleCloudPlatform/compute-image-import/common v0.0.0-00010101000000-000000000000
@@ -17,20 +17,18 @@ require (
 	github.com/go-playground/validator/v10 v10.4.1
 	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2
-	github.com/google/go-cmp v0.5.7
+	github.com/google/go-cmp v0.5.9
 	github.com/google/logger v1.1.0
-	github.com/google/uuid v1.2.0
-	github.com/klauspost/compress v1.11.7 // indirect
+	github.com/google/uuid v1.3.0
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/minio/highwayhash v1.0.1
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.1
 	github.com/vmware/govmomi v0.24.0
 	go.chromium.org/luci v0.0.0-20210204234011-34a994fe5aec // indirect
-	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
-	google.golang.org/api v0.67.0
-	google.golang.org/protobuf v1.27.1
+	golang.org/x/sync v0.1.0
+	golang.org/x/sys v0.6.0
+	google.golang.org/api v0.114.0
+	google.golang.org/protobuf v1.29.1
 )
 
 replace github.com/GoogleCloudPlatform/compute-image-import/proto/go => ../proto/go

diff --git a/cli_tools/go.sum b/cli_tools/go.sum
diff --git a/cli_tools_tests/go.mod b/cli_tools_tests/go.mod
@@ -3,19 +3,19 @@ module github.com/GoogleCloudPlatform/compute-image-import/cli_tools_tests
 go 1.13
 
 require (
-	cloud.google.com/go/storage v1.14.0
+	cloud.google.com/go/storage v1.30.1
 	github.com/GoogleCloudPlatform/compute-daisy v0.0.0-20220223233810-60345cd7065c
 	github.com/GoogleCloudPlatform/compute-image-import/cli_tools v0.0.0
 	github.com/GoogleCloudPlatform/compute-image-import/common v0.0.0
 	github.com/GoogleCloudPlatform/compute-image-import/go/e2e_test_utils v0.0.0
 	github.com/GoogleCloudPlatform/compute-image-import/proto/go v0.0.0
 	github.com/aws/aws-sdk-go v1.37.5
 	github.com/golang/protobuf v1.5.2
-	github.com/google/go-cmp v0.5.7
-	github.com/google/uuid v1.2.0
-	github.com/stretchr/testify v1.7.0
-	google.golang.org/api v0.67.0
-	google.golang.org/protobuf v1.27.1
+	github.com/google/go-cmp v0.5.9
+	github.com/google/uuid v1.3.0
+	github.com/stretchr/testify v1.8.1
+	google.golang.org/api v0.114.0
+	google.golang.org/protobuf v1.29.1
 )
 
 replace github.com/GoogleCloudPlatform/compute-image-import/common => ../common