ci: Merge master into dev

Author: tbarlow12

.gitignore

@@ -13,4 +13,4 @@ hello/
 local.settings.json
 __pycache__/
 .python_packages/
-.serverless/
+.serverless/

package-lock.json

@@ -22,6 +22,12 @@ interface AppServicePlanParams extends DefaultArmParams {
   appServicePlanSkuTier: ArmParameter;
 }
 
+interface AppServicePlanParams extends DefaultArmParams {
+  appServicePlanName: ArmParameter;
+  appServicePlanSkuName: ArmParameter;
+  appServicePlanSkuTier: ArmParameter;
+}
+
 export class AppServicePlanResource implements ArmResourceTemplateGenerator {
   public static getResourceName(config: ServerlessAzureConfig) {
     const options: AzureNamingServiceOptions = {

src/armTemplates/resources/appServicePlan.ts

@@ -0,0 +1,46 @@
+export const configConstants = {
+  bearer: "Bearer ",
+  deploymentConfig: {
+    container: "deployment-artifacts",
+    rollback: true,
+    external: false,
+  },
+  naming: {
+    maxLength: {
+      storageAccount: 24,
+      deploymentName: 64,
+    },
+    suffix: {
+      deployment: "DEPLOYMENT",
+      artifact: "ARTIFACT",
+    }
+  },
+  functionAppApiPath: "/api/",
+  functionAppDomain: ".azurewebsites.net",
+  functionsAdminApiPath: "/admin/functions/",
+  functionsApiPath: "/api/functions",
+  funcCoreTools: "func",
+  funcCoreToolsArgs: ["host", "start"],
+  funcConsoleColor: "blue",
+  runFromPackageSetting: "WEBSITE_RUN_FROM_PACKAGE",
+  jsonContentType: "application/json",
+  logInvocationsApiPath: "/azurejobs/api/functions/definitions/",
+  logOutputApiPath: "/azurejobs/api/log/output/",
+  logStreamApiPath: "/api/logstream/application/functions/function/",
+  masterKeyApiPath: "/api/functions/admin/masterkey",
+  providerName: "azure",
+  scmCommandApiPath: "/api/command",
+  scmDomain: ".scm.azurewebsites.net",
+  scmVfsPath: "/api/vfs/site/wwwroot/",
+  scmZipDeployApiPath: "/api/zipdeploy",
+  resourceGroupHashLength: 6,
+  defaults: {
+    awsRegion: "us-east-1",
+    region: "westus",
+    stage: "dev",
+    prefix: "sls",
+    localPort: 7071,
+  },
+};
+
+export default configConstants;

src/config.ts

@@ -508,13 +508,16 @@ describe("Function App Service", () => {
 
   function expectLogFunctions(sls: Serverless) {
     expectSlsLogContains(sls, "Deployed serverless functions:");
-    expectSlsLogContains(sls, "Deploying zip file to function app: Test");
     expectSlsLogContains(sls, "-> hello: [*] myHostName.azurewebsites.net/api/hello");
     expectSlsLogContains(sls, "-> goodbye: [*] myHostName.azurewebsites.net/api/goodbye");
   }
 
   function expectSlsLogContains(sls: Serverless, message: string) {
     const calls = (sls.cli.log as any).mock.calls;
-    expect(calls.find((args) => args[0])).toBeTruthy();
+    const call = calls.find((args) => {
+      const equals = args[0] === message;
+      return equals;
+    });
+    expect(call).toBeDefined();
   }
 });

src/services/functionAppService.test.ts

@@ -0,0 +1,69 @@
+{
+    "nodejs": [
+        {
+            "version": "0.10.40"
+        },
+        {
+            "version": "0.10.5"
+        },
+        {
+            "version": "0.12.6"
+        },
+        {
+            "version": "0.6.20"
+        },
+        {
+            "version": "0.8.28"
+        },
+        {
+            "version": "10.14.1"
+        },
+        {
+            "version": "10.15.2"
+        },
+        {
+            "version": "10.6.0"
+        },
+        {
+            "version": "4.8.4"
+        },
+        {
+            "version": "6.12.3"
+        },
+        {
+            "version": "6.5.0"
+        },
+        {
+            "version": "6.9.1"
+        },
+        {
+            "version": "6.9.5"
+        },
+        {
+            "version": "7.10.1"
+        },
+        {
+            "version": "8.1.4"
+        },
+        {
+            "version": "8.10.0"
+        },
+        {
+            "version": "8.11.1"
+        },
+        {
+            "version": "8.4.0"
+        },
+        {
+            "version": "8.5.0"
+        },
+        {
+            "version": "8.9.4"
+        }
+    ],
+    "python": [
+        {
+            "version": "3.6"
+        }
+    ]
+}

src/services/runtimeVersions.json

@@ -1817,4 +1817,4 @@
       ]
     }
   ]
-}
+}