WIP Remove remaining references to V1 profiles

Signed-off-by: Timothy Johnson <[email protected]>
zowe · Aug 21, 2024 · 6ce1d1a · 6ce1d1a
1 parent 6ab6ea9
commit 6ce1d1a
Show file tree

Hide file tree

Showing 99 changed files with 310 additions and 1,098 deletions.
diff --git a/__tests__/__packages__/cli-test-utils/src/TestUtils.ts b/__tests__/__packages__/cli-test-utils/src/TestUtils.ts
@@ -12,7 +12,7 @@
 import * as fs from "fs";
 import { spawnSync, SpawnSyncReturns, ExecFileException } from "child_process";
 import { ITestEnvironment } from "./environment/doc/response/ITestEnvironment";
-import { CommandProfiles, ICommandDefinition, IHandlerParameters } from "@zowe/imperative";
+import { ICommandDefinition, IHandlerParameters } from "@zowe/imperative";
 
 /**
  * Execute a CLI script
@@ -135,8 +135,6 @@ export function mockHandlerParameters(params: PartialHandlerParameters): IHandle
             ...params.arguments || {}
         },
         positionals: params.positionals || [],
-        // eslint-disable-next-line deprecation/deprecation
-        profiles: params.profiles || new CommandProfiles(new Map()),
         definition: params.definition,
         fullDefinition: params.definition,
         stdin: process.stdin,

diff --git a/__tests__/__src__/TestConstants.ts b/__tests__/__src__/TestConstants.ts
@@ -0,0 +1,25 @@
+/*
+* This program and the accompanying materials are made available under the terms of the
+* Eclipse Public License v2.0 which accompanies this distribution, and is available at
+* https://www.eclipse.org/legal/epl-v20.html
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Copyright Contributors to the Zowe Project.
+*
+*/
+
+// Some test constants that are needed by multiple packages for unit tests
+
+// Mocked profile options to be added to args
+export const UNIT_TEST_ZOSMF_PROF_OPTS = {
+    host: "somewhere.com",
+    port: "43443",
+    user: "someone",
+    password: "somesecret"
+};
+
+export const UNIT_TEST_TSO_PROF_OPTS = {
+    password: "fake",
+    account: "fake"
+};
diff --git a/__tests__/__src__/mocks/ZosmfProfileMock.ts b/__tests__/__src__/mocks/ZosmfProfileMock.ts
diff --git a/...s/cli/__tests__/provisioning/__unit__/delete/instance/DeleteInstance.handler.unit.test.ts b/...s/cli/__tests__/provisioning/__unit__/delete/instance/DeleteInstance.handler.unit.test.ts
@@ -19,17 +19,13 @@ import {
     ListRegistryInstances,
     ProvisioningConstants
 } from "@zowe/provisioning-for-zowe-sdk";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "delete", "instance"],
