From d03c93b68948b06b771395762a60bd73071acd80 Mon Sep 17 00:00:00 2001 From: tw108174 Date: Mon, 18 Mar 2019 20:42:28 +0800 Subject: [PATCH 1/2] add field description to all trigger --- .../aliyuncs/fc/model/TriggerMetadata.java | 10 ++- .../fc/request/CreateTriggerRequest.java | 11 ++++ .../fc/request/UpdateTriggerRequest.java | 12 ++++ .../fc/response/CreateTriggerResponse.java | 5 ++ .../fc/response/GetTriggerResponse.java | 5 ++ .../fc/response/UpdateTriggerResponse.java | 5 ++ .../fc/FunctionComputeClientTest.java | 65 +++++++++++++++---- 7 files changed, 99 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/aliyuncs/fc/model/TriggerMetadata.java b/src/main/java/com/aliyuncs/fc/model/TriggerMetadata.java index 2798608..369e1f9 100644 --- a/src/main/java/com/aliyuncs/fc/model/TriggerMetadata.java +++ b/src/main/java/com/aliyuncs/fc/model/TriggerMetadata.java @@ -10,6 +10,9 @@ public class TriggerMetadata { @SerializedName("triggerName") private String triggerName; + @SerializedName("description") + private String description; + @SerializedName("sourceArn") private String sourceArn; @@ -31,10 +34,11 @@ public class TriggerMetadata { @SerializedName("triggerConfig") private Object triggerConfig; - public TriggerMetadata(String triggerName, String sourceArn, String triggerType, + public TriggerMetadata(String triggerName, String description, String sourceArn, String triggerType, String invocationRole, String createdTime, String lastModifiedTime, String qualifier, Object triggerConfig) { this.triggerName = triggerName; + this.description = description; this.sourceArn = sourceArn; this.triggerType = triggerType; this.invocationRole = invocationRole; @@ -48,6 +52,10 @@ public String getTriggerName() { return triggerName; } + public String getDescription() { + return description; + } + public String getSourceArn() { return sourceArn; } diff --git a/src/main/java/com/aliyuncs/fc/request/CreateTriggerRequest.java b/src/main/java/com/aliyuncs/fc/request/CreateTriggerRequest.java index a640216..5f46894 100755 --- a/src/main/java/com/aliyuncs/fc/request/CreateTriggerRequest.java +++ b/src/main/java/com/aliyuncs/fc/request/CreateTriggerRequest.java @@ -39,6 +39,9 @@ public class CreateTriggerRequest extends HttpRequest { @SerializedName("triggerName") private String triggerName; + @SerializedName("description") + private String description; + @SerializedName("sourceArn") private String sourceArn; @@ -76,6 +79,14 @@ public String getTriggerName() { return triggerName; } + public CreateTriggerRequest setDescription(String description) { + this.description = description; + return this; + } + + public String getDescription() { + return description; + } public CreateTriggerRequest setSourceArn(String sourceArn) { this.sourceArn = sourceArn; return this; diff --git a/src/main/java/com/aliyuncs/fc/request/UpdateTriggerRequest.java b/src/main/java/com/aliyuncs/fc/request/UpdateTriggerRequest.java index 80e3eae..90c59a2 100755 --- a/src/main/java/com/aliyuncs/fc/request/UpdateTriggerRequest.java +++ b/src/main/java/com/aliyuncs/fc/request/UpdateTriggerRequest.java @@ -39,6 +39,9 @@ public class UpdateTriggerRequest extends HttpRequest { private transient final String functionName; private transient final String triggerName; + @SerializedName("description") + private String description; + @SerializedName("invocationRole") private String invocationRole; @@ -77,6 +80,15 @@ public String getTriggerName() { return triggerName; } + public String getDescription() { + return description; + } + + public UpdateTriggerRequest setDescription(String description) { + this.description = description; + return this; + } + public Object getTriggerConfig() { return triggerConfig; } diff --git a/src/main/java/com/aliyuncs/fc/response/CreateTriggerResponse.java b/src/main/java/com/aliyuncs/fc/response/CreateTriggerResponse.java index 3c56f37..fdb29f0 100755 --- a/src/main/java/com/aliyuncs/fc/response/CreateTriggerResponse.java +++ b/src/main/java/com/aliyuncs/fc/response/CreateTriggerResponse.java @@ -39,6 +39,11 @@ public String getTriggerName() { return triggerMetadata.getTriggerName(); } + public String getDescription() { + Preconditions.checkArgument(triggerMetadata != null); + return triggerMetadata.getDescription(); + } + public String getSourceARN() { Preconditions.checkArgument(triggerMetadata != null); return triggerMetadata.getSourceArn(); diff --git a/src/main/java/com/aliyuncs/fc/response/GetTriggerResponse.java b/src/main/java/com/aliyuncs/fc/response/GetTriggerResponse.java index d6476a7..0d2392d 100755 --- a/src/main/java/com/aliyuncs/fc/response/GetTriggerResponse.java +++ b/src/main/java/com/aliyuncs/fc/response/GetTriggerResponse.java @@ -39,6 +39,11 @@ public String getTriggerName() { return triggerMetadata.getTriggerName(); } + public String getDescription() { + Preconditions.checkArgument(triggerMetadata != null); + return triggerMetadata.getDescription(); + } + public String getSourceARN() { Preconditions.checkArgument(triggerMetadata != null); return triggerMetadata.getSourceArn(); diff --git a/src/main/java/com/aliyuncs/fc/response/UpdateTriggerResponse.java b/src/main/java/com/aliyuncs/fc/response/UpdateTriggerResponse.java index 1c34372..4cfa208 100755 --- a/src/main/java/com/aliyuncs/fc/response/UpdateTriggerResponse.java +++ b/src/main/java/com/aliyuncs/fc/response/UpdateTriggerResponse.java @@ -41,6 +41,11 @@ public String getTriggerName() { return triggerMetadata.getTriggerName(); } + public String getDescription() { + Preconditions.checkArgument( triggerMetadata != null); + return triggerMetadata.getDescription(); + } + public String getSourceArn() { Preconditions.checkArgument(triggerMetadata != null); return triggerMetadata.getSourceArn(); diff --git a/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java b/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java index 5e27ad2..811f0f1 100644 --- a/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java +++ b/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java @@ -401,16 +401,18 @@ private CreateServiceResponse createVPCService(String serviceName) { return response; } - private CreateTriggerResponse createHttpTrigger(String triggerName, HttpAuthType authType, + private CreateTriggerResponse createHttpTrigger(String triggerName, String description, HttpAuthType authType, HttpMethod[] methods) { - return createHttpTriggerWithQualifier(triggerName, "", authType, methods); + return createHttpTriggerWithQualifier(triggerName, description, "", authType, methods); } private CreateTriggerResponse createHttpTriggerWithQualifier(String triggerName, + String description, String qualifier, HttpAuthType authType, HttpMethod[] methods) { CreateTriggerRequest createReq = new CreateTriggerRequest(SERVICE_NAME, FUNCTION_NAME); createReq.setTriggerName(triggerName); + createReq.setDescription(description); createReq.setTriggerType(TRIGGER_TYPE_HTTP); createReq.setTriggerConfig(new HttpTriggerConfig(authType, methods)); if (!qualifier.isEmpty()) { @@ -419,10 +421,11 @@ private CreateTriggerResponse createHttpTriggerWithQualifier(String triggerName, return client.createTrigger(createReq); } - private CreateTriggerResponse createOssTrigger(String triggerName, String prefix, + private CreateTriggerResponse createOssTrigger(String triggerName, String desc, String prefix, String suffix) { CreateTriggerRequest createTReq = new CreateTriggerRequest(SERVICE_NAME, FUNCTION_NAME); createTReq.setTriggerName(triggerName); + createTReq.setDescription(desc); createTReq.setTriggerType(TRIGGER_TYPE_OSS); createTReq.setInvocationRole(INVOCATION_ROLE); createTReq.setSourceArn(OSS_SOURCE_ARN); @@ -614,8 +617,9 @@ public void testCRUDHttpTrigger() throws ParseException, InterruptedException, I // Create Function createFunction(FUNCTION_NAME); + String desc = "create http trigger"; // create http trigger - createHttpTrigger(TRIGGER_NAME, ANONYMOUS, new HttpMethod[]{GET, POST}); + createHttpTrigger(TRIGGER_NAME, desc, ANONYMOUS, new HttpMethod[]{GET, POST}); // List Triggers TriggerMetadata[] triggers = listTriggers(SERVICE_NAME, FUNCTION_NAME); @@ -625,6 +629,7 @@ public void testCRUDHttpTrigger() throws ParseException, InterruptedException, I TriggerMetadata trigger = triggers[0]; assertEquals(TRIGGER_NAME, trigger.getTriggerName()); + assertEquals(desc, trigger.getDescription()); assertEquals("http", trigger.getTriggerType()); // retrieve http trigger @@ -637,6 +642,7 @@ public void testCRUDHttpTrigger() throws ParseException, InterruptedException, I assertFalse(Strings.isNullOrEmpty(getTResp.getRequestId())); assertEquals(TRIGGER_NAME, getTResp.getTriggerName()); + assertEquals(desc, getTResp.getDescription()); assertEquals(TRIGGER_TYPE_HTTP, getTResp.getTriggerType()); assertTrue(deepEquals(new HttpMethod[]{GET, POST}, triggerConfig.getMethods())); @@ -645,13 +651,17 @@ public void testCRUDHttpTrigger() throws ParseException, InterruptedException, I HttpTriggerConfig updateTriggerConfig = new HttpTriggerConfig( FUNCTION, new HttpMethod[]{POST}); + String desc_update_trigger = "update http trigger"; + UpdateTriggerRequest updateTReq = new UpdateTriggerRequest(SERVICE_NAME, FUNCTION_NAME, TRIGGER_NAME); updateTReq.setTriggerConfig(updateTriggerConfig); + updateTReq.setDescription(desc_update_trigger); Thread.sleep(1000); UpdateTriggerResponse updateTResp = updateTrigger(updateTReq); + assertEquals(desc_update_trigger, updateTResp.getDescription()); assertEquals(triggerOld.getTriggerName(), updateTResp.getTriggerName()); Gson gson = new Gson(); @@ -768,7 +778,7 @@ public void ignoreTestListTriggers() throws IOException { for (int i = 0; i < numTriggers; i++) { String prefix = "prefix"; String suffix = "suffix"; - CreateTriggerResponse createTResp = createOssTrigger(TRIGGER_NAME + i, + CreateTriggerResponse createTResp = createOssTrigger(TRIGGER_NAME + i, "", prefix + i, suffix + i); assertFalse(Strings.isNullOrEmpty(createTResp.getRequestId())); } @@ -1359,7 +1369,7 @@ public void testHttpInvokeFunction() throws IOException, InterruptedException { for (HttpAuthType auth : new HttpAuthType[]{ANONYMOUS, FUNCTION}) { // create http trigger - createHttpTrigger(TRIGGER_NAME.concat(auth.toString()), auth, + createHttpTrigger(TRIGGER_NAME.concat(auth.toString()), "", auth, new HttpMethod[]{GET, POST}); // sleep sometime so that the function cache in the API server will // be updated (default is 10 seconds) @@ -1442,7 +1452,7 @@ public void testHttpInvokeFunctionWithoutQueriesAndBody() throws IOException { for (HttpAuthType auth : new HttpAuthType[]{ANONYMOUS, FUNCTION}) { // create http trigger - createHttpTrigger(TRIGGER_NAME, auth, new HttpMethod[]{GET, POST, PUT, HEAD, DELETE}); + createHttpTrigger(TRIGGER_NAME, "", auth, new HttpMethod[]{GET, POST, PUT, HEAD, DELETE}); // Invoke the function HttpInvokeFunctionRequest request = new HttpInvokeFunctionRequest(SERVICE_NAME, @@ -1650,8 +1660,9 @@ private void testCRUDHelper(boolean testTrigger) // Create Trigger String tfPrefix = "prefix"; String tfSuffix = "suffix"; + String oss_trigger_desc = "create oss trigger"; - createOssTrigger(TRIGGER_NAME, tfPrefix, tfSuffix); + createOssTrigger(TRIGGER_NAME, oss_trigger_desc, tfPrefix, tfSuffix); // List Triggers TriggerMetadata[] triggers = listTriggers(SERVICE_NAME, FUNCTION_NAME); @@ -1659,9 +1670,11 @@ private void testCRUDHelper(boolean testTrigger) assertEquals(1, triggers.length); TriggerMetadata triggerOld = triggers[0]; assertEquals(TRIGGER_NAME, triggerOld.getTriggerName()); + assertEquals(oss_trigger_desc, triggerOld.getDescription()); // Update Trigger String newInvocationRole = INVOCATION_ROLE + "_new"; + String update_oss_trigger = "update oss trigger"; String tfPrefixNew = "prefix_new"; String tfSuffixNew = "suffix_new"; String[] eventsNew = new String[]{"oss:ObjectCreated:PutObject"}; @@ -1670,10 +1683,12 @@ private void testCRUDHelper(boolean testTrigger) UpdateTriggerRequest updateTReq = new UpdateTriggerRequest(SERVICE_NAME, FUNCTION_NAME, TRIGGER_NAME); + updateFReq.setDescription(update_oss_trigger); updateTReq.setInvocationRole(newInvocationRole); updateTReq.setTriggerConfig(updateTriggerConfig); UpdateTriggerResponse updateTResp = updateTrigger(updateTReq); assertEquals(triggerOld.getTriggerName(), updateTResp.getTriggerName()); + assertEquals(update_oss_trigger, updateTResp.getDescription()); assertNotEquals(triggerOld.getInvocationRole(), updateTResp.getInvocationRole()); assertEquals(triggerOld.getSourceArn(), updateTResp.getSourceArn()); Gson gson = new Gson(); @@ -1702,6 +1717,7 @@ private void testCRUDHelper(boolean testTrigger) .fromJson(gson.toJson(getTResp.getTriggerConfig()), OSSTriggerConfig.class); assertFalse(Strings.isNullOrEmpty(getTResp.getRequestId())); assertEquals(TRIGGER_NAME, getTResp.getTriggerName()); + assertEquals(updateTResp, getTResp.getDescription()); assertEquals(OSS_SOURCE_ARN, getTResp.getSourceARN()); assertEquals(TRIGGER_TYPE_OSS, getTResp.getTriggerType()); assertEquals(newInvocationRole, getTResp.getInvocationRole()); @@ -1757,6 +1773,7 @@ private void testCRUDHelper(boolean testTrigger) private void testCdnEventsTrigger() throws ParseException, InterruptedException { String triggerName = TRIGGER_TYPE_CDN + "_" + TRIGGER_NAME; + String desc = "create cdn event trigger"; String EVENT_NAME = "LogFileCreated"; @@ -1778,6 +1795,7 @@ private void testCdnEventsTrigger() throws ParseException, InterruptedException CreateTriggerRequest createTReq = new CreateTriggerRequest(SERVICE_NAME, FUNCTION_NAME); createTReq.setTriggerName(triggerName); + createTReq.setDescription(desc); createTReq.setTriggerType(TRIGGER_TYPE_CDN); createTReq.setInvocationRole(INVOCATION_ROLE); createTReq.setSourceArn(CDN_SOURCE_ARN); @@ -1790,6 +1808,7 @@ private void testCdnEventsTrigger() throws ParseException, InterruptedException assertEquals(1, triggers.length); TriggerMetadata triggerOld = triggers[0]; assertEquals(triggerName, triggerOld.getTriggerName()); + assertEquals(desc, triggerOld.getDescription()); Thread.sleep(300); @@ -1802,11 +1821,14 @@ private void testCdnEventsTrigger() throws ParseException, InterruptedException UpdateTriggerRequest req = new UpdateTriggerRequest(SERVICE_NAME, FUNCTION_NAME, triggerName); + String update_trigger_desc = "update cdn event trigger"; req.setInvocationRole(INVOCATION_ROLE); + req.setDescription(update_trigger_desc); req.setTriggerConfig(updateConfig); UpdateTriggerResponse updateTResp = client.updateTrigger(req); assertEquals(triggerOld.getTriggerName(), updateTResp.getTriggerName()); + assertEquals(update_trigger_desc, updateTResp.getDescription()); assertEquals(triggerOld.getInvocationRole(), updateTResp.getInvocationRole()); assertEquals(triggerOld.getSourceArn(), updateTResp.getSourceArn()); Gson gson = new Gson(); @@ -1834,6 +1856,7 @@ private void testCdnEventsTrigger() throws ParseException, InterruptedException .fromJson(gson.toJson(getTResp.getTriggerConfig()), CdnEventsTriggerConfig.class); assertFalse(Strings.isNullOrEmpty(getTResp.getRequestId())); assertEquals(triggerName, getTResp.getTriggerName()); + assertEquals(update_trigger_desc, getTResp.getDescription()); assertEquals(CDN_SOURCE_ARN, getTResp.getSourceARN()); assertEquals(TRIGGER_TYPE_CDN, getTResp.getTriggerType()); assertEquals(EVENT_NAME, config.getEventName()); @@ -1843,11 +1866,12 @@ private void testCdnEventsTrigger() throws ParseException, InterruptedException deleteTrigger(SERVICE_NAME, FUNCTION_NAME, triggerName); } - private CreateTriggerResponse createLogTrigger(String triggerName, + private CreateTriggerResponse createLogTrigger(String triggerName, String desc, LogTriggerConfig triggerConfig) { CreateTriggerRequest createTReq = new CreateTriggerRequest(SERVICE_NAME, FUNCTION_NAME); createTReq.setTriggerName(triggerName); + createTReq.setDescription(desc); createTReq.setTriggerType(TRIGGER_TYPE_LOG); createTReq.setInvocationRole(INVOCATION_ROLE); createTReq.setSourceArn(LOG_SOURCE_ARN); @@ -1866,7 +1890,9 @@ private void testLogTrigger() throws ParseException { setLogConfig(new LogTriggerConfig.LogConfig("", "")). setFunctionParameter(new HashMap()).setEnable(true); - createLogTrigger(triggerName, triggerConfig); + String desc = "create log trigger"; + + createLogTrigger(triggerName, desc, triggerConfig); // List Triggers TriggerMetadata[] triggers = listTriggers(SERVICE_NAME, FUNCTION_NAME); @@ -1875,6 +1901,7 @@ private void testLogTrigger() throws ParseException { TriggerMetadata triggerOld = triggers[0]; assertEquals(triggerName, triggerOld.getTriggerName()); + assertEquals(desc, triggerOld.getDescription()); try { Thread.sleep(1000); @@ -1883,13 +1910,16 @@ private void testLogTrigger() throws ParseException { UpdateTriggerRequest req = new UpdateTriggerRequest(SERVICE_NAME, FUNCTION_NAME, triggerName); + String update_trigger_desc = "update log trigger"; req.setInvocationRole(INVOCATION_ROLE); + req.setDescription(update_trigger_desc); req.setTriggerConfig( new LogTriggerConfig(). setJobConfig( new LogTriggerConfig.JobConfig().setMaxRetryTime(5).setTriggerInterval(120))); UpdateTriggerResponse updateTResp = client.updateTrigger(req); assertEquals(triggerOld.getTriggerName(), updateTResp.getTriggerName()); + assertEquals(updateTResp, updateTResp.getDescription()); assertEquals(triggerOld.getInvocationRole(), updateTResp.getInvocationRole()); assertEquals(triggerOld.getSourceArn(), updateTResp.getSourceArn()); Gson gson = new Gson(); @@ -1917,6 +1947,7 @@ private void testLogTrigger() throws ParseException { .fromJson(gson.toJson(getTResp.getTriggerConfig()), LogTriggerConfig.class); assertFalse(Strings.isNullOrEmpty(getTResp.getRequestId())); assertEquals(triggerName, getTResp.getTriggerName()); + assertEquals(updateTResp, getTResp.getDescription()); assertEquals(LOG_SOURCE_ARN, getTResp.getSourceARN()); assertEquals(TRIGGER_TYPE_LOG, getTResp.getTriggerType()); assertEquals(5, getTConfig.getJobConfig().getMaxRetryTime().intValue()); @@ -1926,10 +1957,11 @@ private void testLogTrigger() throws ParseException { deleteTrigger(SERVICE_NAME, FUNCTION_NAME, triggerName); } - private CreateTriggerResponse createTimeTrigger(String triggerName, + private CreateTriggerResponse createTimeTrigger(String triggerName, String description, TimeTriggerConfig timeTriggerConfig) { CreateTriggerRequest createTReq = new CreateTriggerRequest(SERVICE_NAME, FUNCTION_NAME); createTReq.setTriggerName(triggerName); + createTReq.setDescription(description); createTReq.setTriggerType(TRIGGER_TYPE_TIMER); createTReq.setTriggerConfig(timeTriggerConfig); @@ -2004,6 +2036,7 @@ public void testInvokeFunctionWithInitializer() private void testTimeTrigger() throws ParseException { String cronEvery = "@every 5m"; String cronExpression = "0 2 * * * *"; + String desc = "create time trigger"; String payload = "awesome-fc"; String triggerName = TRIGGER_TYPE_TIMER + "_" + TRIGGER_NAME; Gson gson = new Gson(); @@ -2011,10 +2044,11 @@ private void testTimeTrigger() throws ParseException { // Create Trigger TimeTriggerConfig timeTriggerConfig = new TimeTriggerConfig(cronEvery, payload, true); - CreateTriggerResponse createTriggerResponse = createTimeTrigger(triggerName, + CreateTriggerResponse createTriggerResponse = createTimeTrigger(triggerName, desc, timeTriggerConfig); assertEquals(triggerName, createTriggerResponse.getTriggerName()); + assertEquals(desc, createTriggerResponse.getDescription()); assertEquals(TRIGGER_TYPE_TIMER, createTriggerResponse.getTriggerType()); String createTime = createTriggerResponse.getCreatedTime(); @@ -2034,6 +2068,7 @@ private void testTimeTrigger() throws ParseException { .fromJson(gson.toJson(getTResp.getTriggerConfig()), TimeTriggerConfig.class); assertFalse(Strings.isNullOrEmpty(getTResp.getRequestId())); assertEquals(triggerName, getTResp.getTriggerName()); + assertEquals(desc, getTResp.getDescription()); assertEquals(TRIGGER_TYPE_TIMER, getTResp.getTriggerType()); assertEquals(timeTriggerConfig.getCronExpression(), getTConfig.getCronExpression()); assertEquals(timeTriggerConfig.getPayload(), getTConfig.getPayload()); @@ -2046,6 +2081,7 @@ private void testTimeTrigger() throws ParseException { assertEquals(1, triggers.length); TriggerMetadata triggerOld = triggers[0]; assertEquals(triggerName, triggerOld.getTriggerName()); + assertEquals(desc, triggerOld.getDescription()); try { Thread.sleep(1000); @@ -2055,11 +2091,14 @@ private void testTimeTrigger() throws ParseException { // Update Triggers UpdateTriggerRequest req = new UpdateTriggerRequest(SERVICE_NAME, FUNCTION_NAME, triggerName); + String update_trigger_desc = "update time trigger"; req.setTriggerConfig( new TimeTriggerConfig().setCronExpression(cronExpression).setPayload(payload) .setEnable(true)); + req.setDescription(update_trigger_desc); UpdateTriggerResponse updateTResp = client.updateTrigger(req); assertEquals(triggerOld.getTriggerName(), updateTResp.getTriggerName()); + assertEquals(update_trigger_desc, updateTResp.getDescription()); TimeTriggerConfig tcOld = gson .fromJson(gson.toJson(triggerOld.getTriggerConfig()), TimeTriggerConfig.class); TimeTriggerConfig tcNew = gson @@ -2263,7 +2302,7 @@ public void testHTTPTriggerWithVersion() throws ClientException, IOException { for (HttpAuthType auth : new HttpAuthType[]{ANONYMOUS, FUNCTION}) { // create http trigger - createHttpTriggerWithQualifier(TRIGGER_NAME, publishVersionResponse.getVersionId(), + createHttpTriggerWithQualifier(TRIGGER_NAME, "", publishVersionResponse.getVersionId(), auth, new HttpMethod[]{GET, POST}); // Invoke the function From 8b5653f6d973cf62749979725628595863ed8c01 Mon Sep 17 00:00:00 2001 From: tw108174 Date: Mon, 18 Mar 2019 22:04:40 +0800 Subject: [PATCH 2/2] fix bugger for update trigger descrtiption --- src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java b/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java index 811f0f1..748c74d 100644 --- a/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java +++ b/src/test/java/com/aliyuncs/fc/FunctionComputeClientTest.java @@ -1683,7 +1683,7 @@ private void testCRUDHelper(boolean testTrigger) UpdateTriggerRequest updateTReq = new UpdateTriggerRequest(SERVICE_NAME, FUNCTION_NAME, TRIGGER_NAME); - updateFReq.setDescription(update_oss_trigger); + updateTReq.setDescription(update_oss_trigger); updateTReq.setInvocationRole(newInvocationRole); updateTReq.setTriggerConfig(updateTriggerConfig); UpdateTriggerResponse updateTResp = updateTrigger(updateTReq); @@ -1919,7 +1919,7 @@ private void testLogTrigger() throws ParseException { new LogTriggerConfig.JobConfig().setMaxRetryTime(5).setTriggerInterval(120))); UpdateTriggerResponse updateTResp = client.updateTrigger(req); assertEquals(triggerOld.getTriggerName(), updateTResp.getTriggerName()); - assertEquals(updateTResp, updateTResp.getDescription()); + assertEquals(update_trigger_desc, updateTResp.getDescription()); assertEquals(triggerOld.getInvocationRole(), updateTResp.getInvocationRole()); assertEquals(triggerOld.getSourceArn(), updateTResp.getSourceArn()); Gson gson = new Gson();