Skip to content

Commit 1001728

Browse files
wk989898tenfyzhong
wk989898
authored and
tenfyzhong
committed
deps: upgrade aws-sdk-go-v2 dependency (#3368)
ref pingcap/tiflow#12424
1 parent 4db8813 commit 1001728

File tree

3 files changed

+70
-48
lines changed

3 files changed

+70
-48
lines changed

‎go.mod‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ require (
1414
github.com/agiledragon/gomonkey/v2 v2.11.0
1515
github.com/apache/pulsar-client-go v0.13.0
1616
github.com/aws/aws-sdk-go v1.55.5
17-
github.com/aws/aws-sdk-go-v2 v1.38.1
18-
github.com/aws/aws-sdk-go-v2/config v1.27.37
19-
github.com/aws/aws-sdk-go-v2/credentials v1.17.35
20-
github.com/aws/aws-sdk-go-v2/service/glue v1.58.1
17+
github.com/aws/aws-sdk-go-v2 v1.40.0
18+
github.com/aws/aws-sdk-go-v2/config v1.32.2
19+
github.com/aws/aws-sdk-go-v2/credentials v1.19.2
20+
github.com/aws/aws-sdk-go-v2/service/glue v1.134.1
2121
github.com/benbjohnson/clock v1.3.5
2222
github.com/bradleyjkemp/grpc-tools v0.2.5
2323
github.com/cenkalti/backoff/v4 v4.2.1
@@ -121,16 +121,17 @@ require (
121121
github.com/apache/thrift v0.16.0 // indirect
122122
github.com/ardielle/ardielle-go v1.5.2 // indirect
123123
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
124-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect
125-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 // indirect
126-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 // indirect
127-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
128-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
129-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 // indirect
130-
github.com/aws/aws-sdk-go-v2/service/sso v1.23.1 // indirect
131-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1 // indirect
132-
github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 // indirect
133-
github.com/aws/smithy-go v1.22.5 // indirect
124+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
125+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
126+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
127+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
128+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
129+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
130+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
131+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
132+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
133+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 // indirect
134+
github.com/aws/smithy-go v1.23.2 // indirect
134135
github.com/beorn7/perks v1.0.1 // indirect
135136
github.com/bits-and-blooms/bitset v1.14.3 // indirect
136137
github.com/blacktear23/go-proxyprotocol v1.0.6 // indirect

‎go.sum‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -912,38 +912,36 @@ github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU
912912
github.com/aws/aws-sdk-go v1.44.204/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
913913
github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
914914
github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
915-
github.com/aws/aws-sdk-go-v2 v1.19.1/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
916-
github.com/aws/aws-sdk-go-v2 v1.38.1 h1:j7sc33amE74Rz0M/PoCpsZQ6OunLqys/m5antM0J+Z8=
917-
github.com/aws/aws-sdk-go-v2 v1.38.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=
918-
github.com/aws/aws-sdk-go-v2/config v1.27.37 h1:xaoIwzHVuRWRHFI0jhgEdEGc8xE1l91KaeRDsWEIncU=
919-
github.com/aws/aws-sdk-go-v2/config v1.27.37/go.mod h1:S2e3ax9/8KnMSyRVNd3sWTKs+1clJ2f1U6nE0lpvQRg=
920-
github.com/aws/aws-sdk-go-v2/credentials v1.17.35 h1:7QknrZhYySEB1lEXJxGAmuD5sWwys5ZXNr4m5oEz0IE=
921-
github.com/aws/aws-sdk-go-v2/credentials v1.17.35/go.mod h1:8Vy4kk7at4aPSmibr7K+nLTzG6qUQAUO4tW49fzUV4E=
922-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 h1:C/d03NAmh8C4BZXhuRNboF/DqhBkBCeDiJDcaqIT5pA=
923-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14/go.mod h1:7I0Ju7p9mCIdlrfS+JCgqcYD0VXz/N4yozsox+0o078=
924-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.36/go.mod h1:T8Jsn/uNL/AFOXrVYQ1YQaN1r9gN34JU1855/Lyjv+o=
925-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4 h1:IdCLsiiIj5YJ3AFevsewURCPV+YWUlOW8JiPhoAy8vg=
926-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.4/go.mod h1:l4bdfCD7XyyZA9BolKBo1eLqgaJxl0/x91PL4Yqe0ao=
927-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.30/go.mod h1:v3GSCnFxbHzt9dlWBqvA1K1f9lmWuf4ztupZBCAIVs4=
928-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4 h1:j7vjtr1YIssWQOMeOWRbh3z8g2oY/xPjnZH2gLY4sGw=
929-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.4/go.mod h1:yDmJgqOiH4EA8Hndnv4KwAo8jCGTSnM5ASG1nBI+toA=
930-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
931-
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
932-
github.com/aws/aws-sdk-go-v2/service/glue v1.58.1 h1:t6DJrgkRqdIswt4qQIChy64uJpapSfATrsbgmbkaUJQ=
933-
github.com/aws/aws-sdk-go-v2/service/glue v1.58.1/go.mod h1:JSC1YtaNAuHer7etoeP65iB07no1nLDIq7If5kY/zRg=
934-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM=
935-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44=
936-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4 h1:ueB2Te0NacDMnaC+68za9jLwkjzxGWm0KB5HTUHjLTI=
937-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.4/go.mod h1:nLEfLnVMmLvyIG58/6gsSA03F1voKGaCfHV7+lR8S7s=
938-
github.com/aws/aws-sdk-go-v2/service/sso v1.23.1 h1:2jrVsMHqdLD1+PA4BA6Nh1eZp0Gsy3mFSB5MxDvcJtU=
939-
github.com/aws/aws-sdk-go-v2/service/sso v1.23.1/go.mod h1:XRlMvmad0ZNL+75C5FYdMvbbLkd6qiqz6foR1nA1PXY=
940-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1 h1:0L7yGCg3Hb3YQqnSgBTZM5wepougtL1aEccdcdYhHME=
941-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.1/go.mod h1:FnvDM4sfa+isJ3kDXIzAB9GAwVSzFzSy97uZ3IsHo4E=
942-
github.com/aws/aws-sdk-go-v2/service/sts v1.31.1 h1:8K0UNOkZiK9Uh3HIF6Bx0rcNCftqGCeKmOaR7Gp5BSo=
943-
github.com/aws/aws-sdk-go-v2/service/sts v1.31.1/go.mod h1:yMWe0F+XG0DkRZK5ODZhG7BEFYhLXi2dqGsv6tX0cgI=
944-
github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
945-
github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=
946-
github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
915+
github.com/aws/aws-sdk-go-v2 v1.40.0 h1:/WMUA0kjhZExjOQN2z3oLALDREea1A7TobfuiBrKlwc=
916+
github.com/aws/aws-sdk-go-v2 v1.40.0/go.mod h1:c9pm7VwuW0UPxAEYGyTmyurVcNrbF6Rt/wixFqDhcjE=
917+
github.com/aws/aws-sdk-go-v2/config v1.32.2 h1:4liUsdEpUUPZs5WVapsJLx5NPmQhQdez7nYFcovrytk=
918+
github.com/aws/aws-sdk-go-v2/config v1.32.2/go.mod h1:l0hs06IFz1eCT+jTacU/qZtC33nvcnLADAPL/XyrkZI=
919+
github.com/aws/aws-sdk-go-v2/credentials v1.19.2 h1:qZry8VUyTK4VIo5aEdUcBjPZHL2v4FyQ3QEOaWcFLu4=
920+
github.com/aws/aws-sdk-go-v2/credentials v1.19.2/go.mod h1:YUqm5a1/kBnoK+/NY5WEiMocZihKSo15/tJdmdXnM5g=
921+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 h1:WZVR5DbDgxzA0BJeudId89Kmgy6DIU4ORpxwsVHz0qA=
922+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14/go.mod h1:Dadl9QO0kHgbrH1GRqGiZdYtW5w+IXXaBNCHTIaheM4=
923+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 h1:PZHqQACxYb8mYgms4RZbhZG0a7dPW06xOjmaH0EJC/I=
924+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14/go.mod h1:VymhrMJUWs69D8u0/lZ7jSB6WgaG/NqHi3gX0aYf6U0=
925+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 h1:bOS19y6zlJwagBfHxs0ESzr1XCOU2KXJCWcq3E2vfjY=
926+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14/go.mod h1:1ipeGBMAxZ0xcTm6y6paC2C/J6f6OO7LBODV9afuAyM=
927+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
928+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
929+
github.com/aws/aws-sdk-go-v2/service/glue v1.134.1 h1:tmPNUUD0614ee3Hfn/5N2p0UElJuzYo6qr9H8LYDwp4=
930+
github.com/aws/aws-sdk-go-v2/service/glue v1.134.1/go.mod h1:2yxIwUNUUoAcN7xlsrkAH4zcT79XFY6lcjc1V8i1ATg=
931+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 h1:x2Ibm/Af8Fi+BH+Hsn9TXGdT+hKbDd5XOTZxTMxDk7o=
932+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3/go.mod h1:IW1jwyrQgMdhisceG8fQLmQIydcT/jWY21rFhzgaKwo=
933+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 h1:FIouAnCE46kyYqyhs0XEBDFFSREtdnr8HQuLPQPLCrY=
934+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14/go.mod h1:UTwDc5COa5+guonQU8qBikJo1ZJ4ln2r1MkF7Dqag1E=
935+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 h1:MxMBdKTYBjPQChlJhi4qlEueqB1p1KcbTEa7tD5aqPs=
936+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2/go.mod h1:iS6EPmNeqCsGo+xQmXv0jIMjyYtQfnwg36zl2FwEouk=
937+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 h1:ksUT5KtgpZd3SAiFJNJ0AFEJVva3gjBmN7eXUZjzUwQ=
938+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5/go.mod h1:av+ArJpoYf3pgyrj6tcehSFW+y9/QvAY8kMooR9bZCw=
939+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 h1:GtsxyiF3Nd3JahRBJbxLCCdYW9ltGQYrFWg8XdkGDd8=
940+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10/go.mod h1:/j67Z5XBVDx8nZVp9EuFM9/BS5dvBznbqILGuu73hug=
941+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2 h1:a5UTtD4mHBU3t0o6aHQZFJTNKVfxFWfPX7J0Lr7G+uY=
942+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2/go.mod h1:6TxbXoDSgBQ225Qd8Q+MbxUxUh6TtNKwbRt/EPS9xso=
943+
github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
944+
github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
947945
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
948946
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
949947
github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=

‎tests/integration_tests/http_api/util/test_case.py‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,27 @@ def create_changefeed(sink_uri):
136136
resp = rq.post(url, data=data, headers=headers)
137137
assert "ErrDispatcherFailed" in resp.text, f"{resp.text}"
138138

139+
# create changefeed fail because glue schema config is invalid
140+
url = BASE_URL1_V2+"/changefeeds?keyspace=keyspace1"
141+
data = json.dumps({
142+
"changefeed_id": "changefeed-test-v2",
143+
"sink_uri": "kafka://127.0.0.1:9092/http_api?protocol=avro",
144+
"replica_config": {
145+
"sink": {
146+
"kafka_config": {
147+
"glue_schema_registry_config": {
148+
"region": "us-west-1",
149+
"registry_name": "ticdc-test"
150+
}
151+
}
152+
}
153+
}
154+
})
155+
headers = {"Content-Type": "application/json"}
156+
resp = rq.post(url, data=data, headers=headers)
157+
assert "CDC:ErrKafkaNewProducer" in resp.text, f"{resp.text}"
158+
assert "not found, ResolveEndpointV2" not in resp.text, f"{resp.text}"
159+
139160
print("pass test: create changefeed")
140161

141162

@@ -332,14 +353,16 @@ def move_table(cfID="changefeed-test1"):
332353

333354
# move table
334355
url = BASE_URL0_V2 + "/changefeeds/" + cfID + \
335-
"/move_table?targetNodeID=" + capture_id + "&tableID=" + str(table_id) + "&keyspace=keyspace1"
356+
"/move_table?targetNodeID=" + capture_id + \
357+
"&tableID=" + str(table_id) + "&keyspace=keyspace1"
336358
resp = rq.post(url)
337359
assert_status_code(resp, rq.codes.ok, url)
338360
logging.info(f"Move table success")
339361
# move table fail
340362
# The target node is not found
341363
url = BASE_URL0_V2 + "/changefeeds/" + cfID + \
342-
"/move_table?targetNodeID=&tableID=" + str(table_id) + "&keyspace=keyspace1"
364+
"/move_table?targetNodeID=&tableID=" + \
365+
str(table_id) + "&keyspace=keyspace1"
343366
resp = rq.post(url)
344367
assert_status_code(resp, rq.codes.internal_server_error, url)
345368

0 commit comments

Comments
 (0)