-    definition: DeleteInstanceDefinition.DeleteInstanceDefinition,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: DeleteInstanceDefinition.DeleteInstanceDefinition
 });
 
 describe("delete deprovisioned instance handler tests", () => {

diff --git a/...tests__/provisioning/__unit__/list/catalogTemplates/CatalogTemplates.handler.unit.test.ts b/...tests__/provisioning/__unit__/list/catalogTemplates/CatalogTemplates.handler.unit.test.ts
@@ -14,19 +14,15 @@ import { ListCatalogTemplates } from "@zowe/provisioning-for-zowe-sdk";
 import { IHandlerParameters } from "@zowe/imperative";
 import * as Handler from "../../../../../src/provisioning/list/catalogTemplates/CatalogTemplates.handler";
 import { catalogTemplates } from "../../../../../src/provisioning/list/catalogTemplates/CatalogTemplates.definition";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 jest.mock("../../../../../../../packages/provisioning/src/ListCatalogTemplates");
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "list", "catalog-templates"],
-    definition: catalogTemplates,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: catalogTemplates
 });
 
 describe("list catalog templates handler tests", () => {

diff --git a/...s/cli/__tests__/provisioning/__unit__/list/instanceInfo/InstanceInfo.handler.unit.test.ts b/...s/cli/__tests__/provisioning/__unit__/list/instanceInfo/InstanceInfo.handler.unit.test.ts
@@ -18,17 +18,13 @@ import {
 import * as Handler from "../../../../../src/provisioning/list/instanceInfo/InstanceInfo.handler";
 import { instanceInfo } from "../../../../../src/provisioning/list/instanceInfo/InstanceInfo.definition";
 import { ProvisioningListMocks } from "../../../__resources__/ProvisioningListMocks";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "list", "instance-info"],
-    definition: instanceInfo,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: instanceInfo
 });
 
 describe("list instance info handler tests", () => {

diff --git a/.../__tests__/provisioning/__unit__/list/instanceVars/InstanceVariables.handler.unit.test.ts b/.../__tests__/provisioning/__unit__/list/instanceVars/InstanceVariables.handler.unit.test.ts
@@ -16,17 +16,13 @@ import { IHandlerParameters } from "@zowe/imperative";
 import * as Handler from "../../../../../src/provisioning/list/instanceVariables/InstanceVariables.handler";
 import { instanceVariables } from "../../../../../src/provisioning/list/instanceVariables/InstanceVariables.definition";
 import { ProvisioningListMocks } from "../../../__resources__/ProvisioningListMocks";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "list", "instance-variables"],
-    definition: instanceVariables,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: instanceVariables
 });
 
 describe("list instance variables handler tests", () => {

diff --git a/...sts__/provisioning/__unit__/list/registryInstances/RegistryInstances.handler.unit.test.ts b/...sts__/provisioning/__unit__/list/registryInstances/RegistryInstances.handler.unit.test.ts
@@ -13,19 +13,15 @@ import { ListRegistryInstances } from "@zowe/provisioning-for-zowe-sdk";
 import { IHandlerParameters } from "@zowe/imperative";
 import * as Handler from "../../../../../src/provisioning/list/registry/RegistryInstances.handler";
 import { registryInstances } from "../../../../../src/provisioning/list/registry/RegistryInstances.definition";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 jest.mock("@zowe/provisioning-for-zowe-sdk");
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "list", "catalog-templates"],
-    definition: registryInstances,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: registryInstances
 });
 
 describe("list registry instances handler tests", () => {

diff --git a/...s/cli/__tests__/provisioning/__unit__/list/templateInfo/TemplateInfo.handler.unit.test.ts b/...s/cli/__tests__/provisioning/__unit__/list/templateInfo/TemplateInfo.handler.unit.test.ts
@@ -14,17 +14,13 @@ import { ListTemplateInfo } from "@zowe/provisioning-for-zowe-sdk";
 import { IHandlerParameters } from "@zowe/imperative";
 import * as Handler from "../../../../../src/provisioning/list/templateInfo/TemplateInfo.handler";
 import { templateInfo } from "../../../../../src/provisioning/list/templateInfo/TemplateInfo.definition";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "list", "catalog-templates"],
-    definition: templateInfo,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: templateInfo
 });
 
 describe("list template info handler tests", () => {

diff --git a/packages/cli/__tests__/provisioning/__unit__/perform/action/Action.handler.unit.test.ts b/packages/cli/__tests__/provisioning/__unit__/perform/action/Action.handler.unit.test.ts
@@ -20,17 +20,13 @@ import {
 import { IHandlerParameters } from "@zowe/imperative";
 import * as ActionHandler from "../../../../../src/provisioning/perform/action/Action.handler";
 import * as ActionDefinition from "../../../../../src/provisioning/perform/action/Action.definition";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "perform", "action"],
-    definition: ActionDefinition.ActionDefinition,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: ActionDefinition.ActionDefinition
 });
 
 describe("perform action handler tests", () => {

diff --git a/...ages/cli/__tests__/provisioning/__unit__/provision/template/Template.handler.unit.test.ts b/...ages/cli/__tests__/provisioning/__unit__/provision/template/Template.handler.unit.test.ts
@@ -18,17 +18,13 @@ import { ProvisionTemplateData } from "../../../__resources__/ProvisionTemplateD
 import { IHandlerParameters, ImperativeError } from "@zowe/imperative";
 import * as TemplateHandler from "../../../../../src/provisioning/provision/template/Template.handler";
 import * as TemplateDefinition from "../../../../../src/provisioning/provision/template/Template.definition";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["provisioning", "provision", "template"],
-    definition: TemplateDefinition.TemplateDefinition,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: TemplateDefinition.TemplateDefinition
 });
 
 describe("provision template handler tests", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/ds/Dataset.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Get } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { DiffUtils, IDiffOptions, ImperativeError } from "@zowe/imperative";
 
 describe("Compare data set handler", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/lf-ds/LocalfileDataset.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/lf-ds/LocalfileDataset.handler.unit.test.ts
@@ -12,7 +12,7 @@
 jest.mock("fs");
 
 import { Get } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { DiffUtils, IDiffOptions, ImperativeError } from "@zowe/imperative";
 import * as fs from "fs";
 describe("Compare local-file and data-set handler", () => {

diff --git a/...ages/cli/__tests__/zosfiles/__unit__/compare/lf-sdd/LocalfileSpooldd.handler.unit.test.ts b/...ages/cli/__tests__/zosfiles/__unit__/compare/lf-sdd/LocalfileSpooldd.handler.unit.test.ts
@@ -12,7 +12,7 @@
 jest.mock("fs");
 
 import { GetJobs } from "@zowe/zos-jobs-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { DiffUtils, IDiffOptions, ImperativeError } from "@zowe/imperative";
 import * as fs from "fs";
 

diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/lf-uss/LocalfileUss.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/lf-uss/LocalfileUss.handler.unit.test.ts
@@ -12,7 +12,7 @@
 jest.mock("fs");
 
 import { Get } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { DiffUtils, IDiffOptions } from "@zowe/imperative";
 import * as fs from "fs";
 

diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/sdd/Spooldd.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/sdd/Spooldd.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { GetJobs } from "@zowe/zos-jobs-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { DiffUtils, IDiffOptions, ImperativeError } from "@zowe/imperative";
 
 describe("Compare spooldd handler", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/compare/uss/UssFile.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/compare/uss/UssFile.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Get } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { DiffUtils, IDiffOptions, ImperativeError } from "@zowe/imperative";
 
 describe("Compare data set handler", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/copy/dsclp/TargetProfile.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/copy/dsclp/TargetProfile.handler.unit.test.ts
@@ -12,17 +12,13 @@
 import { IHandlerParameters, ImperativeConfig, ImperativeError } from "@zowe/imperative";
 import TargetProfileHandler from "../../../../../src/zosfiles/copy/dsclp/TargetProfile.handler";
 import { DsclpDefinition } from "../../../../../src/zosfiles/copy/dsclp/Dsclp.definition";
-import {
-    UNIT_TEST_ZOSMF_PROF_OPTS,
-    UNIT_TEST_PROFILES_ZOSMF
-} from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 import { mockHandlerParameters } from "@zowe/cli-test-utils";
 
 const DEFAULT_PARAMETERS: IHandlerParameters = mockHandlerParameters({
     arguments: UNIT_TEST_ZOSMF_PROF_OPTS,
     positionals: ["files", "copy", "data-set-cross-lpar"],
-    definition: DsclpDefinition,
-    profiles: UNIT_TEST_PROFILES_ZOSMF
+    definition: DsclpDefinition
 });
 
 describe("TargetProfileHandler", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/create/binaryPds/BinaryPDS.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/create/binaryPds/BinaryPDS.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 
 describe("Create binary PDS data set handler", () => {
     describe("process method", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/create/cPds/CPDS.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/create/cPds/CPDS.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 
 describe("Create C-code PDS data set handler", () => {
     describe("process method", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/create/classicPds/ClassicPDS.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/create/classicPds/ClassicPDS.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 
 describe("Create classic PDS data set handler", () => {
     describe("process method", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/create/ds/ds.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/create/ds/ds.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 
 describe("Create data set handler", () => {
     describe("process method", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/create/pds/Pds.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/create/pds/Pds.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 
 describe("Create PDS data set handler", () => {
     describe("process method", () => {

diff --git a/packages/cli/__tests__/zosfiles/__unit__/create/ps/Ps.handler.unit.test.ts b/packages/cli/__tests__/zosfiles/__unit__/create/ps/Ps.handler.unit.test.ts
@@ -10,7 +10,7 @@
 */
 
 import { Create, CreateDataSetTypeEnum } from "@zowe/zos-files-for-zowe-sdk";
-import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/mocks/ZosmfProfileMock";
+import { UNIT_TEST_ZOSMF_PROF_OPTS } from "../../../../../../../__tests__/__src__/TestConstants";
 
 describe("Create PS data set handler", () => {
     describe("process method", () => {