Skip to content

Commit 218dae4

Browse files
committed
fix: deploy sls but not apply it ot lambda when first create
Signed-off-by: seven <[email protected]>
1 parent 1bddf92 commit 218dae4

File tree

4 files changed

+76
-35
lines changed

4 files changed

+76
-35
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@geek-fun/serverlessinsight",
3-
"version": "0.2.0",
3+
"version": "0.2.1",
44
"description": "Full life cycle cross providers serverless application management for your fast-growing business.",
55
"homepage": "https://serverlessinsight.geekfun.club",
66
"main": "dist/src/index.js",

src/stack/rosStack/function.ts

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,35 @@ export const resolveFunctions = (
2626
let logConfig: RosFunction.LogConfigProperty | undefined = undefined;
2727

2828
const enableLog = functions?.some(({ log }) => log);
29-
if (enableLog) {
30-
const slsService = new sls.Project(
31-
scope,
32-
`${service}_sls`,
33-
{ name: `${service}-sls`, tags: replaceReference(tags, context) },
34-
true,
35-
);
29+
const slsService = new sls.Project(
30+
scope,
31+
`${service}_sls`,
32+
{ name: `${service}-sls`, tags: replaceReference(tags, context) },
33+
true,
34+
);
3635

37-
const slsLogstore = new sls.Logstore(
38-
scope,
39-
`${service}_sls_logstore`,
40-
{
41-
logstoreName: `${service}-sls-logstore`,
42-
projectName: slsService.attrName,
43-
ttl: 7,
44-
},
45-
true,
46-
);
36+
const slsLogstore = new sls.Logstore(
37+
scope,
38+
`${service}_sls_logstore`,
39+
{
40+
logstoreName: `${service}-sls-logstore`,
41+
projectName: slsService.attrName,
42+
ttl: 7,
43+
},
44+
true,
45+
);
4746

48-
new sls.Index(
49-
scope,
50-
`${service}_sls_index`,
51-
{
52-
projectName: slsService.attrName,
53-
logstoreName: slsLogstore.attrLogstoreName,
54-
fullTextIndex: { enable: true },
55-
},
56-
true,
57-
);
47+
new sls.Index(
48+
scope,
49+
`${service}_sls_index`,
50+
{
51+
projectName: slsService.attrName,
52+
logstoreName: slsLogstore.attrLogstoreName,
53+
fullTextIndex: { enable: true },
54+
},
55+
true,
56+
);
57+
if (enableLog) {
5858
logConfig = {
5959
project: slsLogstore.attrProjectName,
6060
logstore: slsLogstore.attrLogstoreName,

tests/fixtures/deployFixture.ts

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,42 @@ export const minimumRos = {
473473
Metadata: { 'ALIYUN::ROS::Interface': { TemplateTags: ['Create by ROS CDK'] } },
474474
ROSTemplateFormatVersion: '2015-09-01',
475475
Resources: {
476+
'my-demo-minimum-service_sls': {
477+
Properties: {
478+
Name: 'my-demo-minimum-service-sls',
479+
},
480+
Type: 'ALIYUN::SLS::Project',
481+
},
482+
'my-demo-minimum-service_sls_index': {
483+
Properties: {
484+
FullTextIndex: {
485+
Enable: true,
486+
},
487+
LogReduce: false,
488+
LogstoreName: {
489+
'Fn::GetAtt': ['my-demo-minimum-service_sls_logstore', 'LogstoreName'],
490+
},
491+
ProjectName: {
492+
'Fn::GetAtt': ['my-demo-minimum-service_sls', 'Name'],
493+
},
494+
},
495+
Type: 'ALIYUN::SLS::Index',
496+
},
497+
'my-demo-minimum-service_sls_logstore': {
498+
Properties: {
499+
AppendMeta: false,
500+
AutoSplit: false,
501+
EnableTracking: false,
502+
LogstoreName: 'my-demo-minimum-service-sls-logstore',
503+
PreserveStorage: false,
504+
ProjectName: {
505+
'Fn::GetAtt': ['my-demo-minimum-service_sls', 'Name'],
506+
},
507+
ShardCount: 2,
508+
TTL: 7,
509+
},
510+
Type: 'ALIYUN::SLS::Logstore',
511+
},
476512
hello_fn: {
477513
Properties: {
478514
Code: {

0 commit comments

Comments
 (0)