Migrated shared and services dirs

Author: wbreza

src/config.ts

@@ -1,4 +1,4 @@
-module.exports = {
+export const constants = {
   bearer: 'Bearer ',
   functionAppApiPath: '/api/',
   functionAppDomain: '.azurewebsites.net',
@@ -15,3 +15,5 @@ module.exports = {
   scmVfsPath: '/api/vfs/site/wwwroot/',
   scmZipApiPath: '/api/zip/site/wwwroot/'
 };
+
+export default constants;

src/services/apimService.ts

@@ -7,10 +7,16 @@ import { BaseService } from './baseService';
  * APIM Service handles deployment and integration with Azure API Management
  */
 export class ApimService extends BaseService {
+  private resourceId: string;
+  private resourceClient: ResourceManagementClient;
+  private apimClient: ApiManagementClient;
+  private functionAppService: FunctionAppService;
+  private config: any;
+  
   constructor(serverless, options) {
     super(serverless, options);
     this.resourceId = `/subscriptions/${this.subscriptionId}/resourceGroups/${this.resourceGroup}/providers/Microsoft.Web/sites/${this.serviceName}`;
-
+    this.config = this.serverless.service.provider.apim;
     this.resourceClient = new ResourceManagementClient(this.credentials, this.subscriptionId);
     this.apimClient = new ApiManagementClient(this.credentials, this.subscriptionId);
     this.functionAppService = new FunctionAppService(serverless, options);

src/services/baseService.ts

@@ -1,10 +1,14 @@
 import axios from 'axios';
 
-export class BaseService {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
+export abstract class BaseService {
+  protected baseUrl: string;
+  protected serviceName: string;
+  protected credentials: any;
+  protected subscriptionId: string;
+  protected resourceGroup: string;
+  protected deploymentName: string;
+
+  constructor(protected serverless, protected options) {
     this.baseUrl = 'https://management.azure.com';
     this.serviceName = serverless.service.service;
     this.credentials = serverless.variables.azureCredentials;
@@ -13,7 +17,7 @@ export class BaseService {
     this.deploymentName = serverless.service.provider.deploymentName || `${this.resourceGroup}-deployment`;
   }
 
-  async sendApiRequest(method, relativeUrl, options = {}) {
+  async sendApiRequest(method: string, relativeUrl: string, options: any = {}) {
     const defaultHeaders = {
       'Authorization': `Bearer ${this.credentials.tokenCache._entries[0].accessToken}`
     };
@@ -28,11 +32,11 @@ export class BaseService {
     return await axios(relativeUrl, requestOptions);
   }
 
-  _wait(timeout) {
+  protected wait(timeout: number) {
     return new Promise((resolve) => setTimeout(resolve, timeout));
   }
 
-  _waitForCondition(predicate, interval = 2000) {
+  protected waitForCondition(predicate: () => boolean, interval: number = 2000) {
     return new Promise((resolve, reject) => {
       let retries = 0;
       const id = setInterval(async () => {

src/services/functionAppService.ts

@@ -1,13 +1,18 @@
-import fs from 'fs';
-import path from 'path';
+import * as fs from 'fs';
+import * as path from 'path';
 import request from 'request';
 import jsonpath from 'jsonpath';
 import _ from 'lodash';
 import { ResourceManagementClient } from '@azure/arm-resources';
 import { WebSiteManagementClient } from '@azure/arm-appservice';
 import { BaseService } from './baseService';
+import { Deployment } from '@azure/arm-resources/esm/models';
 
 export class FunctionAppService extends BaseService {
+  private resourceId: string;
+  private resourceClient: ResourceManagementClient;
+  private webClient: WebSiteManagementClient;
+
   constructor(serverless, options) {
     super(serverless, options);
 
@@ -17,7 +22,7 @@ export class FunctionAppService extends BaseService {
   }
 
   async get() {
-    const response = await this.webClient.webApps.get(this.resourceGroup, this.serviceName);
+    const response: any = await this.webClient.webApps.get(this.resourceGroup, this.serviceName);
     if (response.error && (response.error.code === 'ResourceNotFound' || response.error.code === 'ResourceGroupNotFound')) {
       return null;
     }
@@ -111,7 +116,7 @@ export class FunctionAppService extends BaseService {
 
   async deploy() {
     this.serverless.cli.log(`Creating function app: ${this.serviceName}`);
-    let parameters = { functionAppName: { value: this.serviceName } };
+    let parameters: any = { functionAppName: { value: this.serviceName } };
 
     const gitUrl = this.serverless.service.provider.gitUrl;
 
@@ -162,7 +167,7 @@ export class FunctionAppService extends BaseService {
       });
     }
 
-    const deploymentParameters = {
+    const deploymentParameters: Deployment = {
       properties: {
         mode: 'Incremental',
         parameters,

src/services/resourceService.ts

@@ -2,6 +2,8 @@ import { ResourceManagementClient } from '@azure/arm-resources';
 import { BaseService } from './baseService';
 
 export class ResourceService extends BaseService {
+  private resourceClient: ResourceManagementClient;
+  
   constructor(serverless, options) {
     super(serverless, options);
 

src/shared/getAdminKey.ts

@@ -1,3 +1,3 @@
-export const getAdminKey = () => {
+export function getAdminKey() {
   return this.provider.getAdminKey();
 }

src/shared/parseBindings.ts

@@ -8,37 +8,34 @@ const constants = {
   type: 'type'
 };
 
-module.exports = {
-  getBindingsMetaData(serverless) {
+export function getBindingsMetaData(serverless) {
+  const bindingDisplayNames = [];
+  const bindingTypes = [];
+  const bindingSettings = [];
+  const bindingSettingsNames = [];
 
-    const bindingDisplayNames = [];
-    const bindingTypes = [];
-    const bindingSettings = [];
-    const bindingSettingsNames = [];
+  serverless.cli.log('Parsing Azure Functions Bindings.json...');
 
-    serverless.cli.log('Parsing Azure Functions Bindings.json...');
+  for (let bindingsIndex = 0; bindingsIndex < bindingsJson[constants.bindings].length; bindingsIndex++) {
+    const settingsNames = [];
 
-    for (let bindingsIndex = 0; bindingsIndex < bindingsJson[constants.bindings].length; bindingsIndex++) {
-      const settingsNames = [];
+    bindingTypes.push(bindingsJson[constants.bindings][bindingsIndex][constants.type]);
+    bindingDisplayNames.push(bindingsJson[constants.bindings][bindingsIndex][constants.displayName].toLowerCase());
+    bindingSettings[bindingsIndex] = bindingsJson[constants.bindings][bindingsIndex][constants.settings];
 
-      bindingTypes.push(bindingsJson[constants.bindings][bindingsIndex][constants.type]);
-      bindingDisplayNames.push(bindingsJson[constants.bindings][bindingsIndex][constants.displayName].toLowerCase());
-      bindingSettings[bindingsIndex] = bindingsJson[constants.bindings][bindingsIndex][constants.settings];
-
-      for (let bindingSettingsIndex = 0; bindingSettingsIndex < bindingSettings[bindingsIndex].length; bindingSettingsIndex++) {
-        settingsNames.push(bindingSettings[bindingsIndex][bindingSettingsIndex][constants.name]);
-      }
-
-      bindingSettingsNames[bindingsIndex] = settingsNames;
+    for (let bindingSettingsIndex = 0; bindingSettingsIndex < bindingSettings[bindingsIndex].length; bindingSettingsIndex++) {
+      settingsNames.push(bindingSettings[bindingsIndex][bindingSettingsIndex][constants.name]);
     }
 
-    const parsedBindings = {
-      bindingDisplayNames: bindingDisplayNames,
-      bindingTypes: bindingTypes,
-      bindingSettings: bindingSettings,
-      bindingSettingsNames: bindingSettingsNames
-    };
-
-    return parsedBindings;
+    bindingSettingsNames[bindingsIndex] = settingsNames;
   }
-};
+
+  const parsedBindings = {
+    bindingDisplayNames: bindingDisplayNames,
+    bindingTypes: bindingTypes,
+    bindingSettings: bindingSettings,
+    bindingSettingsNames: bindingSettingsNames
+  };
+
+  return parsedBindings;
+}