Merge pull request #158 from SumoLogic/hsharma-nodejs14-eol

himsharma01 · web-flow · commit c83d8ba18148 · 2023-01-16T17:56:44.000+05:30
Nodejs14 eol
diff --git a/cloudwatchevents/guardduty/cloudwatchevents.json b/cloudwatchevents/guardduty/cloudwatchevents.json
@@ -85,7 +85,7 @@
                         ]
                     },
                     "Timeout": 300,
-                    "Runtime": "nodejs14.x"
+                    "Runtime": "nodejs18.x"
                 }
             },
             "CloudWatchEventFunctionCloudWatchEventTriggerPermission": {
diff --git a/cloudwatchevents/guardduty/deploy.sh b/cloudwatchevents/guardduty/deploy.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export AWS_PROFILE="prod"
+if [ "$AWS_PROFILE" == "prod" ]
+then
+    SAM_S3_BUCKET="appdevstore"
+    AWS_REGION="us-east-1"
+else
+    SAM_S3_BUCKET="cf-templates-5d0x5unchag-us-east-2"
+    AWS_REGION="us-east-2"
+fi
+
+version="1.0.4"
+
+echo "Creating package.yaml"
+sam package --template-file template.yaml --s3-bucket $SAM_S3_BUCKET  --output-template-file packaged.yaml --s3-prefix "GuardDuty/v"$version --region $AWS_REGION --profile $AWS_PROFILE
+
+echo "Publishing sumologic-guardduty-events-processor "$version
+sam publish --template packaged.yaml --region $AWS_REGION --semantic-version $version
+
+echo "Published sumologic-guardduty-events-processor "$version
+# sam deploy --template-file packaged_sumo_app_utils.yaml --stack-name testingsumoapputils --capabilities CAPABILITY_IAM --region $AWS_REGION
diff --git a/cloudwatchevents/guardduty/packaged.yaml b/cloudwatchevents/guardduty/packaged.yaml
@@ -23,9 +23,9 @@ Metadata:
     - cloudwatchevents
     - guardduty
     Name: sumologic-guardduty-events-processor
-    LicenseUrl: s3://appdevstore/GuardDuty/v1.0.3/6092dd6c323e33634657102f570628e0
-    ReadmeUrl: s3://appdevstore/GuardDuty/v1.0.3/9d217c45b3ababadef584aee27d4d607
-    SemanticVersion: 1.0.3
+    LicenseUrl: s3://appdevstore/GuardDuty/v1.0.4/6092dd6c323e33634657102f570628e0
+    ReadmeUrl: s3://appdevstore/GuardDuty/v1.0.4/9d217c45b3ababadef584aee27d4d607
+    SemanticVersion: 1.0.4
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudwatchevents/guardduty
     SpdxLicenseId: Apache-2.0
 Parameters:
@@ -35,9 +35,9 @@ Resources:
   CloudWatchEventFunction:
     Type: AWS::Serverless::Function
     Properties:
-      CodeUri: s3://appdevstore/GuardDuty/v1.0.3/58c7f17decc811a6e8904a19a9f844a1
+      CodeUri: s3://appdevstore/GuardDuty/v1.0.4/22b7b226ca9ec3b9dbb28b94c0e5f824
       Handler: cloudwatchevents.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Environment:
         Variables:
           SUMO_ENDPOINT:
@@ -49,6 +49,8 @@ Resources:
             Pattern:
               source:
               - aws.guardduty
+    Metadata:
+      SamResourceId: CloudWatchEventFunction
 Outputs:
   CloudWatchEventFunction:
     Description: CloudWatchEvent Processor Function ARN
diff --git a/cloudwatchevents/guardduty/template.yaml b/cloudwatchevents/guardduty/template.yaml
@@ -23,7 +23,7 @@ Metadata:
     Name: sumologic-guardduty-events-processor
     LicenseUrl: ../LICENSE
     ReadmeUrl: ./README.md
-    SemanticVersion: 1.0.3
+    SemanticVersion: 1.0.4
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudwatchevents/guardduty
     SpdxLicenseId: Apache-2.0
 
@@ -38,7 +38,7 @@ Resources:
     Properties:
       CodeUri: ../src/
       Handler: cloudwatchevents.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
       Environment:
         Variables:
           SUMO_ENDPOINT: !Ref SumoEndpointUrl
diff --git a/cloudwatchevents/guarddutybenchmark/deploy.sh b/cloudwatchevents/guarddutybenchmark/deploy.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export AWS_PROFILE="prod"
+if [ "$AWS_PROFILE" == "prod" ]
+then
+    SAM_S3_BUCKET="appdevstore"
+    AWS_REGION="us-east-1"
+else
+    SAM_S3_BUCKET="cf-templates-5d0x5unchag-us-east-2"
+    AWS_REGION="us-east-2"
+fi
+
+version="1.0.12"
+
+echo "Creating package.yaml"
+sam package --template-file template_v2.yaml --s3-bucket $SAM_S3_BUCKET  --output-template-file packaged.yaml --s3-prefix "guarddutybenchmark/v"$version --region $AWS_REGION --profile $AWS_PROFILE
+
+echo "Publishing sumologic-guardduty-benchmark "$version
+sam publish --template packaged.yaml --region $AWS_REGION --semantic-version $version
+
+echo "Published sumologic-guardduty-benchmark "$version
+# sam deploy --template-file packaged_sumo_app_utils.yaml --stack-name testingsumoapputils --capabilities CAPABILITY_IAM --region $AWS_REGION
diff --git a/cloudwatchevents/guarddutybenchmark/packaged.yaml b/cloudwatchevents/guarddutybenchmark/packaged.yaml
@@ -53,9 +53,9 @@ Metadata:
     - benchmark
     - guardduty
     Name: sumologic-guardduty-benchmark
-    LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.11/6092dd6c323e33634657102f570628e0
-    ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.11/cab012d7fb7887671b751e6f5c0d2062
-    SemanticVersion: 1.0.11
+    LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.12/6092dd6c323e33634657102f570628e0
+    ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.12/cab012d7fb7887671b751e6f5c0d2062
+    SemanticVersion: 1.0.12
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudwatchevents/guarddutybenchmark
     SpdxLicenseId: Apache-2.0
 Parameters:
@@ -96,7 +96,7 @@ Parameters:
 Resources:
   CloudWatchEventFunction:
     Properties:
-      CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.11/58c7f17decc811a6e8904a19a9f844a1
+      CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.12/22b7b226ca9ec3b9dbb28b94c0e5f824
       Environment:
         Variables:
           SUMO_ENDPOINT:
@@ -111,14 +111,18 @@ Resources:
               - aws.guardduty
           Type: CloudWatchEvent
       Handler: cloudwatchevents.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
     Type: AWS::Serverless::Function
+    Metadata:
+      SamResourceId: CloudWatchEventFunction
   SumoAppUtils:
     Type: AWS::Serverless::Application
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
         SemanticVersion: 2.0.6
+    Metadata:
+      SamResourceId: SumoAppUtils
   SumoHostedCollector:
     Type: Custom::Collector
     Properties:
@@ -139,6 +143,8 @@ Resources:
         Ref: SumoAccessKey
       SumoDeployment:
         Ref: SumoDeployment
+    Metadata:
+      SamResourceId: SumoHostedCollector
   SumoHTTPSource:
     Type: Custom::HTTPSource
     Properties:
@@ -166,6 +172,8 @@ Resources:
         Ref: SumoDeployment
       DateFormat: yyyy-MM-dd'T'HH:mm:ss.SSS'Z'
       DateLocatorRegex: .*"updatedAt":"(.*)".*
+    Metadata:
+      SamResourceId: SumoHTTPSource
   SumoGuardDutyBenchmarkApp:
     Type: Custom::App
     Properties:
@@ -188,6 +196,8 @@ Resources:
         Ref: SumoAccessKey
       SumoDeployment:
         Ref: SumoDeployment
+    Metadata:
+      SamResourceId: SumoGuardDutyBenchmarkApp
 Outputs:
   CloudWatchEventFunction:
     Description: CloudWatchEvent Processor Function ARN
diff --git a/cloudwatchevents/guarddutybenchmark/template_v2.yaml b/cloudwatchevents/guarddutybenchmark/template_v2.yaml
@@ -56,7 +56,7 @@ Metadata:
     Name: sumologic-guardduty-benchmark
     LicenseUrl: ../LICENSE
     ReadmeUrl: ./README.md
-    SemanticVersion: 1.0.11
+    SemanticVersion: 1.0.12
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudwatchevents/guarddutybenchmark
     SpdxLicenseId: Apache-2.0
 
@@ -110,7 +110,7 @@ Resources:
               - aws.guardduty
           Type: CloudWatchEvent
       Handler: cloudwatchevents.handler
-      Runtime: nodejs14.x
+      Runtime: nodejs18.x
     Type: AWS::Serverless::Function
 
   SumoAppUtils:
diff --git a/cloudwatchlogs-with-dlq/DLQLambdaCloudFormation.json b/cloudwatchlogs-with-dlq/DLQLambdaCloudFormation.json
@@ -56,7 +56,11 @@
             "eu-north-1": {"bucketname": "appdevzipfiles-eu-north-1s"},
             "eu-south-1": {"bucketname": "appdevzipfiles-eu-south-1"},
             "me-south-1": {"bucketname": "appdevzipfiles-me-south-1s"},
-            "sa-east-1": {"bucketname": "appdevzipfiles-sa-east-1"}
+            "sa-east-1": {"bucketname": "appdevzipfiles-sa-east-1"},
+            "me-central-1": {"bucketname": "appdevzipfiles-me-central-1"},
+            "eu-central-2": {"bucketname": "appdevzipfiles-eu-central-2ss"},
+            "ap-northeast-3": {"bucketname": "appdevzipfiles-ap-northeast-3s"},
+            "ap-southeast-3": {"bucketname": "appdevzipfiles-ap-southeast-3"}
         }
     },
     "Resources": {
@@ -224,7 +228,7 @@
                     }
                 },
                 "Handler": "cloudwatchlogs_lambda.handler",
