Upgrade to NodeJS 16, Change version to 1.6.1

cjkent · Jul 20, 2023 · 38b485d · 38b485d
1 parent 39e1d74
commit 38b485d
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 44 deletions.
diff --git a/archetype/pom.xml b/archetype/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>ws.osiris</groupId>
     <artifactId>osiris-archetype</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.6.1</version>
     <packaging>maven-archetype</packaging>
 
     <name>Osiris Archetype</name>

diff --git a/aws-deploy/pom.xml b/aws-deploy/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>osiris</artifactId>
         <groupId>ws.osiris</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <artifactId>osiris</artifactId>
+        <version>1.6.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/aws-deploy/src/main/kotlin/ws/osiris/awsdeploy/cloudformation/Templates.kt b/aws-deploy/src/main/kotlin/ws/osiris/awsdeploy/cloudformation/Templates.kt
@@ -1329,32 +1329,30 @@ internal class PublishLambdaTemplate(private val codeHash: String) : Template {
         val statementId = UUID.randomUUID().toString()
         @Language("ES6")
         val script = """
-            const AWS = require('aws-sdk');
-            const { send, SUCCESS, FAILED } = require('cfn-response');
-            
-            exports.handler = async (event, context) => {
-              try {
-                if (event.RequestType === 'Delete') {
-                  send(event, context, SUCCESS);
-                  return;
-                }
-                const lambda = new AWS.Lambda();
-                const data = await lambda.publishVersion({ FunctionName: event.ResourceProperties.FunctionName }).promise();
-
-                const permissionsParams = {
-                  Action: 'lambda:InvokeFunction',
+          var AWS = require('aws-sdk');
+          var response = require('cfn-response');
+          exports.handler = (event, context, callback) => {
+            if (event.RequestType == 'Delete') {
+              response.send(event, context, response.SUCCESS);
+            }
+            var lambda = new AWS.Lambda();
+            lambda.publishVersion({FunctionName: event.ResourceProperties.FunctionName}).promise().then((data) => {
+              var permissionsParams = {
+                  Action: "lambda:InvokeFunction",
                   FunctionName: data.FunctionArn,
-                  Principal: 'apigateway.amazonaws.com',
-                  SourceArn: '$arn',
-                  StatementId: '$statementId'
-                };
-                const resp = await lambda.addPermission(permissionsParams).promise();
-                send(event, context, SUCCESS, { FunctionArn: data.FunctionArn }, data.FunctionArn);
-              } catch (e) {
-                send(event, context, FAILED, e);
+                  Principal: "apigateway.amazonaws.com",
+                  SourceArn: "$arn",
+                  StatementId: "$statementId"
               }
-            };
-
+              lambda.addPermission(permissionsParams).promise().then((resp) => {
+                return response.send(event, context, response.SUCCESS, {FunctionArn: data.FunctionArn}, data.FunctionArn);
+              }).catch((e) => {
+                return response.send(event, context, response.FAILED, e);
+              });
+            }).catch((e) => {
+              return response.send(event, context, response.FAILED, e);
+            });
+          };
 """
 
         @Language("yaml")
@@ -1375,7 +1373,7 @@ internal class PublishLambdaTemplate(private val codeHash: String) : Template {
         |      Code:
         |        ZipFile: !Sub |
         |          $script
-        |      Runtime: nodejs18.x
+        |      Runtime: nodejs16.x
         |
         |  LambdaVersionExecutionRole:
         |    Type: AWS::IAM::Role

diff --git a/aws/pom.xml b/aws/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ws.osiris</groupId>
         <artifactId>osiris</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>osiris-aws</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ws.osiris</groupId>
         <artifactId>osiris</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ws.osiris</groupId>
         <artifactId>osiris</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
@@ -8,11 +8,11 @@ plugins {
 apply plugin: 'maven'
 
 group = 'ws.osiris'
-version = '1.7.0-SNAPSHOT'
+version = '1.6.1'
 
 ext {
     kotlinVersion = '1.3.31'
-    osirisVersion = '1.7.0-SNAPSHOT'
+    osirisVersion = '1.6.1'
 }
 
 repositories {
@@ -70,7 +70,7 @@ pluginBundle {
 //           mavenLocal()
 //       }
 //       dependencies {
-//           classpath 'ws.osiris:osiris-gradle-plugin:1.7.0-SNAPSHOT'
+//           classpath 'ws.osiris:osiris-gradle-plugin:1.6.1'
 //       }
 //   }
 //
@@ -83,7 +83,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'ws.osiris'
             artifactId = 'osiris-gradle-plugin'
-            version = '1.7.0-SNAPSHOT'
+            version = '1.6.1'
             from components.java
         }
     }

diff --git a/gradle-plugin/src/main/gradle/generateProject.gradle b/gradle-plugin/src/main/gradle/generateProject.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'ws.osiris.project' version '1.7.0-SNAPSHOT'
+    id 'ws.osiris.project' version '1.6.1'
 }
 // For local testing the plugins block needs to be replaced with
 //
@@ -9,7 +9,7 @@ plugins {
 //           mavenLocal()
 //       }
 //       dependencies {
-//           classpath 'ws.osiris:osiris-gradle-plugin:1.7.0-SNAPSHOT'
+//           classpath 'ws.osiris:osiris-gradle-plugin:1.6.1'
 //       }
 //   }
 //   apply plugin: 'ws.osiris.project'

diff --git a/gradle-plugin/src/main/resources/archetype-resources/build.gradle b/gradle-plugin/src/main/resources/archetype-resources/build.gradle
@@ -21,5 +21,5 @@ subprojects {
 }
 
 ext {
-    osirisVersion = '1.7.0-SNAPSHOT'
+    osirisVersion = '1.6.1'
 }
diff --git a/gradle-plugin/src/main/resources/archetype-resources/core/build.gradle b/gradle-plugin/src/main/resources/archetype-resources/core/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'ws.osiris.deploy' version '1.7.0-SNAPSHOT'
+    id 'ws.osiris.deploy' version '1.6.1'
 }
 
 dependencies {

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>osiris</artifactId>
         <groupId>ws.osiris</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/local-server/pom.xml b/local-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ws.osiris</groupId>
         <artifactId>osiris</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ws.osiris</groupId>
         <artifactId>osiris</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ws.osiris</groupId>
     <artifactId>osiris</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.6.1</version>
     <packaging>pom</packaging>
     <name>Osiris</name>
     <description>Simple Serverless Web Apps using Kotlin, AWS Lambda, AWS API Gateway</description>

diff --git a/server/pom.xml b/server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>ws.osiris</groupId>
         <artifactId>osiris</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.6.1</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>osiris-server</artifactId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,5 +21,5 @@ subprojects { @@
     }
     ext {
-        osirisVersion = '1.7.0-SNAPSHOT'
+        osirisVersion = '1.6.1'
     }