Skip to content

Commit 67ae622

Browse files
liuzewen99liuzewen99
committed
fix: session
1 parent 7105eb5 commit 67ae622

3 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎__tests__/e2e/session/run‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ s deploy -y
1111

1212
# Test create session
1313
echo "Testing create session..."
14-
sessionId=$(s cli fc3 session create --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST --session-ttl-in-seconds 3600 --session-idle-timeout-in-seconds 1800 -o json | jq -r '.sessionId')
14+
sessionId=$(s cli fc3 session create -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST --session-ttl-in-seconds 3600 --session-idle-timeout-in-seconds 1800 -o json | jq -r '.sessionId')
1515
if [ -z "$sessionId" ]; then
1616
echo "Failed to create session"
1717
exit 1
@@ -20,7 +20,7 @@ echo "Created session: $sessionId"
2020

2121
# Test get session
2222
echo "Testing get session..."
23-
getSessionResult=$(s cli fc3 session get --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -o json)
23+
getSessionResult=$(s cli fc3 session get -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -o json)
2424
if [ -z "$getSessionResult" ]; then
2525
echo "Failed to get session"
2626
exit 1
@@ -29,7 +29,7 @@ echo "Get session result: $getSessionResult"
2929

3030
# Test update session (update sessionTTLInSeconds)
3131
echo "Testing update session with session-ttl-in-seconds..."
32-
updateResult=$(s cli fc3 session update --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST --session-ttl-in-seconds 7200 -o json)
32+
updateResult=$(s cli fc3 session update -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST --session-ttl-in-seconds 7200 -o json)
3333
if [ -z "$updateResult" ]; then
3434
echo "Failed to update session with session-ttl-in-seconds"
3535
exit 1
@@ -38,7 +38,7 @@ echo "Update session result: $updateResult"
3838

3939
# Test update session (update sessionIdleTimeoutInSeconds)
4040
echo "Testing update session with session-idle-timeout-in-seconds..."
41-
updateResult2=$(s cli fc3 session update --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST --session-idle-timeout-in-seconds 3600 -o json)
41+
updateResult2=$(s cli fc3 session update -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST --session-idle-timeout-in-seconds 3600 -o json)
4242
if [ -z "$updateResult2" ]; then
4343
echo "Failed to update session with session-idle-timeout-in-seconds"
4444
exit 1
@@ -47,7 +47,7 @@ echo "Update session result: $updateResult2"
4747

4848
# Test list sessions
4949
echo "Testing list sessions..."
50-
listResult=$(s cli fc3 session list --function-name fc3-session-${fc_component_function_name:-test} -o json)
50+
listResult=$(s cli fc3 session list -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} -o json)
5151
if [ -z "$listResult" ]; then
5252
echo "Failed to list sessions"
5353
exit 1
@@ -56,7 +56,7 @@ echo "List sessions result: $listResult"
5656

5757
# Test list sessions with filters
5858
echo "Testing list sessions with filters..."
59-
listFilteredResult=$(s cli fc3 session list --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -o json)
59+
listFilteredResult=$(s cli fc3 session list -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -o json)
6060
if [ -z "$listFilteredResult" ]; then
6161
echo "Failed to list sessions with filters"
6262
exit 1
@@ -65,7 +65,7 @@ echo "List sessions with filters result: $listFilteredResult"
6565

6666
# Test list sessions with session-status filter
6767
echo "Testing list sessions with session-status filter..."
68-
listStatusResult=$(s cli fc3 session list --function-name fc3-session-${fc_component_function_name:-test} --session-status Active -o json)
68+
listStatusResult=$(s cli fc3 session list -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-status Active -o json)
6969
if [ -z "$listStatusResult" ]; then
7070
echo "Failed to list sessions with session-status filter"
7171
exit 1
@@ -74,7 +74,7 @@ echo "List sessions with session-status filter result: $listStatusResult"
7474