-                "Runtime": "nodejs14.x",
+                "Runtime": "nodejs16.x",
                 "MemorySize": 128,
                 "Environment": {
                     "Variables": {
@@ -286,7 +290,7 @@
                         ]
                     }
                 },
-                "Runtime": "nodejs14.x",
+                "Runtime": "nodejs16.x",
                 "MemorySize": 128,
                 "Environment": {
                     "Variables": {
diff --git a/cloudwatchlogs-with-dlq/DLQLambdaCloudFormationWithSecuredEndpoint.json b/cloudwatchlogs-with-dlq/DLQLambdaCloudFormationWithSecuredEndpoint.json
@@ -56,7 +56,11 @@
             "eu-north-1": {"bucketname": "appdevzipfiles-eu-north-1s"},
             "eu-south-1": {"bucketname": "appdevzipfiles-eu-south-1"},
             "me-south-1": {"bucketname": "appdevzipfiles-me-south-1s"},
-            "sa-east-1": {"bucketname": "appdevzipfiles-sa-east-1"}
+            "sa-east-1": {"bucketname": "appdevzipfiles-sa-east-1"},
+            "me-central-1": {"bucketname": "appdevzipfiles-me-central-1"},
+            "eu-central-2": {"bucketname": "appdevzipfiles-eu-central-2ss"},
+            "ap-northeast-3": {"bucketname": "appdevzipfiles-ap-northeast-3s"},
+            "ap-southeast-3": {"bucketname": "appdevzipfiles-ap-southeast-3"}
         }
     },
     "Resources": {
@@ -266,7 +270,7 @@
                     }
                 },
                 "Handler": "cloudwatchlogs_lambda.handler",
