Skip to content

Fix/delete sink shipper hcl #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hcl00521 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/delete sink shipper hcl #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a53d453
fix
Jul 17, 2025
acef303
delete shipper
hcl00521 Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@
<exclude>com.aliyun.openservices.log.functiontest.logstore.LogstoreReplicationTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.audit.AuditJobFunctionTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.project.ResourceGroupFunctionTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.shipper.ExportOdpsTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.shipper.ExportOSSTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.export.ExportOdpsTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.export.ExportOSSTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.logstore.LogstoreTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.etl.RebuildIndexFunctionTest.java</exclude>
<exclude>com.aliyun.openservices.log.functiontest.logstore.RandomDataTest.java</exclude>
Expand Down
229 changes: 0 additions & 229 deletions src/main/java/com/aliyun/openservices/log/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3209,193 +3209,6 @@ public GetIndexStringResponse GetIndexString(GetIndexRequest request)
Map<String, String> resHeaders = response.getHeaders();
return new GetIndexStringResponse(resHeaders, response.GetStringBody());
}

@Override
public CreateShipperResponse CreateShipper(String project, String logStore,
String shipperName, ShipperConfig shipConfig) throws LogException {
CodingUtils.assertParameterNotNull(project, "project");
CodingUtils.validateLogstore(logStore);
CodingUtils.assertParameterNotNull(shipperName, "shipperName");
CodingUtils.assertParameterNotNull(shipConfig, "shipConfig");

Map<String, String> headParameter = GetCommonHeadPara(project);
headParameter.put(Consts.CONST_CONTENT_TYPE, Consts.CONST_SLS_JSON);
String resourceUri = "/logstores/" + logStore + "/shipper";
JSONObject jsonBody = new JSONObject();
jsonBody.put("shipperName", shipperName);
jsonBody.put("targetType", shipConfig.GetShipperType());
jsonBody.put("targetConfiguration", shipConfig.GetJsonObj());
byte[] body = encodeToUtf8(jsonBody.toString());
Map<String, String> urlParameter = new HashMap<String, String>();
ResponseMessage response = SendData(project, HttpMethod.POST,
resourceUri, urlParameter, headParameter, body);
Map<String, String> resHeaders = response.getHeaders();
return new CreateShipperResponse(resHeaders);
}

@Override
public UpdateShipperResponse UpdateShipper(String project, String logStore,
String shipperName, ShipperConfig shipConfig) throws LogException {
CodingUtils.assertParameterNotNull(project, "project");
CodingUtils.validateLogstore(logStore);
CodingUtils.validateShipper(shipperName);
CodingUtils.assertParameterNotNull(shipConfig, "shipConfig");

Map<String, String> headParameter = GetCommonHeadPara(project);
String resourceUri = "/logstores/" + logStore + "/shipper/" + shipperName;
JSONObject jsonBody = new JSONObject();
jsonBody.put("shipperName", shipperName);
jsonBody.put("targetType", shipConfig.GetShipperType());
jsonBody.put("targetConfiguration", shipConfig.GetJsonObj());
byte[] body = encodeToUtf8(jsonBody.toString());
headParameter.put(Consts.CONST_CONTENT_TYPE, Consts.CONST_SLS_JSON);
Map<String, String> urlParameter = new HashMap<String, String>();
ResponseMessage response = SendData(project, HttpMethod.PUT,
resourceUri, urlParameter, headParameter, body);
Map<String, String> resHeaders = response.getHeaders();
return new UpdateShipperResponse(resHeaders);
}

@Override
public DeleteShipperResponse DeleteShipper(String project, String logStore,
String shipperName) throws LogException {
CodingUtils.assertParameterNotNull(project, "project");
CodingUtils.validateLogstore(logStore);
CodingUtils.validateShipper(shipperName);

Map<String, String> headParameter = GetCommonHeadPara(project);
String resourceUri = "/logstores/" + logStore + "/shipper/" + shipperName;
Map<String, String> urlParameter = new HashMap<String, String>();
ResponseMessage response = SendData(project, HttpMethod.DELETE,
resourceUri, urlParameter, headParameter);
Map<String, String> resHeaders = response.getHeaders();
return new DeleteShipperResponse(resHeaders);
}