7575
# Test list sessions with limit parameter
7676
echo "Testing list sessions with limit parameter..."
77-
listLimitResult=$(s cli fc3 session list --function-name fc3-session-${fc_component_function_name:-test} --limit 5 -o json)
77+
listLimitResult=$(s cli fc3 session list -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --limit 5 -o json)
7878
if [ -z "$listLimitResult" ]; then
7979
echo "Failed to list sessions with limit parameter"
8080
exit 1
@@ -83,12 +83,12 @@ echo "List sessions with limit parameter result: $listLimitResult"
8383

8484
# Test remove session
8585
echo "Testing remove session..."
86-
removeResult=$(s cli fc3 session remove --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -y -o json)
86+
removeResult=$(s cli fc3 session remove -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -y -o json)
8787
echo "Remove session result: $removeResult"
8888

8989
# Verify session is removed by trying to get it (should fail)
9090
echo "Verifying session is removed..."
91-
getRemovedSessionResult=$(s cli fc3 session get --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -o json 2>&1 || true)
91+
getRemovedSessionResult=$(s cli fc3 session get -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId --qualifier LATEST -o json 2>&1 || true)
9292
if [[ $getRemovedSessionResult == *"not found"* ]] || [[ $getRemovedSessionResult == *"not exist"* ]]; then
9393
echo "Session successfully removed"
9494
else
@@ -98,7 +98,7 @@ fi
9898

9999
# Test create session without optional parameters (should use defaults)
100100
echo "Testing create session with default parameters..."
101-
sessionId2=$(s cli fc3 session create --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST -o json | jq -r '.sessionId')
101+
sessionId2=$(s cli fc3 session create -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST -o json | jq -r '.sessionId')
102102
if [ -z "$sessionId2" ]; then
103103
echo "Failed to create session with default parameters"
104104
exit 1
@@ -107,7 +107,7 @@ echo "Created session with defaults: $sessionId2"
107107

108108
# Test create session with only sessionTTLInSeconds
109109
echo "Testing create session with only session-ttl-in-seconds..."
110-
sessionId3=$(s cli fc3 session create --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST --session-ttl-in-seconds 1800 -o json | jq -r '.sessionId')
110+
sessionId3=$(s cli fc3 session create -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST --session-ttl-in-seconds 1800 -o json | jq -r '.sessionId')
111111
if [ -z "$sessionId3" ]; then
112112
echo "Failed to create session with only session-ttl-in-seconds"
113113
exit 1
@@ -116,17 +116,17 @@ echo "Created session with only session-ttl-in-seconds: $sessionId3"
116116

117117
# Test create session with only sessionIdleTimeoutInSeconds
118118
echo "Testing create session with only session-idle-timeout-in-seconds..."
119-
sessionId4=$(s cli fc3 session create --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST --session-idle-timeout-in-seconds 900 -o json | jq -r '.sessionId')
119+
sessionId4=$(s cli fc3 session create -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --qualifier LATEST --session-idle-timeout-in-seconds 900 -o json | jq -r '.sessionId')
120120
if [ -z "$sessionId4" ]; then
121121
echo "Failed to create session with only session-idle-timeout-in-seconds"
122122
exit 1
123123
fi
124124
echo "Created session with only session-idle-timeout-in-seconds: $sessionId4"
125125

126126
# Clean up additional sessions
127-
s cli fc3 session remove --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId2 --qualifier LATEST -y || true
128-
s cli fc3 session remove --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId3 --qualifier LATEST -y || true
129-
s cli fc3 session remove --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId4 --qualifier LATEST -y || true
127+
s cli fc3 session remove -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId2 --qualifier LATEST -y || true
128+
s cli fc3 session remove -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId3 --qualifier LATEST -y || true
129+
s cli fc3 session remove -a quanxi --region cn-hangzhou --function-name fc3-session-${fc_component_function_name:-test} --session-id $sessionId4 --qualifier LATEST -y || true
130130

131131
# Clean up function
132132
echo "Cleaning up..."

