Skip to content

Commit 35cca6a

Browse files
committed
fix: fix deploy triggers with the same name under different function
1 parent 0b4c50e commit 35cca6a

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

dist/lib/utils/pulumi/index.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ function deployNonServiceResource(filePath, type, PulumiFn, fcService, fcFunctio
2626
dependsOn.push(fcFunction[conf.function]);
2727
parent = fcFunction[conf.function];
2828
}
29-
const fcReource = new PulumiFn(conf.name, conf, { dependsOn, parent });
29+
let pulumiResourceName = conf.name;
30+
if (type === 'trigger') {
31+
// trigger 由 ${name}-${functionName}-${serviceName} 作为唯一标识符
32+
pulumiResourceName = pulumiResourceName + '-' + conf.function + '-' + conf.service;
33+
}
34+
const fcReource = new PulumiFn(pulumiResourceName, conf, { dependsOn, parent });
3035
Object.assign(res, {
3136
[conf.name]: fcReource,
3237
});

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fc-base",
3-
"version": "0.0.8",
3+
"version": "0.0.9",
44
"main": "./dist/index.js",
55
"dependencies": {
66
"@types/fs-extra": "^9.0.0",

publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Type: Component
22
Name: fc-base
33
Provider:
44
- 阿里云
5-
Version: 0.0.8
5+
Version: 0.0.9
66
Description: 阿里云函数计算基础组件
77
HomePage: https://github.com/devsapp/fc-base
88
Tags:

src/lib/utils/pulumi/index.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ function deployNonServiceResource(filePath, type, PulumiFn, fcService, fcFunctio
2626
dependsOn.push(fcFunction[conf.function]);
2727
parent = fcFunction[conf.function];
2828
}
29-
const fcReource = new PulumiFn(conf.name, conf, { dependsOn, parent });
29+
let pulumiResourceName = conf.name;
30+
if (type === 'trigger') {
31+
// trigger 由 ${name}-${functionName}-${serviceName} 作为唯一标识符
32+
pulumiResourceName = pulumiResourceName + '-' + conf.function + '-' + conf.service;
33+
}
34+
const fcReource = new PulumiFn(pulumiResourceName, conf, { dependsOn, parent });
3035
Object.assign(res, {
3136
[conf.name]: fcReource,
3237
});

0 commit comments

Comments
 (0)