Skip to content

Commit f3e29fb

Browse files
general-kroll-4-lifegeneral-kroll-4-life
authored
aws-sdk-go-v2 (#567)
Summary: - Full replacement of deprecated indirect dependency (via `any-sdk`) `aws-sdk-go` with `aws-sdk-go-v2`. - Header changes for mocks to accommodate `aws-sdk` `v2` signing behavioour. - Incorporated stringent `any-sdk` analysis. - Incremented minor version to `9`.
1 parent 7f55a4b commit f3e29fb

File tree

5 files changed

+31
-34
lines changed

5 files changed

+31
-34
lines changed

‎cicd/version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
MajorVersion=0
2-
MinorVersion=8
2+
MinorVersion=9

‎go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/spf13/cobra v1.4.0
1717
github.com/spf13/pflag v1.0.5
1818
github.com/spf13/viper v1.10.1
19-
github.com/stackql/any-sdk v0.1.5-beta06
19+
github.com/stackql/any-sdk v0.2.1-alpha05
2020
github.com/stackql/go-suffix-map v0.0.1-alpha01
2121
github.com/stackql/psql-wire v0.1.1-beta23
2222
github.com/stackql/stackql-parser v0.0.15-alpha06
@@ -44,7 +44,6 @@ require (
4444
github.com/antchfx/xmlquery v1.3.10 // indirect
4545
github.com/antchfx/xpath v1.2.0 // indirect
4646
github.com/apache/arrow-go/v18 v18.0.0 // indirect
47-
github.com/aws/aws-sdk-go v1.55.6 // indirect
4847
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
4948
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
5049
github.com/aws/aws-sdk-go-v2/config v1.27.11 // indirect

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ github.com/apache/arrow-go/v18 v18.0.0 h1:1dBDaSbH3LtulTyOVYaBCHO3yVRwjV+TZaqn3g
9191
github.com/apache/arrow-go/v18 v18.0.0/go.mod h1:t6+cWRSmKgdQ6HsxisQjok+jBpKGhRDiqcf3p0p/F+A=
9292
github.com/apache/thrift v0.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE=
9393
github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw=
94-
github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk=
95-
github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
9694
github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
9795
github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
9896
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to=
@@ -463,8 +461,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
463461
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
464462
github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
465463
github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
466-
github.com/stackql/any-sdk v0.1.5-beta06 h1:iscDSpl5OdN9xA3Pxt0Z5pK78boWi1N7mrMPmHPvmKk=
467-
github.com/stackql/any-sdk v0.1.5-beta06/go.mod h1:vZs4hVvzxQnfhzEtSzYliBAnKZEj9SYuHTRHrjOH8Zw=
464+
github.com/stackql/any-sdk v0.2.1-alpha05 h1:JIPeHd8vSiYbzYZvMkP8KPElEdu8ABr6uS/99jb5sXA=
465+
github.com/stackql/any-sdk v0.2.1-alpha05/go.mod h1:uHj7tELG5v6iMu9r+JgKHn0Mpm5twBFvdpcrck8/H30=
468466
github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
469467
github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
470468
github.com/stackql/psql-wire v0.1.1-beta23 h1:1ayYMjZArfDcIMyEOKnm+Bp1zRCISw8pguvTFuUhhVQ=

‎test/python/stackql_test_tooling/flask/aws/root_path_cfg.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"path": "/",
2929
"headers": {
3030
"Authorization": [
31-
"^.*ap-southeast-2.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
31+
"^.*ap-southeast-2.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
3232
],
3333
"X-Amz-Target": [
3434
"CloudApiService.ListResources"
@@ -256,7 +256,7 @@
256256
},
257257
"headers": {
258258
"Authorization": [
259-
"^.*ap-southeast-1.*SignedHeaders=.*host;x-amz-content-sha256;x-amz-date.*$"
259+
"^.*ap-southeast-1.*SignedHeaders=.*host;.*x-amz-date.*$"
260260
]
261261
},
262262
"body_conditions": {},
@@ -274,7 +274,7 @@
274274
},
275275
"headers": {
276276
"Authorization": [
277-
"^.*ap-southeast-2.*SignedHeaders=.*host;x-amz-content-sha256;x-amz-date.*$"
277+
"^.*ap-southeast-2.*SignedHeaders=.*host;.*x-amz-date.*$"
278278
]
279279
},
280280
"body_conditions": {},
@@ -503,7 +503,7 @@
503503
"path": "/",
504504
"headers": {
505505
"Authorization": [
506-
"^.*ap-southeast-1.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
506+
"^.*ap-southeast-1.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
507507
],
508508
"X-Amz-Target": [
509509
"CloudApiService.ListResources"
@@ -552,7 +552,7 @@
552552
"path": "/",
553553
"headers": {
554554
"Authorization": [
555-
"^.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
555+
"^.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
556556
],
557557
"X-Amz-Target": [
558558
"CloudApiService.ListResources"
@@ -625,7 +625,7 @@
625625
"path": "/",
626626
"headers": {
627627
"Authorization": [
628-
"^.*us-east-1.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
628+
"^.*us-east-1.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
629629
],
630630
"X-Amz-Target": [
631631
"CloudApiService.ListResources"
@@ -699,7 +699,7 @@
699699
"path": "/",
700700
"headers": {
701701
"Authorization": [
702-
"^.*us-west-1.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
702+
"^.*us-west-1.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
703703
],
704704
"X-Amz-Target": [
705705
"CloudApiService.ListResources"
@@ -773,7 +773,7 @@
773773
"path": "/",
774774
"headers": {
775775
"Authorization": [
776-
"^.*eu-west-1.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
776+
"^.*eu-west-1.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
777777
],
778778
"X-Amz-Target": [
779779
"CloudApiService.ListResources"
@@ -847,7 +847,7 @@
847847
"path": "/",
848848
"headers": {
849849
"Authorization": [
850-
"^.*us-west-2.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
850+
"^.*us-west-2.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
851851
],
852852
"X-Amz-Target": [
853853
"CloudApiService.ListResources"
@@ -921,7 +921,7 @@
921921
"path": "/",
922922
"headers": {
923923
"Authorization": [
924-
"^.*eu-west-2.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
924+
"^.*eu-west-2.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
925925
],
926926
"X-Amz-Target": [
927927
"CloudApiService.ListResources"
@@ -995,7 +995,7 @@
995995
"path": "/",
996996
"headers": {
997997
"Authorization": [
998-
"^.*ca-central-1.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
998+
"^.*ca-central-1.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
999999
],
10001000
"X-Amz-Target": [
10011001
"CloudApiService.ListResources"
@@ -1069,7 +1069,7 @@
10691069
"path": "/",
10701070
"headers": {
10711071
"Authorization": [
1072-
"^.*ap-southeast-1.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
1072+
"^.*ap-southeast-1.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
10731073
],
10741074
"X-Amz-Target": [
10751075
"CloudApiService.ListResources"
@@ -1093,7 +1093,7 @@
10931093
"path": "/",
10941094
"headers": {
10951095
"Authorization": [
1096-
"^.*ap-southeast-2.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
1096+
"^.*ap-southeast-2.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
10971097
],
10981098
"X-Amz-Target": [
10991099
"CloudApiService.ListResources"
@@ -1267,7 +1267,7 @@
12671267
"path": "/",
12681268
"headers": {
12691269
"Authorization": [
1270-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1270+
"^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
12711271
],
12721272
"X-Amz-Target": [
12731273
"TransferService.DeleteServer"
@@ -1291,7 +1291,7 @@
12911291
"path": "/",
12921292
"headers": {
12931293
"Authorization": [
1294-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1294+
"^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
12951295
],
12961296
"X-Amz-Target": [
12971297
"TransferService.DeleteUser"
@@ -1316,7 +1316,7 @@
13161316
"path": "/",
13171317
"headers": {
13181318
"Authorization": [
1319-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1319+
"^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
13201320
],
13211321
"X-Amz-Target": [
13221322
"TransferService.UpdateServer"
@@ -1343,7 +1343,7 @@
13431343
"path": "/",
13441344
"headers": {
13451345
"Authorization": [
1346-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1346+
"^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
13471347
],
13481348
"X-Amz-Target": [
13491349
"TransferService.UpdateUser"
@@ -1369,7 +1369,7 @@
13691369
"path": "/",
13701370
"headers": {
13711371
"Authorization": [
1372-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1372+
"^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
13731373
],
13741374
"X-Amz-Target": [
13751375
"TransferService.CreateServer"
@@ -1393,7 +1393,7 @@
13931393
"path": "/",
13941394
"headers": {
13951395
"Authorization": [
1396-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1396+
"^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
13971397
],
13981398
"X-Amz-Target": [
13991399
"TransferService.CreateServer"
@@ -1445,7 +1445,7 @@
14451445
"path": "/",
14461446
"headers": {
14471447
"Authorization": [
1448-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1448+
"^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
14491449
],
14501450
"X-Amz-Target": [
14511451
"TransferService.StopServer"
@@ -1466,7 +1466,7 @@
14661466
"path": "/",
14671467
"headers": {
14681468
"Authorization": [
1469-
"^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1469+
"^.*SignedHeaders=.*host;x-amz-date;x-amz-target.*$"
14701470
],
14711471
"X-Amz-Target": [
14721472
"BaldrApiService.DescribeClusters"
@@ -1490,7 +1490,7 @@
14901490
"path": "/",
14911491
"headers": {
14921492
"Authorization": [
1493-
"^.*/rubbish-region/.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1493+
"^.*/rubbish-region/.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
14941494
],
14951495
"X-Amz-Target": [
14961496
"BaldrApiService.DescribeBackups"
@@ -1514,7 +1514,7 @@
15141514
"path": "/",
15151515
"headers": {
15161516
"Authorization": [
1517-
"^.*/another-rubbish-region/.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$"
1517+
"^.*/another-rubbish-region/.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$"
15181518
],
15191519
"X-Amz-Target": [
15201520
"BaldrApiService.DescribeBackups"
@@ -1537,7 +1537,7 @@
15371537
"method": "POST",
15381538
"path": "/",
15391539
"headers": {
1540-
"Authorization": "^.*SignedHeaders=content-type;host;x-amz-date;x-amz-target.*$",
1540+
"Authorization": "^.*SignedHeaders=.*content-type;host;x-amz-date;x-amz-target.*$",
15411541
"X-Amz-Target": "BaldrApiService.DescribeBackups"
15421542
},
15431543
"body_conditions": {
@@ -1558,7 +1558,7 @@
15581558
"path": "/",
15591559
"headers": {
15601560
"Authorization": [
1561-
"^.*SignedHeaders=content-encoding;content-type;host;x-amz-date;x-amz-target.*$"
1561+
"^.*SignedHeaders=content-encoding;.*content-type;host;x-amz-date;x-amz-target.*$"
15621562
],
15631563
"X-Amz-Target": [
15641564
"Logs_20140328.GetLogEvents"
@@ -1832,7 +1832,7 @@
18321832
"path": "/",
18331833
"headers": {
18341834
"Authorization": [
1835-
"^.*SignedHeaders=accept;content-type;host;x-amz-date;x-amz-target.*$"
1835+
"^.*SignedHeaders=accept.*;content-type;host;x-amz-date;x-amz-target.*$"
18361836
],
18371837
"X-Amz-Target": [
18381838
"CloudApiService.ListResourceRequests"

‎test/robot/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ These may consume entire testing modules, or more nuanced [tag-based](https://ro
2727
From the repository root:
2828

2929
```sh
30-
env PYTHONPATH="$PYTHONPATH:$(pwd)/test/python" robot -d test/robot/functional test/robot/functional
30+
env PYTHONPATH="$PYTHONPATH:$(pwd)/test/python" robot -d test/robot/reports test/robot/functional
3131
```
3232

3333
### Running actual integration tests

0 commit comments

Comments
 (0)