Resolved conflicts after rebase

serverless · Jun 12, 2019 · b8ef4bd · b8ef4bd
1 parent 41d71b8
commit b8ef4bd
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/services/apimService.test.ts b/src/services/apimService.test.ts
@@ -1,7 +1,6 @@
 import Serverless from "serverless";
 import _ from "lodash";
 import { MockFactory } from "../test/mockFactory";
-import Service from "serverless/classes/Service";
 import { ApiManagementConfig } from "../models/apiManagement";
 import { ApimService } from "./apimService";
 import { interpolateJson } from "../test/utils";

diff --git a/src/services/functionAppService.test.ts b/src/services/functionAppService.test.ts
@@ -16,7 +16,6 @@ describe("Function App Service", () => {
   const slsService = MockFactory.createTestService();
   const variables = MockFactory.createTestVariables();
   const provider = MockFactory.createTestAzureServiceProvider();
-  const functionName = "function1";
 
   const masterKey = "masterKey";
   const authKey = "authKey";

diff --git a/src/test/mockFactory.ts b/src/test/mockFactory.ts
@@ -10,7 +10,7 @@ import Service from "serverless/classes/Service";
 import Utils from "serverless/classes/Utils";
 import PluginManager from "serverless/lib/classes/PluginManager";
 import { ServerlessAzureConfig } from "../models/serverless";
-import { FunctionMetadata, AzureServiceProvider, ServicePrincipalEnvVariables } from "../models/azureProvider"
+import { AzureServiceProvider, ServicePrincipalEnvVariables } from "../models/azureProvider"
 import { Logger } from "../models/generic";
 
 function getAttribute(object: any, prop: string, defaultValue: any): any {