Skip to content

Commit e111a11

Browse files
committed
fix: Allow for single key message stage/deploy.
1 parent 8a7593d commit e111a11

1 file changed

Lines changed: 10 additions & 44 deletions

File tree

lib/veeva.js

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -69,60 +69,26 @@ function execute (cliArgs) {
6969

7070
utils.log.debugDir(options);
7171

72+
// update shared assets directory to prepend the product name and suffix - defined in the clm.yml file
7273
if (options.clm.product) {
7374
options.paths.sharedAssets = options.clm.product.name + options.clm.product.suffix + options.paths.sharedAssets;
7475
}
7576

76-
77-
/**
78-
* Arguments passed via commandline
79-
* @type {Object}
80-
* @param {[string]} [isDeploying] [used to pass through the assemble process, which passes down to JS libraries]
81-
* @param {[string]} [includeHiddenKeyMessage] [used to determine if hidden Key Messages should be deployed]
82-
*/
83-
options.deploy = {
84-
isDeploying: options.deploy || false,
85-
keyMessage: options['key-message'] || false,
86-
includeHiddenKeyMessage: options['all-key-messages'] || false
87-
};
88-
89-
utils.log.verbose('Deploy Options', options.deploy);
90-
91-
options.modeSingleKeyMessage = false;
92-
93-
// Should we include hidden Key Messages?
94-
if (options.deploy.includeHiddenKeyMessage) {
95-
96-
utils.log.note('⤷ Including hidden Key Messages');
97-
98-
options.keyMessages = options.keyMessages.concat(options.hiddenKeyMessages);
99-
}
100-
10177
/**
102-
* Check keyMessage argument and make sure Key Message exists
78+
* Check key-message argument and make sure Key Message exists
10379
*/
104-
if (options.deploy.keyMessage) {
105-
106-
const arrMergeKeyMessages = options.clm.key_messages.concat(options.hiddenKeyMessages);
107-
108-
const arrMergeKeyMessageNames = arrMergeKeyMessages.map((e) => e && e.key_message ? e.key_message : false);
80+
if (options['key-message']) {
10981

110-
const indexKeyMessageExists = arrMergeKeyMessageNames.indexOf(options.deploy.keyMessage.toString());
82+
options.clm.key_messages = options.clm.key_messages.filter((km) => (km.key_message === options['key-message'].toString()));
11183

112-
if (indexKeyMessageExists !== -1) {
84+
if (options.clm.key_messages.length === 0) {
11385

114-
utils.log.note('⤷ Single Key Message Mode: ' + options.deploy.keyMessage);
86+
utils.log.error('Invalid Key Message: ' + options['key-message']);
11587

116-
options.modeSingleKeyMessage = true;
117-
options.deploy.keyMessage = arrMergeKeyMessages[indexKeyMessageExists];
118-
} else {
119-
120-
utils.log.error('Invalid Key Message: ' + options.deploy.keyMessage);
121-
122-
options.deploy.keyMessage = false;
123-
124-
reject();
88+
throw new Error('Invalid Key Message: ' + options['key-message']);
12589
}
90+
utils.log.log('⤷ Single Key Message Mode: ' + options['key-message']);
91+
12692
}
12793
return resolve(options);
12894
}
@@ -135,7 +101,7 @@ function execute (cliArgs) {
135101
console.error(chalk.red.bold('✗ '), chalk.red(reportError.stack));
136102
process.exit(0);
137103
} else {
138-
throw new Error(reportError);
104+
reject(reportError);
139105
}
140106

141107
});

0 commit comments

Comments
 (0)