@Override
public GetShipperResponse GetShipperConfig(String project, String logStore,
String shipperName) throws LogException {
CodingUtils.assertParameterNotNull(project, "project");
CodingUtils.validateLogstore(logStore);
CodingUtils.validateShipper(shipperName);

Map<String, String> headParameter = GetCommonHeadPara(project);
String resourceUri = "/logstores/" + logStore + "/shipper/" + shipperName;
Map<String, String> urlParameter = new HashMap<String, String>();
ResponseMessage response = SendData(project, HttpMethod.GET,
resourceUri, urlParameter, headParameter);
Map<String, String> resHeaders = response.getHeaders();
String requestId = GetRequestId(resHeaders);
JSONObject object = parseResponseBody(response, requestId);

ShipperConfig config;
if (object.containsKey("targetType")
&& object.getString("targetType").equals("odps")) {
config = new OdpsShipperConfig();
config.FromJsonObj(object.getJSONObject("targetConfiguration"));
} else if (object.containsKey("targetType")
&& object.getString("targetType").equals("oss")) {
config = new OssShipperConfig();
config.FromJsonObj(object.getJSONObject("targetConfiguration"));
} else {
throw new LogException("InvalidShipperType",
"The return shipper config is:" + object.toString(), null,
requestId);
}
return new GetShipperResponse(resHeaders, config);
}

@Override
public ListShipperResponse ListShipper(String project, String logStore)
throws LogException {
CodingUtils.assertParameterNotNull(project, "project");
CodingUtils.validateLogstore(logStore);
Map<String, String> headParameter = GetCommonHeadPara(project);
String resourceUri = "/logstores/" + logStore + "/shipper";
Map<String, String> urlParameter = new HashMap<String, String>();
ResponseMessage response = SendData(project, HttpMethod.GET,
resourceUri, urlParameter, headParameter);
Map<String, String> resHeaders = response.getHeaders();
String requestId = GetRequestId(resHeaders);
JSONObject object = parseResponseBody(response, requestId);
return new ListShipperResponse(resHeaders, object.getIntValue("count"),
object.getIntValue("total"), ExtractJsonArray("shipper", object));
}

@Override
public GetShipperTasksResponse GetShipperTasks(String project,
String logStore, String shipperName, int startTime, int endTime,
String statusType, int offset, int size) throws LogException {
CodingUtils.assertParameterNotNull(project, "project");
CodingUtils.validateLogstore(logStore);
CodingUtils.validateShipper(shipperName);
CodingUtils.assertParameterNotNull(statusType, "statusType");
Map<String, String> headParameter = GetCommonHeadPara(project);

String resourceUri = "/logstores/" + logStore + "/shipper/" + shipperName + "/tasks";
Map<String, String> urlParameter = new HashMap<String, String>();
urlParameter.put("from", String.valueOf(startTime));
urlParameter.put("to", String.valueOf(endTime));
urlParameter.put("status", statusType);
urlParameter.put("offset", String.valueOf(offset));
urlParameter.put("size", String.valueOf(size));
ResponseMessage response = SendData(project, HttpMethod.GET,
resourceUri, urlParameter, headParameter);
Map<String, String> resHeaders = response.getHeaders();
String requestId = GetRequestId(resHeaders);
JSONObject object = parseResponseBody(response, requestId);
return new GetShipperTasksResponse(resHeaders,
object.getIntValue("count"),
object.getIntValue("total"),
ExtractTasksStatisTic(object), ExtractShipperTask(object));
}

@Override
public RetryShipperTasksResponse RetryShipperTasks(String project,
String logStore, String shipperName, List<String> taskList)
throws LogException {
CodingUtils.assertParameterNotNull(project, "project");
CodingUtils.validateLogstore(logStore);
CodingUtils.validateShipper(shipperName);
CodingUtils.assertParameterNotNull(taskList, "taskList");

Map<String, String> headParameter = GetCommonHeadPara(project);
String resourceUri = "/logstores/" + logStore + "/shipper/" + shipperName + "/tasks";
JSONArray array = new JSONArray();
array.addAll(taskList);
byte[] body = encodeToUtf8(array.toString());
headParameter.put(Consts.CONST_CONTENT_TYPE, Consts.CONST_SLS_JSON);
Map<String, String> urlParameter = new HashMap<String, String>();
ResponseMessage response = SendData(project, HttpMethod.PUT,
resourceUri, urlParameter, headParameter, body);
Map<String, String> resHeaders = response.getHeaders();
return new RetryShipperTasksResponse(resHeaders);
}

