From 511e708c7f14e629cf70d32b9665dcdacdbe48fd Mon Sep 17 00:00:00 2001 From: Dennis Seah Date: Wed, 18 Mar 2020 18:05:27 -0700 Subject: [PATCH] disable eslint camel case check --- src/commands/deployment/dashboard.test.ts | 17 ++-- src/commands/deployment/validate.test.ts | 25 ++--- src/commands/init.test.ts | 29 +++--- src/commands/init.ts | 11 ++- src/commands/setup.test.ts | 13 +-- src/commands/setup.ts | 17 ++-- src/lib/pipelines/serviceEndpoint.test.ts | 107 +++++++++++----------- src/lib/pipelines/variableGroup.test.ts | 49 +++++----- src/lib/setup/prompt.test.ts | 43 ++++----- 9 files changed, 160 insertions(+), 151 deletions(-) diff --git a/src/commands/deployment/dashboard.test.ts b/src/commands/deployment/dashboard.test.ts index 7a8d64c8e..4dd933522 100644 --- a/src/commands/deployment/dashboard.test.ts +++ b/src/commands/deployment/dashboard.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ jest.mock("open"); import open from "open"; jest.mock("../../config"); @@ -30,18 +31,18 @@ afterAll(() => { const mockConfig = (): void => { (Config as jest.Mock).mockReturnValueOnce({ - "azure_devops": { - "access_token": uuid(), + azure_devops: { + access_token: uuid(), org: uuid(), project: uuid() }, introspection: { azure: { - "account_name": uuid(), + account_name: uuid(), key: uuid(), - "partition_key": uuid(), - "source_repo_access_token": "test_token", - "table_name": uuid() + partition_key: uuid(), + source_repo_access_token: "test_token", + table_name: uuid() } } }); @@ -208,8 +209,8 @@ describe("Fallback to azure devops access token", () => { describe("Extract manifest repository information", () => { test("Manifest repository information is successfully extracted", () => { (Config as jest.Mock).mockReturnValue({ - "azure_devops": { - "manifest_repository": + azure_devops: { + manifest_repository: "https://dev.azure.com/bhnook/fabrikam/_git/materialized" } }); diff --git a/src/commands/deployment/validate.test.ts b/src/commands/deployment/validate.test.ts index 5e93c9c24..3de9a76ba 100644 --- a/src/commands/deployment/validate.test.ts +++ b/src/commands/deployment/validate.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ // imports import uuid from "uuid/v4"; import * as deploymenttable from "../../lib/azure/deploymenttable"; @@ -134,16 +135,16 @@ afterAll(() => { describe("Validate deployment configuration", () => { test("valid deployment configuration", async () => { const config: ConfigYaml = { - "azure_devops": { + azure_devops: { org: uuid(), project: uuid() }, introspection: { azure: { - "account_name": uuid(), + account_name: uuid(), key: Promise.resolve(uuid()), - "partition_key": uuid(), - "table_name": uuid() + partition_key: uuid(), + table_name: uuid() } } }; @@ -210,7 +211,7 @@ describe("test runSelfTest function", () => { introspection: { azure: { key: Promise.resolve(uuid()), - "table_name": undefined + table_name: undefined } } }; @@ -229,7 +230,7 @@ describe("test runSelfTest function", () => { introspection: { azure: { key: Promise.resolve(uuid()), - "table_name": undefined + table_name: undefined } } }; @@ -244,7 +245,7 @@ describe("test runSelfTest function", () => { introspection: { azure: { key: Promise.resolve(uuid()), - "table_name": undefined + table_name: undefined } } }; @@ -277,7 +278,7 @@ describe("Validate missing deployment.storage configuration", () => { const config: ConfigYaml = { introspection: { azure: { - "account_name": undefined, + account_name: undefined, key: Promise.resolve(uuid()) } } @@ -292,7 +293,7 @@ describe("Validate missing deployment.storage configuration", () => { introspection: { azure: { key: Promise.resolve(uuid()), - "table_name": undefined + table_name: undefined } } }; @@ -306,7 +307,7 @@ describe("Validate missing deployment.storage configuration", () => { introspection: { azure: { key: Promise.resolve(uuid()), - "partition_key": undefined + partition_key: undefined } } }; @@ -343,7 +344,7 @@ describe("Validate missing deployment.pipeline configuration", () => { describe("Validate missing deployment.pipeline configuration", () => { test("missing deployment.pipeline.org configuration", async () => { const config: ConfigYaml = { - "azure_devops": { + azure_devops: { org: undefined }, introspection: { @@ -359,7 +360,7 @@ describe("Validate missing deployment.pipeline configuration", () => { describe("Validate missing deployment.pipeline configuration", () => { test("missing deployment.pipeline.project configuration", async () => { const config: ConfigYaml = { - "azure_devops": { + azure_devops: { org: "org", project: undefined }, diff --git a/src/commands/init.test.ts b/src/commands/init.test.ts index d1fb26609..707df719b 100644 --- a/src/commands/init.test.ts +++ b/src/commands/init.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ import axios from "axios"; import fs from "fs"; import inquirer from "inquirer"; @@ -106,8 +107,8 @@ describe("Test execute function", () => { describe("test getConfig function", () => { it("with configuration file", () => { const mockedValues = { - "azure_devops": { - "access_token": "access_token", + azure_devops: { + access_token: "access_token", org: "org", project: "project" } @@ -124,8 +125,8 @@ describe("test getConfig function", () => { }); const cfg = getConfig(); expect(cfg).toStrictEqual({ - "azure_devops": { - "access_token": "", + azure_devops: { + access_token: "", org: "", project: "" } @@ -141,7 +142,7 @@ describe("test validatePersonalAccessToken function", () => { }) ); const result = await validatePersonalAccessToken({ - "access_token": "token", + access_token: "token", org: "org", project: "project" }); @@ -153,7 +154,7 @@ describe("test validatePersonalAccessToken function", () => { .spyOn(axios, "get") .mockReturnValueOnce(Promise.reject(new Error("fake"))); const result = await validatePersonalAccessToken({ - "access_token": "token", + access_token: "token", org: "org", project: "project" }); @@ -166,16 +167,16 @@ const testHandleInteractiveModeFunc = async ( verified: boolean ): Promise => { jest.spyOn(init, "getConfig").mockReturnValueOnce({ - "azure_devops": { - "access_token": "", + azure_devops: { + access_token: "", org: "", project: "" } }); jest.spyOn(init, "prompt").mockResolvedValueOnce({ - "azdo_org_name": "org_name", - "azdo_pat": "pat", - "azdo_project_name": "project" + azdo_org_name: "org_name", + azdo_pat: "pat", + azdo_project_name: "project" }); jest .spyOn(init, "validatePersonalAccessToken") @@ -206,9 +207,9 @@ describe("test handleInteractiveMode function", () => { describe("test prompt function", () => { it("positive test", async done => { const answers = { - "azdo_org_name": "org", - "azdo_pat": "pat", - "azdo_project_name": "project" + azdo_org_name: "org", + azdo_pat: "pat", + azdo_project_name: "project" }; jest.spyOn(inquirer, "prompt").mockResolvedValueOnce(answers); const ans = await prompt({}); diff --git a/src/commands/init.ts b/src/commands/init.ts index e3c96806a..34c61c77e 100644 --- a/src/commands/init.ts +++ b/src/commands/init.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ import axios from "axios"; import commander from "commander"; import fs from "fs"; @@ -76,9 +77,9 @@ export const prompt = async (curConfig: ConfigYaml): Promise => { ]; const answers = await inquirer.prompt(questions); return { - "azdo_org_name": answers.azdo_org_name as string, - "azdo_pat": answers.azdo_pat as string, - "azdo_project_name": answers.azdo_project_name as string + azdo_org_name: answers.azdo_org_name as string, + azdo_pat: answers.azdo_pat as string, + azdo_project_name: answers.azdo_project_name as string }; }; @@ -93,8 +94,8 @@ export const getConfig = (): ConfigYaml => { } catch (_) { // current config is not found. return { - "azure_devops": { - "access_token": "", + azure_devops: { + access_token: "", org: "", project: "" } diff --git a/src/commands/setup.test.ts b/src/commands/setup.test.ts index 12dbd7177..6b7d5c4f0 100644 --- a/src/commands/setup.test.ts +++ b/src/commands/setup.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ import path from "path"; import { readYaml } from "../config"; import * as config from "../config"; @@ -37,7 +38,7 @@ describe("test createSPKConfig function", () => { createSPKConfig(mockRequestContext); const data = readYaml(tmpFile); expect(data.azure_devops).toStrictEqual({ - "access_token": "pat", + access_token: "pat", org: "orgname", project: "project" }); @@ -56,16 +57,16 @@ describe("test createSPKConfig function", () => { const data = readYaml(tmpFile); expect(data.azure_devops).toStrictEqual({ - "access_token": "pat", + access_token: "pat", org: "orgname", project: "project" }); expect(data.introspection).toStrictEqual({ azure: { - "service_principal_id": rc.servicePrincipalId, - "service_principal_secret": rc.servicePrincipalPassword, - "subscription_id": rc.subscriptionId, - "tenant_id": rc.servicePrincipalTenantId + service_principal_id: rc.servicePrincipalId, + service_principal_secret: rc.servicePrincipalPassword, + subscription_id: rc.subscriptionId, + tenant_id: rc.servicePrincipalTenantId } }); }); diff --git a/src/commands/setup.ts b/src/commands/setup.ts index a93bec0d6..fb2d5f7ca 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ import commander from "commander"; import fs from "fs"; import yaml from "js-yaml"; @@ -45,23 +46,23 @@ interface APIError { export const createSPKConfig = (rc: RequestContext): void => { const data = rc.toCreateAppRepo ? { - "azure_devops": { - "access_token": rc.accessToken, + azure_devops: { + access_token: rc.accessToken, org: rc.orgName, project: rc.projectName }, introspection: { azure: { - "service_principal_id": rc.servicePrincipalId, - "service_principal_secret": rc.servicePrincipalPassword, - "subscription_id": rc.subscriptionId, - "tenant_id": rc.servicePrincipalTenantId + service_principal_id: rc.servicePrincipalId, + service_principal_secret: rc.servicePrincipalPassword, + subscription_id: rc.subscriptionId, + tenant_id: rc.servicePrincipalTenantId } } } : { - "azure_devops": { - "access_token": rc.accessToken, + azure_devops: { + access_token: rc.accessToken, org: rc.orgName, project: rc.projectName } diff --git a/src/lib/pipelines/serviceEndpoint.test.ts b/src/lib/pipelines/serviceEndpoint.test.ts index 374d530cc..0a8b0e87d 100644 --- a/src/lib/pipelines/serviceEndpoint.test.ts +++ b/src/lib/pipelines/serviceEndpoint.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ import { IRestResponse } from "typed-rest-client"; import uuid from "uuid/v4"; import { Config, readYaml } from "../../config"; @@ -26,22 +27,22 @@ const servicePrincipalSecret: string = uuid(); const tenantId: string = uuid(); const mockedConfig = { - "azure_devops": { + azure_devops: { orrg: uuid() } }; const mockedYaml = { description: "mydesc", - "key_vault_provider": { + key_vault_provider: { name: "vault", - "service_endpoint": { + service_endpoint: { name: serviceEndpointName, - "service_principal_id": servicePrincipalId, - "service_principal_secret": servicePrincipalSecret, - "subscription_id": subscriptionId, - "subscription_name": subscriptionName, - "tenant_id": tenantId + service_principal_id: servicePrincipalId, + service_principal_secret: servicePrincipalSecret, + subscription_id: subscriptionId, + subscription_name: subscriptionName, + tenant_id: tenantId } }, name: "myvg" @@ -112,11 +113,11 @@ const mockedInvalidServiceEndpointResponse = { const createServiceEndpointInput: ServiceEndpointData = { name: serviceEndpointName, - "service_principal_id": servicePrincipalId, - "service_principal_secret": servicePrincipalSecret, - "subscription_id": subscriptionId, - "subscription_name": subscriptionName, - "tenant_id": tenantId + service_principal_id: servicePrincipalId, + service_principal_secret: servicePrincipalSecret, + subscription_id: subscriptionId, + subscription_name: subscriptionName, + tenant_id: tenantId }; beforeAll(() => { @@ -131,14 +132,14 @@ describe("Validate service endpoint parameters creation", () => { test("valid service endpoint params", () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": { + key_vault_provider: { + service_endpoint: { name: serviceEndpointName, - "service_principal_id": servicePrincipalId, - "service_principal_secret": servicePrincipalSecret, - "subscription_id": subscriptionId, - "subscription_name": subscriptionName, - "tenant_id": tenantId + service_principal_id: servicePrincipalId, + service_principal_secret: servicePrincipalSecret, + subscription_id: subscriptionId, + subscription_name: subscriptionName, + tenant_id: tenantId } } }); @@ -167,13 +168,13 @@ describe("Validate service endpoint parameters creation", () => { test("should fail creating service endpoint params without the name", () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": { - "service_principal_id": servicePrincipalId, - "service_principal_secret": servicePrincipalSecret, - "subscription_id": subscriptionId, - "subscription_name": subscriptionName, - "tenant_id": tenantId + key_vault_provider: { + service_endpoint: { + service_principal_id: servicePrincipalId, + service_principal_secret: servicePrincipalSecret, + subscription_id: subscriptionId, + subscription_name: subscriptionName, + tenant_id: tenantId } } }); @@ -192,13 +193,13 @@ describe("Validate service endpoint parameters creation", () => { test("should fail creating service endpoint params without service principal id", () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": { + key_vault_provider: { + service_endpoint: { name: serviceEndpointName, - "service_principal_secret": servicePrincipalSecret, - "subscription_id": subscriptionId, - "subscription_name": subscriptionName, - "tenant_id": tenantId + service_principal_secret: servicePrincipalSecret, + subscription_id: subscriptionId, + subscription_name: subscriptionName, + tenant_id: tenantId } } }); @@ -217,13 +218,13 @@ describe("Validate service endpoint parameters creation", () => { test("should fail creating service endpoint params without service principal secret", () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": { + key_vault_provider: { + service_endpoint: { name: serviceEndpointName, - "service_principal_id": servicePrincipalId, - "subscription_id": subscriptionId, - "subscription_name": subscriptionName, - "tenant_id": tenantId + service_principal_id: servicePrincipalId, + subscription_id: subscriptionId, + subscription_name: subscriptionName, + tenant_id: tenantId } } }); @@ -242,13 +243,13 @@ describe("Validate service endpoint parameters creation", () => { test("should fail creating service endpoint params without subscription id", () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": { + key_vault_provider: { + service_endpoint: { name: serviceEndpointName, - "service_principal_id": servicePrincipalId, - "service_principal_secret": servicePrincipalSecret, - "subscription_name": subscriptionName, - "tenant_id": tenantId + service_principal_id: servicePrincipalId, + service_principal_secret: servicePrincipalSecret, + subscription_name: subscriptionName, + tenant_id: tenantId } } }); @@ -267,13 +268,13 @@ describe("Validate service endpoint parameters creation", () => { test("should fail creating service endpoint params without subscription name", () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": { + key_vault_provider: { + service_endpoint: { name: serviceEndpointName, - "service_principal_id": servicePrincipalId, - "service_principal_secret": servicePrincipalSecret, - "subscription_id": subscriptionId, - "tenant_id": tenantId + service_principal_id: servicePrincipalId, + service_principal_secret: servicePrincipalSecret, + subscription_id: subscriptionId, + tenant_id: tenantId } } }); @@ -292,8 +293,8 @@ describe("Validate service endpoint parameters creation", () => { test("should fail creating service endpoint params without entire section", () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": {} + key_vault_provider: { + service_endpoint: {} } }); const input = readYaml(""); diff --git a/src/lib/pipelines/variableGroup.test.ts b/src/lib/pipelines/variableGroup.test.ts index af97c5b02..5a794e636 100644 --- a/src/lib/pipelines/variableGroup.test.ts +++ b/src/lib/pipelines/variableGroup.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ import { VariableGroup, VariableGroupParameters @@ -119,14 +120,14 @@ describe("addVariableGroupWithKeyVaultMap", () => { test("should fail when key vault name is not set for variable group", async () => { (readYaml as jest.Mock).mockReturnValue({ description: "mydesc", - "key_vault_provider": { - "service_endpoint": { + key_vault_provider: { + service_endpoint: { name: "sename", - "service_principal_id": "id", - "service_principal_secret": "secret", - "subscription_id": "id", - "subscription_name": "subname", - "tenant_id": "tid" + service_principal_id: "id", + service_principal_secret: "secret", + subscription_id: "id", + subscription_name: "subname", + tenant_id: "tid" } }, name: "myvg", @@ -153,9 +154,9 @@ describe("addVariableGroupWithKeyVaultMap", () => { test("should fail when service endpoint data is not set for variable group", async () => { (readYaml as jest.Mock).mockReturnValue({ description: "myvg desc", - "key_vault_provider": { + key_vault_provider: { name: "mykv", - "service_endpoint": {} + service_endpoint: {} }, name: "myvg", variables: [ @@ -180,15 +181,15 @@ describe("addVariableGroupWithKeyVaultMap", () => { test("should pass when variable group data is valid", async () => { (readYaml as jest.Mock).mockReturnValue({ description: "myvg desc", - "key_vault_provider": { + key_vault_provider: { name: "mykv", - "service_endpoint": { + service_endpoint: { name: "epname", - "service_principal_id": "pricid", - "service_principal_secret": "princsecret", - "subscription_id": "subid", - "subscription_name": "subname", - "tenant_id": "tenid" + service_principal_id: "pricid", + service_principal_secret: "princsecret", + subscription_id: "subid", + subscription_name: "subname", + tenant_id: "tenid" } }, name: "myvg", @@ -255,15 +256,15 @@ describe("doAddVariableGroup", () => { test("should pass when variable group with key vault data is set", async () => { (readYaml as jest.Mock).mockReturnValue({ description: uuid(), - "key_vault_data": { + key_vault_data: { name: "mykv", - "service_endpoint": { + service_endpoint: { name: "epname", - "service_principal_id": "pricid", - "service_principal_secret": "princsecret", - "subscription_id": "subid", - "subscription_name": "subname", - "tenant_id": "tenid" + service_principal_id: "pricid", + service_principal_secret: "princsecret", + subscription_id: "subid", + subscription_name: "subname", + tenant_id: "tenid" } }, name: uuid(), @@ -312,7 +313,7 @@ describe("authorizeAccessToAllPipelines", () => { }); test("should pass when valid variable group is passed", async () => { jest.spyOn(config, "Config").mockReturnValueOnce({ - "azure_devops": { + azure_devops: { project: "test" } }); diff --git a/src/lib/setup/prompt.test.ts b/src/lib/setup/prompt.test.ts index 0baa06aed..44af1f85e 100644 --- a/src/lib/setup/prompt.test.ts +++ b/src/lib/setup/prompt.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/camelcase */ import fs from "fs"; import inquirer from "inquirer"; import os from "os"; @@ -17,10 +18,10 @@ import * as subscriptionService from "./subscriptionService"; describe("test prompt function", () => { it("positive test: No App Creation", async () => { const answers = { - "azdo_org_name": "org", - "azdo_pat": "pat", - "azdo_project_name": "project", - "create_app_repo": false + azdo_org_name: "org", + azdo_pat: "pat", + azdo_project_name: "project", + create_app_repo: false }; jest.spyOn(inquirer, "prompt").mockResolvedValueOnce(answers); const ans = await prompt(); @@ -34,17 +35,17 @@ describe("test prompt function", () => { }); it("positive test: create SP", async () => { const answers = { - "azdo_org_name": "org", - "azdo_pat": "pat", - "azdo_project_name": "project", - "create_app_repo": true + azdo_org_name: "org", + azdo_pat: "pat", + azdo_project_name: "project", + create_app_repo: true }; jest.spyOn(inquirer, "prompt").mockResolvedValueOnce(answers); jest.spyOn(inquirer, "prompt").mockResolvedValueOnce({ - "create_service_principal": true + create_service_principal: true }); jest.spyOn(inquirer, "prompt").mockResolvedValueOnce({ - "acr_name": "testACR" + acr_name: "testACR" }); jest @@ -71,22 +72,22 @@ describe("test prompt function", () => { }); it("positive test: no create SP", async () => { const answers = { - "azdo_org_name": "org", - "azdo_pat": "pat", - "azdo_project_name": "project", - "create_app_repo": true + azdo_org_name: "org", + azdo_pat: "pat", + azdo_project_name: "project", + create_app_repo: true }; jest.spyOn(inquirer, "prompt").mockResolvedValueOnce(answers); jest.spyOn(inquirer, "prompt").mockResolvedValueOnce({ - "create_service_principal": false + create_service_principal: false }); jest.spyOn(inquirer, "prompt").mockResolvedValueOnce({ - "az_sp_id": "b510c1ff-358c-4ed4-96c8-eb23f42bb65b", - "az_sp_password": "a510c1ff-358c-4ed4-96c8-eb23f42bbc5b", - "az_sp_tenant": "72f988bf-86f1-41af-91ab-2d7cd011db47" + az_sp_id: "b510c1ff-358c-4ed4-96c8-eb23f42bb65b", + az_sp_password: "a510c1ff-358c-4ed4-96c8-eb23f42bbc5b", + az_sp_tenant: "72f988bf-86f1-41af-91ab-2d7cd011db47" }); jest.spyOn(inquirer, "prompt").mockResolvedValueOnce({ - "acr_name": "testACR" + acr_name: "testACR" }); jest.spyOn(subscriptionService, "getSubscriptions").mockResolvedValueOnce([ { @@ -279,7 +280,7 @@ describe("test promptForSubscriptionId function", () => { } ]); jest.spyOn(inquirer, "prompt").mockResolvedValueOnce({ - "az_subscription": "subscription2" + az_subscription: "subscription2" }); const mockRc: RequestContext = { accessToken: "pat", @@ -301,7 +302,7 @@ describe("test promptForACRName function", () => { workspace: WORKSPACE }; jest.spyOn(inquirer, "prompt").mockResolvedValueOnce({ - "acr_name": "testACR" + acr_name: "testACR" }); await promptForACRName(mockRc); expect(mockRc.acrName).toBe("testACR");