‎__tests__/e2e/session/run-windows.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ s deploy -y
88

99
# Test create session
1010
Write-Host "Testing create session..."
11-
$createResult = s cli fc3 session create --function-name "fc3-session-$($env:fc_component_function_name)" --qualifier LATEST --session-ttl-in-seconds 3600 --session-idle-timeout-in-seconds 1800 -o json | ConvertFrom-Json
11+
$createResult = s cli fc3 session create -a quanxi --region cn-hangzhou --function-name "fc3-session-$($env:fc_component_function_name)" --qualifier LATEST --session-ttl-in-seconds 3600 --session-idle-timeout-in-seconds 1800 -o json | ConvertFrom-Json
1212
$sessionId = $createResult.sessionId
1313
if ([string]::IsNullOrEmpty($sessionId)) {
1414
Write-Error "Failed to create session"
@@ -18,7 +18,7 @@ Write-Host "Created session: $sessionId"
1818

1919
# Test get session
2020
Write-Host "Testing get session..."
21-
$getResult = s cli fc3 session get --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST -o json | ConvertFrom-Json
21+
$getResult = s cli fc3 session get -a quanxi --region cn-hangzhou --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST -o json | ConvertFrom-Json
2222
if ($null -eq $getResult) {
2323
Write-Error "Failed to get session"
2424
exit 1
@@ -27,7 +27,7 @@ Write-Host "Get session result: $($getResult | ConvertTo-Json)"
2727

2828
# Test update session
2929
Write-Host "Testing update session..."
30-
$updateResult = s cli fc3 session update --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST --session-ttl-in-seconds 7200 -o json | ConvertFrom-Json
30+
$updateResult = s cli fc3 session update -a quanxi --region cn-hangzhou --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST --session-ttl-in-seconds 7200 -o json | ConvertFrom-Json
3131
if ($null -eq $updateResult) {
3232
Write-Error "Failed to update session"
3333
exit 1
@@ -36,7 +36,7 @@ Write-Host "Update session result: $($updateResult | ConvertTo-Json)"
3636

3737
# Test list sessions
3838
Write-Host "Testing list sessions..."
39-
$listResult = s cli fc3 session list --function-name "fc3-session-$($env:fc_component_function_name)" -o json | ConvertFrom-Json
39+
$listResult = s cli fc3 session list -a quanxi --region cn-hangzhou --function-name "fc3-session-$($env:fc_component_function_name)" -o json | ConvertFrom-Json
4040
if ($null -eq $listResult) {
4141
Write-Error "Failed to list sessions"
4242
exit 1
@@ -45,7 +45,7 @@ Write-Host "List sessions result: $($listResult | ConvertTo-Json)"
4545

4646
# Test list sessions with filters
4747
Write-Host "Testing list sessions with filters..."
48-
$listFilteredResult = s cli fc3 session list --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST -o json | ConvertFrom-Json
48+
$listFilteredResult = s cli fc3 session -a quanxi --region cn-hangzhou list --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST -o json | ConvertFrom-Json
4949
if ($null -eq $listFilteredResult) {
5050
Write-Error "Failed to list sessions with filters"
5151
exit 1
@@ -54,12 +54,12 @@ Write-Host "List sessions with filters result: $($listFilteredResult | ConvertTo
5454

5555
# Test remove session
5656
Write-Host "Testing remove session..."
57-
$removeResult = s cli fc3 session remove --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST -y -o json
57+
$removeResult = s cli fc3 session remove -a quanxi --region cn-hangzhou --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId --qualifier LATEST -y -o json
5858
Write-Host "Remove session result: $removeResult"
5959

6060
# Test create session without optional parameters (should use defaults)
6161
Write-Host "Testing create session with default parameters..."
62-
$createResult2 = s cli fc3 session create --function-name "fc3-session-$($env:fc_component_function_name)" --qualifier LATEST -o json | ConvertFrom-Json
62+
$createResult2 = s cli fc3 session create -a quanxi --region cn-hangzhou --function-name "fc3-session-$($env:fc_component_function_name)" --qualifier LATEST -o json | ConvertFrom-Json
6363
$sessionId2 = $createResult2.sessionId
6464
if ([string]::IsNullOrEmpty($sessionId2)) {
6565
Write-Error "Failed to create session with default parameters"
@@ -68,7 +68,7 @@ if ([string]::IsNullOrEmpty($sessionId2)) {
6868
Write-Host "Created session with defaults: $sessionId2"
6969

7070
# Clean up second session
71-
s cli fc3 session remove --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId2 --qualifier LATEST -y
71+
s cli fc3 session remove -a quanxi --region cn-hangzhou --function-name "fc3-session-$($env:fc_component_function_name)" --session-id $sessionId2 --qualifier LATEST -y
7272

7373
# Clean up function
7474
Write-Host "Cleaning up..."

‎src/commands-help/session.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default {
99
description: `View the list of sessions.
1010
1111
Examples with CLI:
12-
$ s cli fc3 session list --function-name my-function`,
12+
$ s cli fc3 session list --region cn-hangzhou --function-name my-function -a default`,
1313
summary: 'List sessions',
1414
option: [
1515
[
@@ -30,7 +30,7 @@ Examples with CLI:
3030
description: `Get session details.
3131
3232
Examples with CLI:
33-
$ s cli fc3 session get --function-name my-function --session-id session-123 --qualifier LATEST`,
33+
$ s cli fc3 session get --region cn-hangzhou --function-name my-function --session-id session-123 --qualifier LATEST -a default`,
3434
summary: 'Get session details',
3535
option: [
3636
[
@@ -48,8 +48,8 @@ Examples with CLI:
4848
description: `Create a new session.
4949
5050
Examples with CLI:
51-
$ s cli fc3 session create --function-name my-function --qualifier LATEST --session-ttl-in-seconds 600,
52-
$ s cli fc3 session create --function-name my-function --qualifier LATEST --nas-config '{"userId": 1000, "groupId": 1000, "mountPoints": [{"serverAddr": "example.nas.aliyuncs.com:/", "mountDir": "/mnt/nas", "enableTLS": true}]}'`,
51+
$ s cli fc3 session create --region cn-hangzhou --function-name my-function --qualifier LATEST --session-ttl-in-seconds 600 -a default
52+
$ s cli fc3 session create --region cn-hangzhou --function-name my-function --qualifier LATEST --nas-config '{"userId": 1000, "groupId": 1000, "mountPoints": [{"serverAddr": "example.nas.aliyuncs.com:/", "mountDir": "/mnt/nas", "enableTLS": true}]}' -a default`,
5353

5454
summary: 'Create a new session',
5555
option: [
@@ -76,8 +76,8 @@ Examples with CLI:
7676
description: `Remove a session.
7777
7878
Examples with CLI:
79-
$ s cli fc3 session remove --function-name my-function --session-id session-123 --qualifier LATEST
80-
$ s cli fc3 session remove --function-name my-function --session-id session-123 --qualifier LATEST -y`,
79+
$ s cli fc3 session remove --region cn-hangzhou --function-name my-function --session-id session-123 --qualifier LATEST -a default
80+
$ s cli fc3 session remove --region cn-hangzhou --function-name my-function --session-id session-123 --qualifier LATEST -y -a default`,
8181
summary: 'Remove a session',
8282
option: [
8383
[
@@ -96,7 +96,7 @@ Examples with CLI:
9696
description: `Update a session.
9797
9898
Examples with CLI:
99-
$ s cli fc3 session update --function-name my-function --session-id session-123 --qualifier LATEST --session-ttl-in-seconds 900`,
99+
$ s cli fc3 session update --region cn-hangzhou --function-name my-function --session-id session-123 --qualifier LATEST --session-ttl-in-seconds 900 -a default`,
100100
summary: 'Update a session',
101101
option: [
102102
[

0 commit comments

Comments
 (0)