private ShipperTasksStatistic ExtractTasksStatisTic(JSONObject obj) {
JSONObject statistic_obj = obj.getJSONObject("statistics");
return new ShipperTasksStatistic(statistic_obj.getIntValue("running"),
statistic_obj.getIntValue("success"), statistic_obj.getIntValue("fail"));
}

private List<ShipperTask> ExtractShipperTask(JSONObject object) {
List<ShipperTask> res = new ArrayList<ShipperTask>();
JSONArray array = object.getJSONArray("tasks");
if (array == null) {
return res;
}
for (int i = 0; i < array.size(); i++) {
JSONObject item = array.getJSONObject(i);
if (item == null) {
continue;
}
ShipperTask task = new ShipperTask();
task.FromJsonObject(item);
res.add(task);
}
return res;
}

@Override
public CreateConsumerGroupResponse CreateConsumerGroup(String project,
String logStore, ConsumerGroup consumerGroup) throws LogException {
Expand Down Expand Up @@ -6338,48 +6151,6 @@ public ListMetricsConfigResponse listMetricsConfig(ListMetricsConfigRequest requ
listMetricsConfigResponse.fromJSON(object);
return listMetricsConfigResponse;
}
@Override
public CreateShipperMigrationResponse createShipperMigration(CreateShipperMigrationRequest request) throws LogException {
CodingUtils.assertParameterNotNull(request, "request");
CodingUtils.assertParameterNotNull(request.getMigration(), "migration");
request.getMigration().checkForCreate();
Map<String, String> headParameter = GetCommonHeadPara(request.GetProject());
byte[] body = encodeToUtf8(request.getMigration().ToCreateJsonString());
headParameter.put(Consts.CONST_CONTENT_TYPE, Consts.CONST_SLS_JSON);
String migrationUri = Consts.CONST_MIGRATION_URI;
ResponseMessage response = SendData(request.GetProject(), HttpMethod.POST,
migrationUri, request.GetAllParams(), headParameter, body);
return new CreateShipperMigrationResponse(response.getHeaders());
}
@Override
public GetShipperMigrationResponse getShipperMigration(GetShipperMigrationRequest request) throws LogException {
CodingUtils.assertParameterNotNull(request, "request");
CodingUtils.assertStringNotNullOrEmpty(request.getName(), "name");
Map<String, String> headParameter = GetCommonHeadPara(request.GetProject());
String resourceUri = String.format(Consts.CONST_MIGRATION_NAME_URI, request.getName());
headParameter.put(Consts.CONST_CONTENT_TYPE, Consts.CONST_SLS_JSON);
ResponseMessage response = SendData(request.GetProject(), HttpMethod.GET, resourceUri, request.GetAllParams(), headParameter);
String requestId = GetRequestId(response.getHeaders());
JSONObject object = parseResponseBody(response, requestId);
ShipperMigration migration = ShipperMigration.extractGetMigration(object, requestId);
return new GetShipperMigrationResponse(response.getHeaders(), migration);
}
@Override
public ListShipperMigrationResponse listShipperMigration(ListShipperMigrationRequest request) throws LogException {
CodingUtils.assertParameterNotNull(request, "request");
Map<String, String> headParameter = GetCommonHeadPara(request.GetProject());
String resourceUri = Consts.CONST_MIGRATION_URI;
headParameter.put(Consts.CONST_CONTENT_TYPE, Consts.CONST_SLS_JSON);
Map<String, String> urlParameter = request.GetAllParams();
ResponseMessage response = SendData(request.GetProject(), HttpMethod.GET, resourceUri, urlParameter, headParameter);
String requestId = GetRequestId(response.getHeaders());
JSONObject object = parseResponseBody(response, requestId);
int total = object.getIntValue(Consts.CONST_TOTAL);
int count = object.getIntValue(Consts.CONST_COUNT);
List<ShipperMigration> migrations = ShipperMigration.extractMigrations(object, requestId);
return new ListShipperMigrationResponse(response.getHeaders(), count, total, migrations);
}

private void setSignV4IfInAcdr(String endpoint) {
String region = Utils.parseRegion(endpoint);
if (region != null && region.contains("-acdr-ut-")) {
Expand Down
Loading