-                "Runtime": "nodejs14.x",
+                "Runtime": "nodejs16.x",
                 "MemorySize": 128,
                 "Environment": {
                     "Variables": {
@@ -327,7 +331,7 @@
                         ]
                     }
                 },
-                "Runtime": "nodejs14.x",
+                "Runtime": "nodejs16.x",
                 "MemorySize": 128,
                 "Environment": {
                     "Variables": {
diff --git a/upload_artifacts.py b/upload_artifacts.py
@@ -14,7 +14,7 @@
     "ap-northeast-1",
     "ca-central-1",
     # "cn-north-1",
-    # "ap-northeast-3", #giving errror
+    "ap-northeast-3",
     "eu-central-1",
     "eu-west-1",
     "eu-west-2",
@@ -24,20 +24,48 @@
     "ap-east-1",
     "me-south-1",
     "eu-south-1",
-    "af-south-1"
+    "af-south-1",
+    "me-central-1",
+    "eu-central-2",
+    "ap-southeast-3"
     ]
 
-
-def get_bucket_name(bucket_prefix, region):
-    if region in ("eu-north-1", "me-south-1", "ap-east-1", "af-south-1"):
-        return '%s-%ss' % (bucket_prefix, region)
-    return '%s-%s' % (bucket_prefix, region)
+region_map = {
+    "us-east-1" : "appdevzipfiles-us-east-1",
+    "us-east-2" : "appdevzipfiles-us-east-2",
+    "us-west-1" : "appdevzipfiles-us-west-1",
+    "us-west-2" : "appdevzipfiles-us-west-2",
+    "ap-south-1": "appdevzipfiles-ap-south-1",
+    "ap-northeast-2":"appdevzipfiles-ap-northeast-2",
+    "ap-southeast-1":"appdevzipfiles-ap-southeast-1",
+    "ap-southeast-2":"appdevzipfiles-ap-southeast-2",
+    "ap-northeast-1":"appdevzipfiles-ap-northeast-1",
+    "ca-central-1": "appdevzipfiles-ca-central-1",
+    "eu-central-1":"appdevzipfiles-eu-central-1",
+    "eu-west-1":"appdevzipfiles-eu-west-1",
+    "eu-west-2":"appdevzipfiles-eu-west-2",
+    "eu-west-3":"appdevzipfiles-eu-west-3",
+    "eu-north-1":"appdevzipfiles-eu-north-1s",
+    "sa-east-1":"appdevzipfiles-sa-east-1",
+    "ap-east-1":"appdevzipfiles-ap-east-1s",
+    "af-south-1":"appdevzipfiles-af-south-1s",
+    "eu-south-1":"appdevzipfiles-eu-south-1",
+    "me-south-1":"appdevzipfiles-me-south-1s",
+    "me-central-1": "appdevzipfiles-me-central-1",
+    "eu-central-2":"appdevzipfiles-eu-central-2ss",
+    "ap-northeast-3" :"appdevzipfiles-ap-northeast-3s",
+    "ap-southeast-3": "appdevzipfiles-ap-southeast-3"
+}
+
+
+def get_bucket_name(region):
+    return region_map[region]
 
 
 def upload_code_in_multiple_regions(filepath, bucket_prefix):
 
     for region in regions:
-        upload_code_in_S3(filepath, get_bucket_name(bucket_prefix, region), region)
+        upload_code_in_S3(filepath, get_bucket_name(region), region)
 
 
 def create_buckets(bucket_prefix):

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`]`
`86`	`86`	`},`
`87`	`87`	`"Timeout": 300,`
`88`		`- "Runtime": "nodejs14.x"`
	`88`	`+ "Runtime": "nodejs18.x"`
`89`	`89`	`}`
`90`	`90`	`},`
`91`	`91`	`"CloudWatchEventFunctionCloudWatchEventTriggerPermission": {`