Skip to content

Commit 9adb6f2

Browse files
authored
Merge pull request #20 from devsapp/gwh/sls
fix:sls projectName
2 parents 5e4e464 + 01c5767 commit 9adb6f2

File tree

4 files changed

+57
-14
lines changed

4 files changed

+57
-14
lines changed

__tests__/ut/resources_acr_test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ describe('Sls', () => {
6565
const uid = 'uid';
6666

6767
const result = Sls.generateProjectName(region, uid);
68-
expect(result).toEqual(`aliyun-serverless-uid-cn-hangzhou`);
68+
expect(result).toEqual(`serverless-cn-hangzhou-e2577dd7-8b54-5e28-865e-e56ffbc8bb73`);
6969
});
7070
});
7171

package-lock.json

Lines changed: 51 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@alicloud/pop-core": "^1.7.13",
2929
"@serverless-cd/srm-aliyun-pop-core": "^0.0.7-beta.16",
3030
"@serverless-cd/srm-aliyun-ram20150501": "^0.0.2-beta.9",
31-
"@serverless-cd/srm-aliyun-sls20201230": "0.0.4",
31+
"@serverless-cd/srm-aliyun-sls20201230": "0.0.4-beta.1",
3232
"@serverless-devs/diff": "^0.0.3-beta.6",
3333
"@serverless-devs/downloads": "^0.0.6",
3434
"@serverless-devs/load-component": "^0.0.8",
@@ -51,7 +51,8 @@
5151
"string-random": "^0.1.3",
5252
"temp-dir": "^2.0.0",
5353
"tty-table": "^4.2.3",
54-
"uuid": "^9.0.1"
54+
"uuid": "^9.0.1",
55+
"uuid-by-string": "^4.0.0"
5556
},
5657
"devDependencies": {
5758
"@serverless-devs/component-interface": "^0.0.6",

src/resources/sls/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import { Config } from '@alicloud/openapi-client';
44
import { IRegion } from '../../interface';
55
import { PROJECT, LOG_STORE } from '../../default/resources';
66
import logger from '../../logger';
7+
import getUuid from 'uuid-by-string';
78

89
export default class Sls {
910
static generateProjectName = (region: IRegion, accountID: string): string =>
10-
PROJECT || `aliyun-serverless-${accountID}-${region}`;
11+
PROJECT || `serverless-${region}-${getUuid(accountID)}`;
1112
static generateLogstoreName = (): string => {
1213
return LOG_STORE;
1314
};

0 commit comments

Comments
 (0)