diff --git a/lib/cli/scripts/init-aae-env.ts b/lib/cli/scripts/init-aae-env.ts index bea635695f..de3c57805f 100644 --- a/lib/cli/scripts/init-aae-env.ts +++ b/lib/cli/scripts/init-aae-env.ts @@ -42,6 +42,7 @@ export interface ConfigArgs { scope: string; host: string; tag: string; + connectorVariables: any; } export const AAE_MICROSERVICES = [ @@ -378,17 +379,18 @@ async function checkIfAppIsReleased(missingApps: any [], tag?: string) { await checkDescriptorExist(currentAbsentApp.name); await sleep(TIME); - const appInfrastructure = { - restconnector: currentAbsentApp.infrastructure?.connectors(), - bridges: currentAbsentApp.infrastructure?.bridges - }; + const appVariables = { + connectors: currentAbsentApp.variables.connectors(args.connectorVariables), + uis: currentAbsentApp.variables.uis, + bridges: currentAbsentApp.variables.bridges + } const deployPayload = { name: currentAbsentApp.name, releaseId: projectRelease.entry.id, security: currentAbsentApp.security, - infrastructure: appInfrastructure, - variables: currentAbsentApp.variables + infrastructure: currentAbsentApp.infrastructure, + variables: appVariables }; await deploy(deployPayload); } @@ -488,6 +490,7 @@ async function main() { .option('--devopsUsername [type]', 'username of a user with role ACTIVIT_DEVOPS') .option('--devopsPassword [type]', 'devops password') .option('--tag [type]', 'tag name of the codebase') + .option('--connectorsVariables [type]', 'connector variables object') .parse(process.argv); if (process.argv.includes('-h') || process.argv.includes('--help')) { @@ -508,7 +511,8 @@ async function main() { tokenEndpoint: options.tokenEndpoint, scope: options.scope, secret: options.secret, - tag: options.tag + tag: options.tag, + connectorVariables: options.connectorVariables }; alfrescoJsApiModeler = getAlfrescoJsApiInstance(args); diff --git a/lib/cli/scripts/resources.ts b/lib/cli/scripts/resources.ts index f123696147..05dfe92675 100644 --- a/lib/cli/scripts/resources.ts +++ b/lib/cli/scripts/resources.ts @@ -215,6 +215,54 @@ export const ACTIVITI_CLOUD_APPS: any = { { role: 'ACTIVITI_ADMIN', groups: [], users: ['processadminuser'] }, { role: 'ACTIVITI_USER', groups: [], users: ['hruser', 'salesuser'] } ] + }, + CONNECTOR_APP: { + name: 'connector-regression', + file_location: (TAG = 'develop') => `https://github.com/Alfresco/alfresco-ng2-components/blob/${TAG}/e2e/resources/activiti7/connector-regression.zip?raw=true`, + processes: { + }, + processesData: { + }, + forms: { + }, + tasks: { + }, + security: [ + { + role: 'ACTIVITI_ADMIN', + groups: [], + users: ['superadminuser', 'processadminuser'] + }, + { + role: 'ACTIVITI_USER', + groups: ['hr', 'sales', 'testgroup'], + users: ['hruser'] + } + ], + infrastructure: { + connectors: { + aspose: {}, + calendar: {}, + comprehend: {}, + content: {}, + 'docusign-connector': {}, + lambda: {}, + mariadb: {}, + rekognition: {}, + rest: {}, + 'salesforce-connector': {}, + slack: {}, + teams: {}, + textract: {}, + transcribe: {}, + twilio: {} + } + }, + variables: { + connectors: (variables: any = {}) => variables, + uis: {}, + bridges: {} + } } }; diff --git a/lib/testing/src/lib/protractor/process-services-cloud/resources/resources.ts b/lib/testing/src/lib/protractor/process-services-cloud/resources/resources.ts index 996a2cb9d9..cdf1529815 100644 --- a/lib/testing/src/lib/protractor/process-services-cloud/resources/resources.ts +++ b/lib/testing/src/lib/protractor/process-services-cloud/resources/resources.ts @@ -493,5 +493,63 @@ export const ACTIVITI_CLOUD_APPS = { users: ['hruser'] } ] + }, + CONNECTOR_APP: { + name: 'simpleapp', + file_location: + 'https://github.com/Alfresco/alfresco-ng2-components/blob/develop/e2e/resources/activiti7/connector-regression.zip?raw=true', + processes: { + }, + processesData: { + }, + forms: { + }, + tasks: { + }, + security: [ + { + role: 'ACTIVITI_ADMIN', + groups: [], + users: ['superadminuser', 'processadminuser'] + }, + { + role: 'ACTIVITI_USER', + groups: ['hr', 'sales', 'testgroup'], + users: ['hruser'] + } + ], + infrastructure: { + connectors: { + aspose: {}, + calendar: {}, + comprehend: {}, + content: {}, + 'docusign-connector': {}, + lambda: {}, + mariadb: {}, + rekognition: {}, + rest: {}, + 'salesforce-connector': {}, + slack: {}, + teams: {}, + textract: {}, + transcribe: {}, + twilio: {} + } + }, + variables: { + connectors: () => {}, + uis: {}, + bridges: {}, + 'content-service': { + storageType: 'site', + storageTarget: 'connector-regression', + defaultStorageTarget: '' + }, + 'identity-service': {}, + 'process-runtime-service': {}, + 'query-service': {}, + 'process-storage-service': {} + } } };