From a1f4c6ae40d83192f1a358bf9bd9922cc75a4d33 Mon Sep 17 00:00:00 2001
From: tx-cslearn <1092145181@qq.com>
Date: Sat, 25 May 2024 23:46:51 +0800
Subject: [PATCH 1/2] Delete aliyun-java-sdk-sts-internal & Replace
AssumeRoleWithServiceIdentityRequest with AssumeRoleRequest
---
connectors/aliyun/rocketmq-connect-eventbridge/pom.xml | 5 -----
.../connect/eventbridge/sink/EventBridgeSinkTask.java | 9 ++++-----
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml b/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml
index 57084ce66..6abc09925 100644
--- a/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml
+++ b/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml
@@ -208,11 +208,6 @@
aliyun-java-sdk-sts
${aliyun-java-sdk-sts.version}
-
- com.aliyun
- aliyun-java-sdk-sts-internal
- ${aliyun-java-sdk-sts-internal.version}
-
\ No newline at end of file
diff --git a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java
index 5c5847352..2ace6e4f6 100644
--- a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java
+++ b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java
@@ -9,8 +9,8 @@
import com.aliyuncs.IAcsClient;
import com.aliyuncs.http.FormatType;
import com.aliyuncs.profile.DefaultProfile;
-import com.aliyuncs.sts.model.v20150401.AssumeRoleWithServiceIdentityRequest;
-import com.aliyuncs.sts.model.v20150401.AssumeRoleWithServiceIdentityResponse;
+import com.aliyuncs.sts.model.v20150401.AssumeRoleRequest;
+import com.aliyuncs.sts.model.v20150401.AssumeRoleResponse;
import io.openmessaging.KeyValue;
import io.openmessaging.connector.api.component.task.sink.SinkTask;
import io.openmessaging.connector.api.component.task.sink.SinkTaskContext;
@@ -105,13 +105,12 @@ public void start(SinkTaskContext sinkTaskContext) {
DefaultProfile.addEndpoint("", "", "Sts", stsEndpoint);
DefaultProfile profile = DefaultProfile.getProfile("", accessKeyId, accessKeySecret);
IAcsClient client = new DefaultAcsClient(profile);
- AssumeRoleWithServiceIdentityRequest request = new AssumeRoleWithServiceIdentityRequest();
+ AssumeRoleRequest request = new AssumeRoleRequest();
request.setRoleArn(roleArn);
request.setRoleSessionName(roleSessionName);
- request.setAssumeRoleFor(roleSessionName);
request.setAcceptFormat(FormatType.JSON);
request.setDurationSeconds(3600L);
- final AssumeRoleWithServiceIdentityResponse response = client.getAcsResponse(request);
+ final AssumeRoleResponse response = client.getAcsResponse(request);
authConfig.accessKeyId = response.getCredentials().getAccessKeyId();
authConfig.accessKeySecret = response.getCredentials().getAccessKeySecret();
authConfig.securityToken = response.getCredentials().getSecurityToken();
From 61334349761d58a29c2da41b93a4e541397cfcea Mon Sep 17 00:00:00 2001
From: tx-cslearn <1092145181@qq.com>
Date: Sat, 25 May 2024 23:56:18 +0800
Subject: [PATCH 2/2] repair version
---
connectors/aliyun/rocketmq-connect-eventbridge/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml b/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml
index 6abc09925..508f117f8 100644
--- a/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml
+++ b/connectors/aliyun/rocketmq-connect-eventbridge/pom.xml
@@ -23,7 +23,6 @@
1.3.6
3.1.0
4.6.0
- 3.0.0
2.9.0