@contrail/cli 1.0.4 → 1.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/apps/deploy-app/actions-deployer.js +13 -2
- package/lib/apps/deploy-app/interfaces.d.ts +1 -1
- package/package.json +1 -1
- package/src/apps/deploy-app/actions-deployer.ts +16 -4
- package/src/apps/deploy-app/interfaces.ts +1 -1
- package/templates/javascript/actions/example/action.js +1 -1
- package/templates/typescript/actions/exampleAction.ts +1 -1
|
@@ -31,12 +31,16 @@ export class ActionsDeployer {
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
async createNewActionDefinition(actionKey, actionDeclaration, app) {
|
|
34
|
+
let configProperties;
|
|
35
|
+
if (actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) {
|
|
36
|
+
configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
|
|
37
|
+
}
|
|
34
38
|
const newObject = {
|
|
35
39
|
identifier: this.getActionDeclarationIdentifier(actionKey, app),
|
|
36
40
|
name: actionDeclaration.name,
|
|
37
41
|
ownerKey: `app:${app.id}`,
|
|
38
42
|
public: app.public,
|
|
39
|
-
configProperties
|
|
43
|
+
configProperties,
|
|
40
44
|
};
|
|
41
45
|
const functionString = await this.getFunction(actionDeclaration);
|
|
42
46
|
if (functionString) {
|
|
@@ -50,10 +54,17 @@ export class ActionsDeployer {
|
|
|
50
54
|
return actionDefinition;
|
|
51
55
|
}
|
|
52
56
|
async updateActionDefinition(existingActionDefinition, actionDeclaration) {
|
|
57
|
+
let configProperties;
|
|
58
|
+
if (actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) {
|
|
59
|
+
configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
|
|
60
|
+
}
|
|
61
|
+
else if (!(actionDeclaration === null || actionDeclaration === void 0 ? void 0 : actionDeclaration.actionConfiguration) && existingActionDefinition.configProperties) {
|
|
62
|
+
configProperties = null;
|
|
63
|
+
}
|
|
53
64
|
const updates = {
|
|
54
65
|
name: actionDeclaration.name,
|
|
55
66
|
// public: actionDeclaration.public, // TODO - an actions visibility is allowed to change
|
|
56
|
-
configProperties
|
|
67
|
+
configProperties,
|
|
57
68
|
};
|
|
58
69
|
const functionString = await this.getFunction(actionDeclaration);
|
|
59
70
|
if (functionString) {
|
|
@@ -31,7 +31,7 @@ export interface AppActionDeclaration {
|
|
|
31
31
|
handler: string;
|
|
32
32
|
name: string;
|
|
33
33
|
description?: string;
|
|
34
|
-
actionConfiguration
|
|
34
|
+
actionConfiguration?: ConfigPropertyElements;
|
|
35
35
|
}
|
|
36
36
|
export interface AppTriggerDeclaration {
|
|
37
37
|
key: string;
|
package/package.json
CHANGED
|
@@ -41,12 +41,16 @@ export class ActionsDeployer {
|
|
|
41
41
|
}
|
|
42
42
|
|
|
43
43
|
private async createNewActionDefinition(actionKey: string, actionDeclaration: AppActionDeclaration, app: App) {
|
|
44
|
+
let configProperties;
|
|
45
|
+
if (actionDeclaration?.actionConfiguration) {
|
|
46
|
+
configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
|
|
47
|
+
}
|
|
44
48
|
const newObject: EventWorkflowActionDefinition = {
|
|
45
49
|
identifier: this.getActionDeclarationIdentifier(actionKey, app),
|
|
46
50
|
name: actionDeclaration.name,
|
|
47
51
|
ownerKey: `app:${app.id}`,
|
|
48
52
|
public: app.public, // TODO - an actions visibility is not tied to the visibility of the app
|
|
49
|
-
configProperties
|
|
53
|
+
configProperties,
|
|
50
54
|
};
|
|
51
55
|
|
|
52
56
|
const functionString = await this.getFunction(actionDeclaration);
|
|
@@ -64,12 +68,20 @@ export class ActionsDeployer {
|
|
|
64
68
|
return actionDefinition;
|
|
65
69
|
}
|
|
66
70
|
|
|
67
|
-
private async updateActionDefinition(existingActionDefinition: EventWorkflowActionDefinition,
|
|
68
|
-
|
|
71
|
+
private async updateActionDefinition(existingActionDefinition: EventWorkflowActionDefinition, actionDeclaration: AppActionDeclaration) {
|
|
72
|
+
|
|
73
|
+
let configProperties;
|
|
74
|
+
if (actionDeclaration?.actionConfiguration) {
|
|
75
|
+
configProperties = ConfigPropertiesParser.getConfigProperties(actionDeclaration.actionConfiguration);
|
|
76
|
+
}
|
|
77
|
+
else if (!actionDeclaration?.actionConfiguration && existingActionDefinition.configProperties) {
|
|
78
|
+
configProperties = null;
|
|
79
|
+
}
|
|
80
|
+
|
|
69
81
|
const updates: EventWorkflowActionDefinition = {
|
|
70
82
|
name: actionDeclaration.name,
|
|
71
83
|
// public: actionDeclaration.public, // TODO - an actions visibility is allowed to change
|
|
72
|
-
configProperties
|
|
84
|
+
configProperties,
|
|
73
85
|
};
|
|
74
86
|
|
|
75
87
|
const functionString = await this.getFunction(actionDeclaration);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
async function execute(config, event, Functions) {
|
|
2
2
|
const getBodyFromEvent = (config, event) => {
|
|
3
|
-
let body = Functions.
|
|
3
|
+
let body = Functions.stringUtil.parseVariables(config.message, event);
|
|
4
4
|
console.log('body: ', body);
|
|
5
5
|
if (config.sendDetails) {
|
|
6
6
|
const data = event;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
async function execute(config, event, Functions) {
|
|
2
2
|
const getBodyFromEvent = (config, event) => {
|
|
3
|
-
let body = Functions.
|
|
3
|
+
let body = Functions.stringUtil.parseVariables(config.message, event);
|
|
4
4
|
console.log('body: ', body);
|
|
5
5
|
if (config.sendDetails) {
|
|
6
6
|
const data = event;
|