Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-fc</artifactId>
<packaging>jar</packaging>
<version>1.8.15</version>
<version>1.8.13.15</version>
<name>aliyun-java-sdk-fc</name>
<url>https://www.aliyun.com/product/fc</url>
<description>Aliyun Java SDK for FunctionCompute</description>
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/aliyuncs/fc/client/FunctionComputeClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,17 @@ public GetAccountSettingsResponse getAccountSettings(GetAccountSettingsRequest r
return getAccountSettingsOutput;
}

public GetALBSettingsResponse getALBSettings(GetALBSettingsRequest request) throws ClientException, ServerException {

HttpResponse response = client.doAction(request, CONTENT_TYPE_APPLICATION_JSON, GET);
GetALBSettingsResponse getALBSettingsResponse = new GetALBSettingsResponse();
ALBSettings albSettings = GSON.fromJson(FcUtil.toDefaultCharset(response.getContent()), ALBSettings.class);
getALBSettingsResponse.setHeaders(response.getHeaders());
getALBSettingsResponse.setStatus(response.getStatus());
getALBSettingsResponse.setAlbSettings(albSettings);
return getALBSettingsResponse;
}

public DeleteServiceResponse deleteService(DeleteServiceRequest request)
throws ClientException, ServerException {
HttpResponse response = client.doAction(request, CONTENT_TYPE_APPLICATION_JSON, DELETE);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/aliyuncs/fc/constants/Const.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
public class Const {

public final static String ACCOUNT_SETTING_PATH = "/%s/account-settings";
public final static String ALB_SETTING_PATH = "/%s/alb-settings";
public final static String SERVICE_PATH = "/%s/services";
public final static String ON_DEMAND_CONFIGS = "/%s/on-demand-configs";
public final static String PROVISION_CONFIG_PATH = "/%s/provision-configs";
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/com/aliyuncs/fc/model/ALBSettings.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.aliyuncs.fc.model;

public class ALBSettings {

private String accountId;

private String[] endpoints;

public String getAccountId() {
return accountId;
}

public void setAccountId(String accountId) {
this.accountId = accountId;
}

public String[] getEndpoints() {
return endpoints;
}

public void setEndpoints(String[] endpoints) {
this.endpoints = endpoints;
}
}
6 changes: 6 additions & 0 deletions src/main/java/com/aliyuncs/fc/model/AccountSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ public class AccountSettings {

private String[] availableAZs;

private String[] albEndpoints;

public String[] getAvailableAZs() {
return availableAZs;
}

public String[] getAlbEndpoints() {
return albEndpoints;
}
}
47 changes: 47 additions & 0 deletions src/main/java/com/aliyuncs/fc/request/GetALBSettingsRequest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.aliyuncs.fc.request;

import com.aliyuncs.fc.constants.Const;
import com.aliyuncs.fc.exceptions.ClientException;
import com.aliyuncs.fc.http.HttpRequest;
import com.aliyuncs.fc.response.GetAccountSettingsResponse;
import com.google.gson.annotations.SerializedName;
import org.apache.commons.lang.StringUtils;

import java.util.HashMap;
import java.util.Map;

public class GetALBSettingsRequest extends HttpRequest {

@SerializedName("accountId")
private String accountId;

public GetALBSettingsRequest() {}

public String getPath() {
return String.format(Const.ALB_SETTING_PATH, Const.API_VERSION, accountId);
}

public void validate() throws ClientException {
}

@Override
public Map<String, String> getQueryParams() {
Map<String, String> queryParams = new HashMap<String, String>();
if (StringUtils.isNotBlank(accountId)) {
queryParams.put("accountId", accountId);
}
return queryParams;
}

public Class<GetAccountSettingsResponse> getResponseClass() {
return GetAccountSettingsResponse.class;
}

public String getAccountId() {
return accountId;
}

public void setAccountId(String accountId) {
this.accountId = accountId;
}
}
17 changes: 17 additions & 0 deletions src/main/java/com/aliyuncs/fc/response/GetALBSettingsResponse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.aliyuncs.fc.response;

import com.aliyuncs.fc.http.HttpResponse;
import com.aliyuncs.fc.model.ALBSettings;

public class GetALBSettingsResponse extends HttpResponse {

private ALBSettings albSettings;

public ALBSettings getAlbSettings() {
return albSettings;
}

public void setAlbSettings(ALBSettings albSettings) {
this.albSettings = albSettings;
}
}
6 changes: 6 additions & 0 deletions src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,12 @@ public void testCreateNASService() throws IOException {
client.deleteService(new DeleteServiceRequest(service_name));
}

@Test
public void testGetAccountSettings() {
GetAccountSettingsResponse response = client.getAccountSettings(new GetAccountSettingsRequest());
assertTrue(response.getAccountSettings().getAvailableAZs().length > 0);
}

private void preTestProvisionConfig(String serviceName, String functionName, String aliasName) throws Exception {
// create service
createService(serviceName, false);
Expand Down