Merge pull request #8 from zowe/v1-final

Final updates for V1
zowe · Aug 9, 2023 · be2e3f3 · be2e3f3
2 parents eb51a4e + cb31474
commit be2e3f3
Show file tree

Hide file tree

Showing 59 changed files with 355 additions and 422 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -2,45 +2,9 @@
 
 All notable changes to the IBM® CICS® Plug-in for Zowe CLI will be documented in this file.
 
-## `5.0.1`
+## Recent Changes
 
-- BugFix: Updated `xml2js` dependency to resolve security vulnerability.
-
-## `5.0.0`
-
-- Major: Updated for V2 compatibility. See the prerelease items below for more details.
-
-## `5.0.0-next.202204141925`
-
-- BugFix: Remove APIML Conn Lookup until the CICS definition for APIML is known.
-
-## `5.0.0-next.202204111400`
-
-- BugFix: Fixed daemon mode prompting
-
-## `5.0.0-next.202202071745`
-
-- BugFix: Pruned dev dependencies from npm-shrinkwrap file.
-
-## `5.0.0-next.202201261655`
-
-- BugFix: Updated dependencies to resolve security vulnerabilities.
-
-## `5.0.0-next.202201241457`
-
-- BugFix: Included an npm-shrinkwrap file to lock-down all transitive dependencies.
-
-## `5.0.0-next.202107021819`
-
-- Enhancement: Add apimlConnLookup properties to enable auto-config through APIML. A valid apiId must still be identified.
-
-## `5.0.0-next.202104261510`
-
-- Remove @zowe/cli peer dependency to better support NPM v7
-
-## `5.0.0-next.202104141723`
-
-- Publish `@next` tag that is compatible with team config profiles.
+- BugFix: Migrated the package the CICS for Zowe Client Monorepo
 
 ## `4.0.7`
 

diff --git a/packages/cli/__tests__/__resources__/properties/example_properties.yaml b/packages/cli/__tests__/__resources__/properties/example_properties.yaml
@@ -6,16 +6,17 @@ zosmf:
   user: &user my-user-name
   password: &pass my-password
   host: &host zosmf-host
-  port: &port zosmf-port
+  port: 443
   rejectUnauthorized: &ru false
-cmci:
+cics:
   user: *user
   password: *pass
   host: *host
-  port: cics-port
-  protocol: https
+  port: 1443
   rejectUnauthorized: *ru
-  csdGroup: cics-group
-  regionName: cics-region
+  protocol: https
+cmci:
+  regionName: region-name
+  csdGroup: CSDGROUP
 urimap:
