Skip to content

Commit

Permalink
Merge branch 'master' into port_etag_to_master
Browse files Browse the repository at this point in the history
  • Loading branch information
@zFernand0
zFernand0 authored Feb 6, 2020
2 parents f2a901a + 3b44bb7 commit f320dbc
Show file tree
Hide file tree
Showing 245 changed files with 671 additions and 670 deletions.
58 changes: 29 additions & 29 deletions packages/imperative.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const config: IImperativeConfig = {
logging: {
appLogging: {
logFile: Constants.LOG_LOCATION
},
}
},
profiles: [
{
Expand All @@ -48,32 +48,32 @@ const config: IImperativeConfig = {
properties: {
host: {
type: "string",
optionDefinition: ZosmfSession.ZOSMF_OPTION_HOST,
optionDefinition: ZosmfSession.ZOSMF_OPTION_HOST
},
port: {
type: "number",
optionDefinition: ZosmfSession.ZOSMF_OPTION_PORT,
optionDefinition: ZosmfSession.ZOSMF_OPTION_PORT
},
user: {
type: "string",
secure: true,
optionDefinition: ZosmfSession.ZOSMF_OPTION_USER,
optionDefinition: ZosmfSession.ZOSMF_OPTION_USER
},
password: {
type: "string",
secure: true,
optionDefinition: ZosmfSession.ZOSMF_OPTION_PASSWORD,
optionDefinition: ZosmfSession.ZOSMF_OPTION_PASSWORD
},
rejectUnauthorized: {
type: "boolean",
optionDefinition: ZosmfSession.ZOSMF_OPTION_REJECT_UNAUTHORIZED,
optionDefinition: ZosmfSession.ZOSMF_OPTION_REJECT_UNAUTHORIZED
},
basePath: {
type: "string",
optionDefinition: ZosmfSession.ZOSMF_OPTION_BASE_PATH,
},
optionDefinition: ZosmfSession.ZOSMF_OPTION_BASE_PATH
}
},
required: ["host"],
required: ["host"]
},
createProfileExamples: [
{
Expand Down Expand Up @@ -107,34 +107,34 @@ const config: IImperativeConfig = {
properties: {
account: {
type: "string",
optionDefinition: TSO_OPTION_ACCOUNT,
optionDefinition: TSO_OPTION_ACCOUNT
},
characterSet: {
type: "string",
optionDefinition: TSO_OPTION_CHAR_SET,
optionDefinition: TSO_OPTION_CHAR_SET
},
codePage: {
type: "string",
optionDefinition: TSO_OPTION_CODE_PAGE,
optionDefinition: TSO_OPTION_CODE_PAGE
},
columns: {
type: "number",
optionDefinition: TSO_OPTION_COLUMNS,
optionDefinition: TSO_OPTION_COLUMNS
},
logonProcedure: {
type: "string",
optionDefinition: TSO_OPTION_LOGON_PROCEDURE,
optionDefinition: TSO_OPTION_LOGON_PROCEDURE
},
regionSize: {
type: "number",
optionDefinition: TSO_OPTION_REGION_SIZE,
optionDefinition: TSO_OPTION_REGION_SIZE
},
rows: {
type: "number",
optionDefinition: TSO_OPTION_ROWS,
},
optionDefinition: TSO_OPTION_ROWS
}
},
required: ["account"],
required: ["account"]
},
createProfileExamples: [
{
Expand Down Expand Up @@ -163,36 +163,36 @@ const config: IImperativeConfig = {
properties: {
host: {
type: "string",
optionDefinition: SshSession.SSH_OPTION_HOST,
optionDefinition: SshSession.SSH_OPTION_HOST
},
port: {
type: "number",
optionDefinition: SshSession.SSH_OPTION_PORT,
optionDefinition: SshSession.SSH_OPTION_PORT
},
user: {
type: "string",
optionDefinition: SshSession.SSH_OPTION_USER,
optionDefinition: SshSession.SSH_OPTION_USER
},
password: {
type: "string",
secure: true,
optionDefinition: SshSession.SSH_OPTION_PASSWORD,
optionDefinition: SshSession.SSH_OPTION_PASSWORD
},
privateKey: {
type: "string",
optionDefinition: SshSession.SSH_OPTION_PRIVATEKEY,
optionDefinition: SshSession.SSH_OPTION_PRIVATEKEY
},
keyPassphrase: {
type: "string",
secure: true,
optionDefinition: SshSession.SSH_OPTION_KEYPASSPHRASE,
optionDefinition: SshSession.SSH_OPTION_KEYPASSPHRASE
},
handshakeTimeout: {
type: "number",
optionDefinition: SshSession.SSH_OPTION_HANDSHAKETIMEOUT,
},
optionDefinition: SshSession.SSH_OPTION_HANDSHAKETIMEOUT
}
},
required: ["host", "user"],
required: ["host", "user"]
},
createProfileExamples: [
{
Expand All @@ -208,9 +208,9 @@ const config: IImperativeConfig = {
description: "Create a ssh profile called 'ssh333' to connect to z/OS SSH server at host 'zos123' " +
"using a privatekey '/path/to/privatekey' and its decryption passphrase 'privateKeyPassphrase' " +
"for privatekey authentication"
},
}
]
},
}

]
};
Expand Down
4 changes: 2 additions & 2 deletions packages/provisioning/__tests__/__resources__/api/ProvisioningListMocks.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class ProvisioningListMocks {
"generated-name": "cics_empty_wait.3.TeaCoffeeDomain",
"object-id": "cd4ad08e-3d40-4ed8-87f1-f77aae2dfef7",
"domain-name": "TeaCoffeeDomain",
"software-name": "CICS Transaction Server for z/OS",
"software-name": "CICS Transaction Server for z/OS"
}
]
};
Expand Down Expand Up @@ -71,7 +71,7 @@ export class ProvisioningListMocks {
"tenant-name": "ProvisionTenant",
"domain-id": "IYU3",
"domain-name": "ProvisionDomain",
"system-nickname": "CA32",
"system-nickname": "CA32"
}]
};

Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/__tests__/__system__/api/DeleteInstance.system.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
noSessionProvisioning,
nozOSMFVersion,
PerformAction,
ProvisioningConstants,
ProvisioningConstants
} from "../../../";
import { ProvisioningTestUtils } from "../../__resources__/utils/ProvisioningTestUtils";

Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/__tests__/__system__/api/ListRegistryInstances.system.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
ListRegistryInstances,
noSessionProvisioning,
nozOSMFVersion,
ProvisioningConstants,
ProvisioningConstants
} from "../../../";
import { ProvisioningTestUtils } from "../../__resources__/utils/ProvisioningTestUtils";

Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/__tests__/__system__/api/PerformAction.system.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
noSessionProvisioning,
nozOSMFVersion,
PerformAction,
ProvisioningConstants,
ProvisioningConstants
} from "../../../";
import { ProvisioningTestUtils } from "../../__resources__/utils/ProvisioningTestUtils";

Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/__tests__/__system__/api/ProvisionPublishedTemplate.system.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
noTemplateName,
nozOSMFVersion,
ProvisioningConstants,
ProvisionPublishedTemplate,
ProvisionPublishedTemplate
} from "../../../";
import { ProvisioningTestUtils } from "../../__resources__/utils/ProvisioningTestUtils";

