Skip to content

Commit 31d1aec

Browse files
MahmoudNada0MahmoudNada0
authored
upgrade-go-oauth2-and-storage-packages-versions (#96)
1 parent 6bc5955 commit 31d1aec

File tree

9 files changed

+3497
-174
lines changed

9 files changed

+3497
-174
lines changed

‎cli_tools/common/utils/storage/storage_client_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func doTestFindGcsFile(t *testing.T, bucket, lookupPath string) {
205205
CreateObjectIterator(bucket, lookupPath).
206206
Return(mockObjectIterator)
207207

208-
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
208+
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
209209
storageObject, err := sc.FindGcsFile(
210210
fmt.Sprintf("gs://%v/%v", bucket, lookupPath), ".ovf")
211211

@@ -303,7 +303,7 @@ func TestFindGcsFileDepthLimitedFileInRoot(t *testing.T) {
303303
CreateObjectIterator("sourcebucket", "").
304304
Return(mockObjectIterator)
305305

306-
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
306+
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
307307
storageObject, err := sc.FindGcsFileDepthLimited(
308308
"gs://sourcebucket/", ".ovf", 0)
309309

@@ -372,7 +372,7 @@ func doTestFindGcsFileDepthLimitedFileInSubFolderlookupFromRoot(t *testing.T, gc
372372
CreateObjectIterator("sourcebucket", "").
373373
Return(mockObjectIterator)
374374

375-
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
375+
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
376376
storageObject, err := sc.FindGcsFileDepthLimited(
377377
gcsDirectoryPath, ".ovf", 2)
378378

@@ -410,7 +410,7 @@ func doTestFindGcsFileDepthLimitedFileInSubFolderlookupFromSubfolder(t *testing.
410410
CreateObjectIterator(bucket, lookupPath).
411411
Return(mockObjectIterator)
412412

413-
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]")}
413+
sc := Client{Oic: mockObjectIteratorCreator, Logger: logging.NewToolLogger("[test]"), StorageClient: &storage.Client{}}
414414
storageObject, err := sc.FindGcsFileDepthLimited(
415415
fmt.Sprintf("gs://%v/%v", bucket, lookupPath), ".ovf", 0)
416416

‎cli_tools/go.mod‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/GoogleCloudPlatform/compute-image-import/cli_tools
33
go 1.13
44

55
require (
6-
cloud.google.com/go/compute v1.2.0
7-
cloud.google.com/go/storage v1.14.0
6+
cloud.google.com/go/compute/metadata v0.2.3
7+
cloud.google.com/go/storage v1.30.1
88
cos.googlesource.com/cos/tools.git v0.0.0-20210104210903-4b3bc7d49b79 // indirect
99
github.com/GoogleCloudPlatform/compute-daisy v0.0.0-20220223233810-60345cd7065c
1010
github.com/GoogleCloudPlatform/compute-image-import/common v0.0.0-00010101000000-000000000000
@@ -17,20 +17,18 @@ require (
1717
github.com/go-playground/validator/v10 v10.4.1
1818
github.com/golang/mock v1.6.0
1919
github.com/golang/protobuf v1.5.2
20-
github.com/google/go-cmp v0.5.7
20+
github.com/google/go-cmp v0.5.9
2121
github.com/google/logger v1.1.0
22-
github.com/google/uuid v1.2.0
23-
github.com/klauspost/compress v1.11.7 // indirect
22+
github.com/google/uuid v1.3.0
2423
github.com/leodido/go-urn v1.2.1 // indirect
2524
github.com/minio/highwayhash v1.0.1
26-
github.com/stretchr/testify v1.7.0
25+
github.com/stretchr/testify v1.8.1
2726
github.com/vmware/govmomi v0.24.0
2827
go.chromium.org/luci v0.0.0-20210204234011-34a994fe5aec // indirect
29-
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
30-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
31-
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27
32-
google.golang.org/api v0.67.0
33-
google.golang.org/protobuf v1.27.1
28+
golang.org/x/sync v0.1.0
29+
golang.org/x/sys v0.6.0
30+
google.golang.org/api v0.114.0
31+
google.golang.org/protobuf v1.29.1
3432
)
3533

3634
replace github.com/GoogleCloudPlatform/compute-image-import/proto/go => ../proto/go

‎cli_tools/go.sum‎

Lines changed: 870 additions & 40 deletions
Large diffs are not rendered by default.

‎cli_tools_tests/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ module github.com/GoogleCloudPlatform/compute-image-import/cli_tools_tests
33
go 1.13
44

55
require (
6-
cloud.google.com/go/storage v1.14.0
6+
cloud.google.com/go/storage v1.30.1
77
github.com/GoogleCloudPlatform/compute-daisy v0.0.0-20220223233810-60345cd7065c
88
github.com/GoogleCloudPlatform/compute-image-import/cli_tools v0.0.0
99
github.com/GoogleCloudPlatform/compute-image-import/common v0.0.0
1010
github.com/GoogleCloudPlatform/compute-image-import/go/e2e_test_utils v0.0.0
1111
github.com/GoogleCloudPlatform/compute-image-import/proto/go v0.0.0
1212
github.com/aws/aws-sdk-go v1.37.5
1313
github.com/golang/protobuf v1.5.2
14-
github.com/google/go-cmp v0.5.7
15-
github.com/google/uuid v1.2.0
16-
github.com/stretchr/testify v1.7.0
17-
google.golang.org/api v0.67.0
18-
google.golang.org/protobuf v1.27.1
14+
github.com/google/go-cmp v0.5.9
15+
github.com/google/uuid v1.3.0
16+
github.com/stretchr/testify v1.8.1
17+
google.golang.org/api v0.114.0
18+
google.golang.org/protobuf v1.29.1
1919
)
2020

2121
replace github.com/GoogleCloudPlatform/compute-image-import/common => ../common

0 commit comments

Comments
 (0)