-  certificate:
+  certificate: " "
diff --git a/packages/cli/__tests__/__resources__/settings/imperative.json b/packages/cli/__tests__/__resources__/settings/imperative.json
diff --git a/packages/cli/__tests__/__src__/environment/TempTestProfiles.ts b/packages/cli/__tests__/__src__/environment/TempTestProfiles.ts
@@ -83,17 +83,17 @@ export class TempTestProfiles {
    */
   private static async createCicsProfile(testEnvironment: ITestEnvironment) {
     const profileName: string = "tmp_cics" + uuidv4();
-    const cmciProps = testEnvironment.systemTestProperties.cmci;
+    const cicsProps = testEnvironment.systemTestProperties.cics;
     let createProfileScript =
       TemporaryScripts.SHEBANG +
-      `${TemporaryScripts.BRIGHT_BIN} profiles create cics ${profileName} --user ${cmciProps.user} -p ` +
-      `${cmciProps.password} ` +
-      ` --host ${cmciProps.host} --port ${cmciProps.port}`;
-    if (cmciProps.protocol != null) {
-      createProfileScript += ` --protocol ${cmciProps.protocol}`;
+      `${TemporaryScripts.BRIGHT_BIN} profiles create cics ${profileName} --user ${cicsProps.user} -p ` +
+      `${cicsProps.password} ` +
+      ` --host ${cicsProps.host} --port ${cicsProps.port}`;
+    if (cicsProps.protocol != null) {
+      createProfileScript += ` --protocol ${cicsProps.protocol}`;
     }
-    if (cmciProps.rejectUnauthorized != null) {
-      createProfileScript += ` --reject-unauthorized ${cmciProps.rejectUnauthorized}`;
+    if (cicsProps.rejectUnauthorized != null) {
+      createProfileScript += ` --reject-unauthorized ${cicsProps.rejectUnauthorized}`;
     }
 
     const scriptPath = testEnvironment.workingDir + "_create_profile_" + profileName;

diff --git a/packages/cli/__tests__/__src__/environment/doc/ITestPropertiesSchema.ts b/packages/cli/__tests__/__src__/environment/doc/ITestPropertiesSchema.ts
@@ -15,45 +15,47 @@
  */
 export interface ITestPropertiesSchema {
   /**
-   * Properties related to connecting to CMCI
+   * Properties related to connecting to CICS
    */
-  cmci: {
+  cics: {
     /**
-     * user ID to connect to CMCI
+     * user ID to connect to CICS
      */
     user: string;
     /**
-     * Password to connect to CMCI
+     * Password to connect to CICS
      */
     password: string;
     /**
-     * host name for  CMCI
+     * host name
      */
     host: string;
     /**
      * Port for CMCI
      */
     port?: number;
     /**
-     * CSD group to define resources to
+     * http or https protocol
      */
-    csdGroup?: string;
+    protocol?: string;
 
     /**
-     * Name of the CICS region e.g. "CICSCMCI"
+     * Whether or not to reject slef-signed certs
      */
-    regionName?: string;
+    rejectUnauthorized?: boolean;
+  };
 
+  cmci: {
     /**
-     * http or https protocol for CMCI
+     * CSD group to define resources to CMCI
      */
-    protocol?: string;
+    csdGroup?: string;
 
     /**
-     * http or https protocol for CMCI
+     * Name of the CICS region e.g. "CICSCMCI"
      */
-    rejectUnauthorized?: boolean;
-  };
+    regionName?: string;
+  }
 
   urimap: {
     /**

diff --git a/...ges/cli/__tests__/__system__/add-to-list/csdGroup/cli.add-to-list.csdGroup.system.test.ts b/...ges/cli/__tests__/__system__/add-to-list/csdGroup/cli.add-to-list.csdGroup.system.test.ts
@@ -31,12 +31,12 @@ describe("CICS add-to-list csdGroup command", () => {
     });
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
   });
 
   afterAll(async () => {

diff --git a/packages/cli/__tests__/__system__/define/program/cli.define.program.system.test.ts b/packages/cli/__tests__/__system__/define/program/cli.define.program.system.test.ts
@@ -33,20 +33,20 @@ describe("CICS define program command", () => {
     });
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
   });
 
   afterAll(async () => {
     await TestEnvironment.cleanUp(TEST_ENVIRONMENT);
   });
 
   const deleteProgram = async (programName: string) => {
-    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cmci;
+    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cics;
     const session = new Session({
       type: "basic",
       hostname: cmciProperties.host,
@@ -59,8 +59,8 @@ describe("CICS define program command", () => {
 
     return CicsCmciRestClient.deleteExpectParsedXml(
       session,
-      `/${CicsCmciConstants.CICS_SYSTEM_MANAGEMENT}/CICSDefinitionProgram/${cmciProperties.regionName}` +
-        `?CRITERIA=(NAME=${programName})&PARAMETER=CSDGROUP(${cmciProperties.csdGroup})`
+      `/${CicsCmciConstants.CICS_SYSTEM_MANAGEMENT}/CICSDefinitionProgram/${regionName}` +
+        `?CRITERIA=(NAME=${programName})&PARAMETER=CSDGROUP(${csdGroup})`
     );
   };
 

diff --git a/packages/cli/__tests__/__system__/define/transaction/cli.define.transaction.system.test.ts b/packages/cli/__tests__/__system__/define/transaction/cli.define.transaction.system.test.ts
@@ -33,20 +33,20 @@ describe("CICS define transaction command", () => {
     });
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
   });
 
   afterAll(async () => {
     await TestEnvironment.cleanUp(TEST_ENVIRONMENT);
   });
 
   const deleteTransaction = async (transactionName: string) => {
-    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cmci;
+    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cics;
     const session = new Session({
       type: "basic",
       hostname: cmciProperties.host,
@@ -59,8 +59,8 @@ describe("CICS define transaction command", () => {
 
     return CicsCmciRestClient.deleteExpectParsedXml(
       session,
-      `/${CicsCmciConstants.CICS_SYSTEM_MANAGEMENT}/${CicsCmciConstants.CICS_DEFINITION_TRANSACTION}/${cmciProperties.regionName}` +
-        `?CRITERIA=(NAME=${transactionName})&PARAMETER=CSDGROUP(${cmciProperties.csdGroup})`
+      `/${CicsCmciConstants.CICS_SYSTEM_MANAGEMENT}/${CicsCmciConstants.CICS_DEFINITION_TRANSACTION}/${regionName}` +
+        `?CRITERIA=(NAME=${transactionName})&PARAMETER=CSDGROUP(${csdGroup})`
     );
   };
 

diff --git a/...ges/cli/__tests__/__system__/define/urimap-client/cli.define.urimap.client.system.test.ts b/...ges/cli/__tests__/__system__/define/urimap-client/cli.define.urimap.client.system.test.ts
@@ -33,15 +33,15 @@ describe("CICS define urimap-client command", () => {
       installPlugin: true,
       tempProfileTypes: ["cics"],
     });
-    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cmci;
+    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cics;
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
     certificate = TEST_ENVIRONMENT.systemTestProperties.urimap.certificate;
     session = new Session({
       type: "basic",

diff --git a/...cli/__tests__/__system__/define/urimap-pipeline/cli.define.urimap.pipeline.system.test.ts b/...cli/__tests__/__system__/define/urimap-pipeline/cli.define.urimap.pipeline.system.test.ts
@@ -32,15 +32,15 @@ describe("CICS define urimap-pipeline command", () => {
       installPlugin: true,
       tempProfileTypes: ["cics"],
     });
-    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cmci;
+    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cics;
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
     session = new Session({
       type: "basic",
       hostname: cmciProperties.host,

diff --git a/...ges/cli/__tests__/__system__/define/urimap-server/cli.define.urimap.server.system.test.ts b/...ges/cli/__tests__/__system__/define/urimap-server/cli.define.urimap.server.system.test.ts
@@ -32,15 +32,15 @@ describe("CICS define urimap-server command", () => {
       installPlugin: true,
       tempProfileTypes: ["cics"],
     });
-    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cmci;
+    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cics;
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
     session = new Session({
       type: "basic",
       hostname: cmciProperties.host,

diff --git a/packages/cli/__tests__/__system__/define/webservice/cli.define.webservice.system.test.ts b/packages/cli/__tests__/__system__/define/webservice/cli.define.webservice.system.test.ts
@@ -34,15 +34,15 @@ describe("CICS define web service command", () => {
       installPlugin: true,
       tempProfileTypes: ["cics"],
     });
-    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cmci;
+    const cmciProperties = TEST_ENVIRONMENT.systemTestProperties.cics;
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
     session = new Session({
       type: "basic",
       hostname: cmciProperties.host,

diff --git a/packages/cli/__tests__/__system__/delete/program/cli.delete.program.system.test.ts b/packages/cli/__tests__/__system__/delete/program/cli.delete.program.system.test.ts
@@ -31,12 +31,12 @@ describe("CICS delete program command", () => {
     });
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
   });
 
   afterAll(async () => {

diff --git a/packages/cli/__tests__/__system__/delete/transaction/cli.delete.transaction.system.test.ts b/packages/cli/__tests__/__system__/delete/transaction/cli.delete.transaction.system.test.ts
@@ -33,12 +33,12 @@ describe("CICS delete transaction command", () => {
     });
     csdGroup = TEST_ENVIRONMENT.systemTestProperties.cmci.csdGroup;
     regionName = TEST_ENVIRONMENT.systemTestProperties.cmci.regionName;
-    host = TEST_ENVIRONMENT.systemTestProperties.cmci.host;
-    port = TEST_ENVIRONMENT.systemTestProperties.cmci.port;
-    user = TEST_ENVIRONMENT.systemTestProperties.cmci.user;
-    password = TEST_ENVIRONMENT.systemTestProperties.cmci.password;
-    protocol = TEST_ENVIRONMENT.systemTestProperties.cmci.protocol;
-    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cmci.rejectUnauthorized;
+    host = TEST_ENVIRONMENT.systemTestProperties.cics.host;
+    port = TEST_ENVIRONMENT.systemTestProperties.cics.port;
+    user = TEST_ENVIRONMENT.systemTestProperties.cics.user;
+    password = TEST_ENVIRONMENT.systemTestProperties.cics.password;
+    protocol = TEST_ENVIRONMENT.systemTestProperties.cics.protocol;
+    rejectUnauthorized = TEST_ENVIRONMENT.systemTestProperties.cics.rejectUnauthorized;
   });
 
   afterAll(async () => {