inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix cli

Browse Source
This commit is contained in:
Eugenio Romano
2020-06-12 13:57:44 +01:00
parent 6e732ee9a4
commit fec1b813e6
3 changed files with 267 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/cli/scripts/kubectl-clean-app.ts
View File

@@ -20,7 +20,7 @@
import * as program from 'commander';
import { exec } from './exec';
/* tslint:disable */
const alfrescoApi = require('@alfresco/js-api');
import { AlfrescoApi } from '@alfresco/js-api';
/* tslint:enable */
import { logger } from './logger';
@@ -60,7 +60,7 @@ function getAlfrescoJsApiInstance(args: ConfigArgs) {
redirectUri: '/'
}
};
return new alfrescoApi.AlfrescoApiCompatibility(config);
return new AlfrescoApi(config);
}
async function login(username: string, password: string, alfrescoJsApi: any) {
@@ -264,12 +264,14 @@ async function main(args) {
program
.version('0.1.0')
.description('The following command is in charge of cleaning the releases/application/descriptor related to an app passed as input' +
'adf-cli kubectl-clean-app --host "gateway_env" --oauth "identity_env" --identityHost "identity_env" --username "username" --password "password"')
'adf-cli kubectl-clean-app --host "gateway_env" --modelerUsername "modelerusername" --modelerPassword "modelerpassword" --oauth "identity_env" --username "username" --password "password"')
.option('-h, --host [type]', 'Host gateway')
.option('-o, --oauth [type]', 'Host sso server')
.option('--clientId[type]', 'sso client')
.option('--devopsUsername [type]', 'username of user with ACTIVITI_DEVOPS role')
.option('--devopsPassword [type]', 'password of user with ACTIVITI_DEVOPS role')
.option('--modelerUsername [type]', 'username of a user with role ACTIVIT_MODELER')
.option('--modelerPassword [type]', 'modeler password')
.option('--rancherUsername [type]', 'rancher username')
.option('--rancherPassword [type]', 'rancher password')
.option('--enableLike [boolean]', 'Enable the like for app name')
@@ -282,10 +284,20 @@ async function main(args) {
}
const configModeler = getAlfrescoJsApiInstance(args);
const alfrescoJsApiModeler = await login(args.modelerUsername, args.modelerPassword, configModeler);
const alfrescoJsApiModeler = await login(args.modelerUsername, args.modelerPassword, configModeler).then(() => {
logger.info('login SSO ok');
}, (error) => {
logger.info(`login SSO error ${JSON.stringify(error)}`);
process.exit(1);
});
const configDevops = getAlfrescoJsApiInstance(args);
const alfrescoJsApiDevops = await login(args.devopsUsername, args.devopsPassword, configDevops);
const alfrescoJsApiDevops = await login(args.devopsUsername, args.devopsPassword, configDevops).then(() => {
logger.info('login SSO ok');
}, (error) => {
logger.info(`login SSO error ${JSON.stringify(error)}`);
process.exit(1);
});
if (args.label !== undefined || args.apps !== undefined) {
setCluster(args);