Merge pull request #11 from karnafun/master

Adding serverless support for dotnet6

Author: tsibelman

README.md

@@ -18,6 +18,10 @@ package:
 ```
 It equivalent to going into functionproject-folder and executing dotnet lambda package -o publish/deploy-package.zip
 
+If you want to execute serverless deploy for dotnet 6, you should add to serverless.yml: provider.runtime=dotnet6
+
+If you want to execute serverless deploy for arm64 architecture, you should add to serverless.yml: provider.architecture=arm64
+
 If you want to execute serverless deploy with no repacking of C# projects, you should add --nopack option
 
 As of version 0.9, the plugin now supports supplying a projectFolder setting for scenarios when a more complex folder structure is needed. 

index.js

@@ -9,17 +9,14 @@ class ServerlessDotNet {
   constructor(serverless, options) {
     this.serverless = serverless;
     this.options = options;
-
-    if(!options["nopack"]){
-      
-      Object.assign( this, pack );
-      Object.assign( this, getPackingInfo );
-      Object.assign( this, funcRuntimeIsDotNet )
-
+    if (!options["nopack"]) {      
+      Object.assign(this, pack);
+      Object.assign(this, getPackingInfo);
+      Object.assign(this, funcRuntimeIsDotNet);            
       this.hooks = {
         'package:createDeploymentArtifacts': () => BbPromise.bind(this).then(this.pack)
       };
-    } 
+    }
   }
 }
 

lib/pack.js

@@ -3,12 +3,25 @@
 const BbPromise = require('bluebird');
 const program = require('child_process');
 
+function getLambdaPackageFlags(service) {
+
+  let myFramework = '';
+  var frameworkList = {
+    "dotnet6": "net6.0" //can add more mappings for more support 
+  };
+  if (service.provider.runtime && frameworkList[service.provider.runtime]) {
+    myFramework = ' -f ' + frameworkList[service.provider.runtime];
+  }
+  let architecture = '';
+  if (service.provider.architecture) {
+    architecture = ' -farch ' + service.provider.architecture
+  }
+  return architecture + myFramework;
+}
 module.exports = {
 
   getPackingInfo() {
-
     let service = this.serverless.service;
-
     const packages = service.getAllFunctions().reduce((dotnetPackages, funcName) => {
       let func = service.getFunction(funcName);
 
@@ -18,14 +31,14 @@ module.exports = {
 
       return dotnetPackages;
     }, [])
-    
+
     let dicArtifacts = {};
 
     packages.forEach(p => {
 
       const projectFolder = p.projectFolder || "";
       // Validate artifact starts with project folder
-      if (projectFolder && !p.artifact.startsWith(projectFolder)){
+      if (projectFolder && !p.artifact.startsWith(projectFolder)) {
         const error = `Serverless DotNet: function/package/projectFolder '${projectFolder}' is defined and should be root of function/package/artifact path '${p.artifact}'. Pleas update your configuration...`;
         throw new Error(error);
       }
@@ -39,10 +52,6 @@ module.exports = {
       // subtract project folder from the artifact path
       let artifactLessProjectFolderParts = [...artifactPathParts];
       artifactLessProjectFolderParts.splice(0, cwdParts.length);
-      // console.log('artifact: ' +p.artifact);
-      // console.log('artifact parts: ' +artifactPathParts);
-      // console.log('cwd parts: ' +cwdParts);
-      // console.log('artifact less cwd parts: ' +artifactLessProjectFolderParts);
 
       dicArtifacts[p.artifact] = {
         currentWorkingDir: cwd,
@@ -61,33 +70,33 @@ module.exports = {
     if (!providerRuntime && !funcRuntime) {
       console.error('No runtime found at global provider or local function level, eg. dotnetcore2.1')
     }
-  
+
     return (providerRuntime && providerRuntime.startsWith('dotnet') && !funcRuntime)
-        || (funcRuntime && funcRuntime.startsWith('dotnet'))
-        || (!providerRuntime && funcRuntime && funcRuntime.startsWith('dotnet'));
+      || (funcRuntime && funcRuntime.startsWith('dotnet'))
+      || (!providerRuntime && funcRuntime && funcRuntime.startsWith('dotnet'));
   },
 
   pack() {
     let cli = this.serverless.cli;
+    let flags = getLambdaPackageFlags(this.serverless.service)
     cli.log('Serverless DotNet: Pack');
-
     const dicArtifacts = this.getPackingInfo();
-
     var promises = Object.entries(dicArtifacts).map(kv => {
       return new BbPromise(function (resolve, reject) {
 
         try {
           const packingInfo = kv[1];
 
-          var output=program.execSync('dotnet lambda package -o ' + packingInfo.artifactOutput, { "cwd": packingInfo.currentWorkingDir }, function (error, stdout, stderr) {
-            //console.log(stdout);
+          var output = program.execSync('dotnet lambda package ' + flags + ' -o ' + packingInfo.artifactOutput, { "cwd": packingInfo.currentWorkingDir }, function (error, stdout, stderr) {
+            console.log(output)
             cli.log(stdout);
 
             if (error) {
               console.error('An error occured while restoring packages');
-              console.error(stderr.toString('utf8'));
-              process.exit(error.code);
-              return reject(error);
+              console.error(err.stdout.toString('utf8'));
+              console.error(err.toString('utf8'));
+              process.exit();
+              return reject(err);
             }
 
             console.log('Publishing');
@@ -96,7 +105,7 @@ module.exports = {
           });
 
           cli.log(output);
-		  return resolve();
+          return resolve();
         } catch (err) {
           console.error('An error occured while restoring packages');
           console.error(err.stdout.toString('utf8'));