feat: Package & Deploy updates

package.json

@@ -40,6 +40,7 @@
   },
   "devDependencies": {
     "@types/jest": "^24.0.13",
+    "@types/lodash": "^4.14.130",
     "@types/open": "^6.1.0",
     "@types/request": "^2.48.1",
     "@types/serverless": "^1.18.2",

src/index.ts

@@ -4,15 +4,13 @@ This way only one plugin needs to be added to the service in order to get access
 whole provider implementation.
 */
 
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import AzureProvider from './provider/azureProvider';
 import { AzureInvoke } from './plugins/invoke/azureInvoke';
 import { AzureLogs } from './plugins/logs/azureLogs';
 import { AzureRemove } from './plugins/remove/azureRemove';
 import { AzurePackage } from './plugins/package/azurePackage';
-import { AzurePackageFunction } from './plugins/package/azurePackageFunction';
 import { AzureDeployPlugin } from './plugins/deploy/azureDeployPlugin';
-import { AzureDeployFunctionPlugin } from './plugins/deploy/azureDeployFunctionPlugin';
 import { AzureLoginPlugin } from './plugins/login/loginPlugin';
 import { AzureApimServicePlugin } from './plugins/apim/apimServicePlugin';
 import { AzureApimFunctionPlugin } from './plugins/apim/apimFunctionPlugin';
@@ -23,14 +21,12 @@ export class AzureIndex {
 
     // To be refactored
     this.serverless.pluginManager.addPlugin(AzurePackage);
-    this.serverless.pluginManager.addPlugin(AzurePackageFunction);
     this.serverless.pluginManager.addPlugin(AzureInvoke);
     this.serverless.pluginManager.addPlugin(AzureLogs);
     this.serverless.pluginManager.addPlugin(AzureRemove);
     // Refactored
     this.serverless.pluginManager.addPlugin(AzureLoginPlugin);
     this.serverless.pluginManager.addPlugin(AzureDeployPlugin);
-    this.serverless.pluginManager.addPlugin(AzureDeployFunctionPlugin);
     this.serverless.pluginManager.addPlugin(AzureApimServicePlugin);
     this.serverless.pluginManager.addPlugin(AzureApimFunctionPlugin);
   }

src/plugins/apim/apimFunctionPlugin.ts

@@ -1,4 +1,4 @@
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import { ApimService } from '../../services/apimService';
 
 export class AzureApimFunctionPlugin {

src/plugins/apim/apimServicePlugin.ts

@@ -1,4 +1,4 @@
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import { ApimService } from '../../services/apimService';
 
 export class AzureApimServicePlugin {
@@ -11,6 +11,11 @@ export class AzureApimServicePlugin {
   }
 
   private async deploy() {
+    const apimConfig = this.serverless.service.provider['apim'];
+    if (!apimConfig) {
+      return Promise.resolve();
+    }
+
     this.serverless.cli.log('Starting APIM service deployment');
 
     const apimService = new ApimService(this.serverless, this.options);

src/plugins/deploy/azureDeployPlugin.ts

@@ -1,4 +1,4 @@
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import { ResourceService } from '../../services/resourceService';
 import { FunctionAppService } from '../../services/functionAppService';
 

src/plugins/invoke/azureInvoke.ts

@@ -1,12 +1,10 @@
-import * as Serverless from 'serverless';
-import { getAdminKey } from '../../shared/getAdminKey';
+import Serverless from 'serverless';
 import { join, isAbsolute } from 'path';
 import AzureProvider from '../../provider/azureProvider';
 
 export class AzureInvoke {
   public hooks: { [eventName: string]: Promise<any> };
   private provider: AzureProvider;
-  private getAdminKey = getAdminKey;
 
   constructor(private serverless: Serverless, private options: Serverless.Options) {
     this.provider = (this.serverless.getProvider('azure') as any) as AzureProvider;
@@ -24,7 +22,7 @@ export class AzureInvoke {
     }
 
     this.hooks = {
-      'before:invoke:invoke': this.getAdminKey.bind(this),
+      'before:invoke:invoke': this.provider.getAdminKey.bind(this),
       'invoke:invoke': this.invoke.bind(this)
     };
   }

src/plugins/login/loginPlugin.ts

@@ -1,6 +1,6 @@
-import * as open from 'open';
+import open from 'open';
 import { interactiveLoginWithAuthResponse, loginWithServicePrincipalSecretWithAuthResponse } from '@azure/ms-rest-nodeauth';
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import AzureProvider from '../../provider/azureProvider';
 
 export class AzureLoginPlugin {

src/plugins/logs/azureLogs.ts

@@ -1,4 +1,4 @@
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import AzureProvider from '../../provider/azureProvider';
 
 export class AzureLogs {

src/plugins/package/azurePackage.ts

@@ -1,7 +1,5 @@
 
-import { existsSync, renameSync, statSync } from 'fs';
-import { join } from "path";
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import AzureProvider from '../../provider/azureProvider';
 import { createEventsBindings } from '../../shared/bindings';
 import { getFunctionMetaData } from '../../shared/utils';
@@ -13,7 +11,6 @@ export class AzurePackage {
   constructor(private serverless: Serverless, private options: Serverless.Options) {
     this.hooks = {
       'package:setupProviderConfiguration': this.setupProviderConfiguration.bind(this),
-      'before:webpack:package:packageModules': this.webpackFunctionJson.bind(this)
     };
   }
 
@@ -29,36 +26,4 @@ export class AzurePackage {
 
     return Promise.all(createEventsPromises);
   }
-
-  private async webpackFunctionJson(): Promise<any> {
-    if (existsSync('.webpack')) {
-      const webpackJsonPromises = this.serverless.service.getAllFunctions()
-        .map((functionName) => this.moveJsonFile(functionName));
-
-      return Promise.all(webpackJsonPromises);
-    }
-
-    return Promise.resolve();
-  }
-
-  private async moveJsonFile(functionName): Promise<any> {
-    const dirPath = join(this.serverless.config.servicePath, '.webpack', functionName);
-    const jsonFileName = `${functionName}-function.json`;
-    const jsonFileSrcPath = join(this.serverless.config.servicePath, jsonFileName);
-    const jsonFileDestPath = join(dirPath, jsonFileName);
-
-    return new Promise((resolve) => {
-      if (existsSync(dirPath) && statSync(dirPath).isDirectory()) {
-        if (existsSync(jsonFileSrcPath)) {
-          this.serverless.cli.log(`Moving ${jsonFileName} to .webpack directory.`);
-          renameSync(jsonFileSrcPath, jsonFileDestPath);
-        }
-        else {
-          this.serverless.cli.log(`Warning: No generated ${functionName}-function.json file was found. It will not be included in the package.`);
-        }
-      }
-
-      resolve();
-    });
-  }
 }

src/plugins/remove/azureRemove.ts

@@ -1,4 +1,4 @@
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import { ResourceService } from '../../services/resourceService';
 
 export class AzureRemove {

src/provider/azureProvider.ts

@@ -1,7 +1,7 @@
-import * as fs from 'fs';
+import fs from 'fs';
 import { join } from 'path';
-import * as request from 'request';
-import * as Serverless from 'serverless';
+import request from 'request';
+import Serverless from 'serverless';
 import config from '../config';
 
 let functionAppName;

src/services/apimService.ts

@@ -1,4 +1,4 @@
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import { ApiManagementClient } from '@azure/arm-apimanagement';
 import { FunctionAppService } from './functionAppService';
 import { BaseService } from './baseService';
@@ -22,11 +22,7 @@ export class ApimService extends BaseService {
   /**
    * Deploys the APIM top level api
    */
-  async deployApi() {
-    if (!this.config) {
-      return;
-    }
-
+  public async deployApi() {
     const functionApp = await this.functionAppService.get();
 
     await this.ensureApi();
@@ -37,12 +33,8 @@ export class ApimService extends BaseService {
   /**
    * Deploys all the functions of the serverless service to APIM
    */
-  async deployFunctions() {
-    if (!this.config) {
-      return;
-    }
-
-    this.serverless.cli.log('Starting to deploy API Operations');
+  public async deployFunctions() {
+    this.serverless.cli.log('-> Deploying API Operations');
 
     const deployApiTasks = this.serverless.service
       .getAllFunctions()
@@ -55,7 +47,7 @@ export class ApimService extends BaseService {
    * Deploys the specified serverless function  to APIM
    * @param options 
    */
-  async deployFunction(options) {
+  public async deployFunction(options) {
     const functionConfig = this.serverless.service['functions'][options.function];
 
     if (!functionConfig.apim) {
@@ -75,7 +67,9 @@ export class ApimService extends BaseService {
   /**
    * Deploys the APIM API referenced by the serverless service
    */
-  async ensureApi() {
+  private async ensureApi() {
+    this.serverless.cli.log('-> Deploying API')
+
     try {
       await this.apimClient.api.createOrUpdate(this.resourceGroup, this.config.resourceId, this.config.name, {
         isCurrent: true,
@@ -96,7 +90,8 @@ export class ApimService extends BaseService {
    * Deploys the APIM Backend referenced by the serverless service
    * @param functionAppUrl The host name for the deployed function app
    */
-  async ensureBackend(functionApp) {
+  private async ensureBackend(functionApp) {
+    this.serverless.cli.log('-> Deploying API Backend')
     try {
       const functionAppResourceId = `https://management.azure.com${functionApp.id}`;
 
@@ -122,8 +117,8 @@ export class ApimService extends BaseService {
    * @param serverless The serverless framework 
    * @param options The plugin options
    */
-  async deployOperation(options) {
-    this.serverless.cli.log(`-> Deploying API operation ${options.function}`);
+  private async deployOperation(options) {
+    this.serverless.cli.log(`--> Deploying API operation ${options.function}`);
 
     try {
       const client = new ApiManagementClient(this.credentials, this.subscriptionId);
@@ -167,7 +162,8 @@ export class ApimService extends BaseService {
    * Gets the master key for the function app and stores a reference in the APIM instance
    * @param functionAppUrl The host name for the Azure function app
    */
-  async ensureFunctionAppKeys(functionApp) {
+  private async ensureFunctionAppKeys(functionApp) {
+    this.serverless.cli.log('-> Deploying API keys')
     try {
       const masterKey = await this.functionAppService.getMasterKey(functionApp);
       const keyName = `${this.serviceName}-key`;

src/services/baseService.ts

@@ -1,5 +1,7 @@
-import * as Serverless from 'serverless';
+import Serverless from 'serverless';
 import axios from 'axios';
+import request from 'request'
+import fs from 'fs';
 
 export abstract class BaseService {
   protected baseUrl: string;
@@ -63,4 +65,22 @@ export abstract class BaseService {
       }, interval);
     });
   }
+
+  /**
+ * Uploads the specified file via HTTP request
+ * @param requestOptions The HTTP request options
+ * @param filePath The local file path
+ */
+  protected sendFile(requestOptions, filePath) {
+    return new Promise((resolve, reject) => {
+      fs.createReadStream(filePath)
+        .pipe(request(requestOptions, (err, response) => {
+          if (err) {
+            this.serverless.cli.log(JSON.stringify(err, null, 4));
+            return reject(err);
+          }
+          resolve(response);
+        }));
+    });
+  }
 }