Expand Down
2 changes: 1 addition & 1 deletion ...visioning/__tests__/__system__/cli/delete/cli.provisioning.delete.instance.system.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe("provisioning delete instance without profiles", () => {
// Create a separate test environment for no profiles
beforeAll(async () => {
TEST_ENVIRONMENT_NO_PROF = await TestEnvironment.setUp({
testName: "provisioning_delete_instance_no_profile",
testName: "provisioning_delete_instance_no_profile"
});

zOSMF = TEST_ENVIRONMENT_NO_PROF.systemTestProperties.zosmf;
Expand Down
2 changes: 1 addition & 1 deletion ...g/__tests__/__system__/cli/list/instanceInfo/cli.provisioning.instanceInfo.system.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ describe("provisioning list instance-info", () => {
// Create a separate test environment for no profiles
beforeAll(async () => {
TEST_ENVIRONMENT_NO_PROF = await TestEnvironment.setUp({
testName: "provisioning_list_instance_info_no_profile",
testName: "provisioning_list_instance_info_no_profile"
});
zOSMF = TEST_ENVIRONMENT_NO_PROF.systemTestProperties.zosmf;
});
Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/__tests__/api/ListCatalogTemplates.unit.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const ZOSMF_RESPONSE: any = {
"last-modified-time": "2016-11-18T20:28:43.951Z",
"template-type": "standard",
"composite-parents": []
},
}
]
};

Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/__tests__/api/ListInstanceInfo.unit.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const ZOSMF_RESPONSE: IProvisionedInstance = {
"account-info": null,
"runAsUser-audit": true,
"workflow-start-time": "2017-04-17T14:52:03.537Z",
"workflow-stop-time": "2017-04-17T14:52:03.568Z",
"workflow-stop-time": "2017-04-17T14:52:03.568Z"
};

function expectZosmfResponseSucceeded(response: any, error: ImperativeError) {
Expand Down
4 changes: 2 additions & 2 deletions packages/provisioning/__tests__/api/ListRegistryInstances.unit.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const ZOSMF_RESPONSE: IProvisionedInstances = {
"tenant-name": "",
"domain-id": "",
"domain-name": "",
"system-nickname": "",
"system-nickname": ""
},
{
"system": "system2",
Expand Down Expand Up @@ -93,7 +93,7 @@ const ZOSMF_RESPONSE: IProvisionedInstances = {
"tenant-name": "",
"domain-id": "",
"domain-name": "",
"system-nickname": "",
"system-nickname": ""
}
]
};
Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/src/api/doc/zosmf/IProvisionedInstance.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ const prettyFull: {
export const explainProvisionedInstanceSummary: IExplanationMap = {
...prettySummary,
ignoredKeys: "variables,actions",
explainedParentKey: null,
explainedParentKey: null
};

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/provisioning/src/api/doc/zosmf/IProvisionedInstanceActions.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const prettyFull: {
"command-detect-time": "Command Detect Time",
"workflow-definition-file": "Workflow Definition File",
"workflow-variable-input-file": "Workflow Variable Input File",
"workflow-clean-after-complete": "Workflow Clean After Complete",
"workflow-clean-after-complete": "Workflow Clean After Complete"
};

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/provisioning/src/api/doc/zosmf/IProvisionedInstances.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface IProvisionedInstances {
export const explainProvisionedInstancesSummary: IExplanationMap = {
"scr-list": explainProvisionedInstanceSummary,
"explainedParentKey": null,
"ignoredKeys": null,
"ignoredKeys": null
};

/**
Expand All @@ -46,5 +46,5 @@ export const explainProvisionedInstancesSummary: IExplanationMap = {
export const explainProvisionedInstancesFull: IExplanationMap = {
"scr-list": explainProvisionedInstanceFull,
"explainedParentKey": null,
"ignoredKeys": null,
"ignoredKeys": null
};
4 changes: 2 additions & 2 deletions packages/provisioning/src/api/doc/zosmf/IPublishedTemplateInfo.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const prettySummary: {
"state": "State",
"description": "Description",
"generated-name": "Generated Name",
"object-id": "Object Id",
"object-id": "Object Id"
};

/**
Expand All @@ -116,7 +116,7 @@ const prettyFull: {
} = {
...prettySummary,
"domain-name": "Domain Name",
"software-name": "Software Name",
"software-name": "Software Name"
};

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/provisioning/src/api/doc/zosmf/IPublishedTemplates.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface IPublishedTemplates {
export const explainPublishedTemplatesSummary: IExplanationMap = {
"psc-list": explainPublishedTemplateSummary,
"explainedParentKey": null,
"ignoredKeys": null,
"ignoredKeys": null
};

/**
Expand All @@ -46,5 +46,5 @@ export const explainPublishedTemplatesSummary: IExplanationMap = {
export const explainPublishedTemplatesFull: IExplanationMap = {
"psc-list": explainPublishedTemplateFull,
"explainedParentKey": null,
"ignoredKeys": null,
"ignoredKeys": null
};
2 changes: 1 addition & 1 deletion packages/provisioning/src/cli/delete/Delete.definition.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ export const DeleteCommand: ICommandDefinition = {
type: "group",
summary: "Delete instance.",
description: "Deletes instance previously provisioned with z/OSMF cloud provisioning services.",
children: [DeleteInstanceDefinition],
children: [DeleteInstanceDefinition]
};
4 changes: 2 additions & 2 deletions packages/provisioning/src/cli/delete/instance/DeleteInstance.definition.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ export const DeleteInstanceDefinition: ICommandDefinition = {
name: "name",
type: "string",
description: "Deprovisioned Instance name.",
required: true,
required: true
}
],
examples: [
{
description: `Delete deprovisioned instance "instance1"`,
options: "instance1",
options: "instance1"
}
]
};
2 changes: 1 addition & 1 deletion packages/provisioning/src/cli/list/List.definition.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ export const ListCommand: ICommandDefinition = {
summary: "List Provisioning Information",
description: "Lists z/OSMF provisioning information such as the provisioned " +
"instances from the registry, the provisioned instance details, the available provisioning templates and provisioning template details.",
children: [templateInfo, catalogTemplates, instanceInfo, instanceVariables, registryInstances],
children: [templateInfo, catalogTemplates, instanceInfo, instanceVariables, registryInstances]
};
2 changes: 1 addition & 1 deletion packages/provisioning/src/cli/list/catalogTemplates/CatalogTemplates.definition.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const catalogTemplates: ICommandDefinition = {
examples: [
{
description: "List all published templates in the z/OSMF service catalog (with full detail)",
options: "--all-info",
options: "--all-info"
}
]
};
6 changes: 3 additions & 3 deletions packages/provisioning/src/cli/list/instanceInfo/InstanceInfo.definition.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const instanceInfo: ICommandDefinition = {
name: "name",
type: "string",
description: "Provisioned Instance Name",
required: true,
required: true
}
],
options: [
Expand All @@ -49,11 +49,11 @@ export const instanceInfo: ICommandDefinition = {
examples: [
{
description: "List summary information with a list of actions for an instance with the name \"instance1\"",
options: "instance1",
options: "instance1"
},
{
description: "Show extended general information with actions for a provisioned instance with the name \"instance1\"",
options: "instance1 --display extended",
options: "instance1 --display extended"
}
]
};
Loading

0 comments on commit f320dbc

Please sign in to comment.