Skip to content

add description to trigger #11

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

Merged
merged 1 commit into from
Mar 20, 2019
Merged

add description to trigger #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 23 additions & 10 deletions test/client_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,9 @@ public function testTriggerCRUD() {
$this->subTestHttpTrigger($serviceName, $httpFunctionName);
}

private function checkTriggerResponse($resp, $triggerName, $triggerType, $triggerConfig, $sourceArn, $invocationRole) {
private function checkTriggerResponse($resp, $triggerName, $description, $triggerType, $triggerConfig, $sourceArn, $invocationRole) {
$this->assertEquals($resp['triggerName'], $triggerName);
$this->assertEquals($resp['description'], $description);
$this->assertEquals($resp['triggerType'], $triggerType);
$this->assertEquals($resp['sourceArn'], $sourceArn);
$this->assertEquals($resp['invocationRole'], $invocationRole);
Expand All @@ -528,6 +529,7 @@ private function checkTriggerResponse($resp, $triggerName, $triggerType, $trigge
private function subTestOssTrigger($serviceName, $functionName) {
$triggerType = 'oss';
$triggerName = 'test-trigger-oss';
$createTriggerDesc = 'create oss trigger';
$sourceArn = sprintf("acs:oss:%s:%s:%s", $this->region, $this->accountId, $this->codeBucket);
$prefix = 'pre' . createUuid();
$suffix = 'suf' . createUuid();
Expand All @@ -545,6 +547,7 @@ private function subTestOssTrigger($serviceName, $functionName) {
$functionName,
array(
'triggerName' => $triggerName,
'description' => $createTriggerDesc,
'triggerType' => $triggerType,
'invocationRole' => $this->invocationRoleOss,
'sourceArn' => $sourceArn,
Expand All @@ -553,7 +556,7 @@ private function subTestOssTrigger($serviceName, $functionName) {
);

$triggerData = $ret['data'];
$this->checkTriggerResponse($triggerData, $triggerName, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleOss);
$this->checkTriggerResponse($triggerData, $triggerName, $createTriggerDesc, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleOss);

$err = '';
try {
Expand All @@ -574,11 +577,13 @@ private function subTestOssTrigger($serviceName, $functionName) {
$this->assertTrue($err != '');

$getTriggerData = $this->fcClient->getTrigger($serviceName, $functionName, $triggerName)['data'];
$this->checkTriggerResponse($getTriggerData, $triggerName, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleOss);
$this->checkTriggerResponse($getTriggerData, $triggerName, $createTriggerDesc, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleOss);

$prefixUpdate = $prefix . 'update';
$suffixUpdate = $suffix . 'update';
$updateTriggerDesc = 'update oss trigger';
$triggerConfigUpdate = [
'description' => $updateTriggerDesc,
'events' => ['oss:ObjectCreated:*'],
'filter' => [
'key' => [
Expand All @@ -599,7 +604,7 @@ private function subTestOssTrigger($serviceName, $functionName) {
);

$updateTriggerData = $ret['data'];
$this->checkTriggerResponse($updateTriggerData, $triggerName, $triggerType, $triggerConfigUpdate, $sourceArn, $this->invocationRoleOss);
$this->checkTriggerResponse($updateTriggerData, $triggerName, $updateTriggerDesc, $triggerType, $triggerConfigUpdate, $sourceArn, $this->invocationRoleOss);
$this->fcClient->deleteTrigger($serviceName, $functionName, $triggerName);

for ($i = 1; $i < 6; $i++) {
Expand Down Expand Up @@ -643,6 +648,7 @@ private function subTestOssTrigger($serviceName, $functionName) {
private function subTestLogTrigger($serviceName, $functionName) {
$triggerType = 'log';
$triggerName = 'test-trigger-sls';
$createTriggerDesc = 'create log trigger';
$sourceArn = sprintf('acs:log:%s:%s:project/%s', $this->region, $this->accountId, $this->logProject);

$triggerConfig = [
Expand All @@ -666,6 +672,7 @@ private function subTestLogTrigger($serviceName, $functionName) {
$functionName,
array(
'triggerName' => $triggerName,
'description' => $createTriggerDesc,
'triggerType' => $triggerType,
'invocationRole' => $this->invocationRoleSls,
'sourceArn' => $sourceArn,
Expand All @@ -674,7 +681,7 @@ private function subTestLogTrigger($serviceName, $functionName) {
);

$triggerData = $ret['data'];
$this->checkTriggerResponse($triggerData, $triggerName, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleSls);
$this->checkTriggerResponse($triggerData, $triggerName, $createTriggerDesc, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleSls);

$err = '';
try {
Expand All @@ -695,10 +702,11 @@ private function subTestLogTrigger($serviceName, $functionName) {
$this->assertTrue($err != '');

$getTriggerData = $this->fcClient->getTrigger($serviceName, $functionName, $triggerName)['data'];
$this->checkTriggerResponse($getTriggerData, $triggerName, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleSls);
$this->checkTriggerResponse($getTriggerData, $triggerName, $createTriggerDesc, $triggerType, $triggerConfig, $sourceArn, $this->invocationRoleSls);

$prefixUpdate = $prefix . 'update';
$suffixUpdate = $suffix . 'update';
$updateTriggerDesc = 'update log trigger';
$triggerConfigUpdate = [
'sourceConfig' => [
'logstore' => $this->logStore . '_source',
Expand All @@ -720,13 +728,14 @@ private function subTestLogTrigger($serviceName, $functionName) {
$functionName,
$triggerName,
array(
'description' => $updateTriggerDesc,
'invocationRole' => $this->invocationRoleSls,
'triggerConfig' => $triggerConfigUpdate,
)
);

$updateTriggerData = $ret['data'];
$this->checkTriggerResponse($updateTriggerData, $triggerName, $triggerType, $triggerConfigUpdate, $sourceArn, $this->invocationRoleSls);
$this->checkTriggerResponse($updateTriggerData, $triggerName, $updateTriggerDesc, $triggerType, $triggerConfigUpdate, $sourceArn, $this->invocationRoleSls);
$this->assertEquals($updateTriggerData['triggerConfig']['jobConfig']['triggerInterval'], 5);
$this->assertEquals($updateTriggerData['triggerConfig']['jobConfig']['maxRetryTime'], 80);
$this->fcClient->deleteTrigger($serviceName, $functionName, $triggerName);
Expand All @@ -736,6 +745,7 @@ private function subTestHttpTrigger($serviceName, $functionName) {
$triggerType = 'http';
$triggerName = 'test-trigger-http';
$sourceArn = 'dummy_arn';
$description = 'create http trigger';
$invocationRole = '';

$triggerConfig = [
Expand All @@ -748,35 +758,38 @@ private function subTestHttpTrigger($serviceName, $functionName) {
$functionName,
array(
'triggerName' => $triggerName,
'description' => $description,
'triggerType' => $triggerType,
'invocationRole' => $invocationRole,
'sourceArn' => $sourceArn,
'triggerConfig' => $triggerConfig,
)
);
$triggerData = $ret['data'];
$this->checkTriggerResponse($triggerData, $triggerName, $triggerType, $triggerConfig, null, $invocationRole);
$this->checkTriggerResponse($triggerData, $triggerName, $description, $triggerType, $triggerConfig, null, $invocationRole);

$getTriggerData = $this->fcClient->getTrigger($serviceName, $functionName, $triggerName)['data'];
$this->checkTriggerResponse($getTriggerData, $triggerName, $triggerType, $triggerConfig, null, $invocationRole);
$this->checkTriggerResponse($getTriggerData, $triggerName, $description, $triggerType, $triggerConfig, null, $invocationRole);

$triggerConfigUpdate = [
'authType' => 'function',
'methods' => ['GET', 'POST'],
];

$updateTriggerDesc = 'update http trigger';
$ret = $this->fcClient->updateTrigger(
$serviceName,
$functionName,
$triggerName,
array(
'description' => $updateTriggerDesc,
'invocationRole' => $invocationRole,
'triggerConfig' => $triggerConfigUpdate,
)
);

$updateTriggerData = $ret['data'];
$this->checkTriggerResponse($updateTriggerData, $triggerName, $triggerType, $triggerConfigUpdate, null, $invocationRole);
$this->checkTriggerResponse($updateTriggerData, $triggerName, $updateTriggerDesc, $triggerType, $triggerConfigUpdate, null, $invocationRole);
$this->assertEquals($updateTriggerData['triggerConfig']['authType'], 'function');

$headers = [
Expand Down