Update rate sheduler name (#8)

* update name generation

* update readme

* update yml file

* stage commit

* add region, geolocation, update CF template to add policy to retrive data from s3 bucket, fix type

* updates based on comments

* update error message

README.md

@@ -73,6 +73,16 @@ and then open [Logz.io](https://app.logz.io/#/dashboard/metrics).
 
 ## Changelong
 
+1.1.5:
+
+-   Update sheduler name from static to dynamic
+
+1.1.4:
+
+-   Update the playwright from 1.24.0 to 1.30.0
+
+-   Add dropdown UI for regions select
+
 1.1.3:
 
 -   Update UI

client/src/page/Home/index.tsx

@@ -163,6 +163,7 @@ const Home: FunctionComponent = () => {
                 ],
                 configs.bucketName.value,
                 configs.token.value,
+                region,
                 configs.listener.value,
                 (step: boolean) => {
                     onDownload(step);

client/src/utils/api.ts

@@ -223,7 +223,7 @@ class Api {
 			return cloudBridgeEventResp;
 		}
 	};
-	downloadCFTemplate = async (codeSnippet: string, envList: object, name: string, rangeTime: number, bucket: string, token: string, listener: string, onDownload: (step: boolean) => void, description?: string) => {
+	downloadCFTemplate = async (codeSnippet: string, envList: object, name: string, rangeTime: number, bucket: string, token: string, region: string, listener: string, onDownload: (step: boolean) => void, description?: string) => {
 		onDownload(true)
 
 		const responseModify = await this.customFetch(
@@ -244,6 +244,7 @@ class Api {
 				token,
 				bucket,
 				listener,
+				region,
 				rangeTime
 			},
 			settings.endPointUrls.createCfZip,

controllers/creator.js

@@ -169,8 +169,16 @@ exports.modifyFileLocally = async (req, res) => {
 };
 
 exports.createZipCF = async (req, res) => {
-    const { envList, name, description, token, bucket, listener, rangeTime } =
-        req.body;
+    const {
+        envList,
+        name,
+        description,
+        token,
+        bucket,
+        listener,
+        region,
+        rangeTime,
+    } = req.body;
 
     try {
         await setupCFTemplate(
@@ -180,6 +188,7 @@ exports.createZipCF = async (req, res) => {
             token,
             bucket,
             listener,
+            region,
             rangeTime,
         );
         await fileToZipCF(name);

service/cloudFormation/sam-template-empty.yml

@@ -14,6 +14,7 @@ Resources:
 #add zipNameRoute        
         Key: string
       Handler: index.handler
+      Role: 'dump'
       Description: Lambda Function to run playwright test
 #add name of the text
       FunctionName: string
@@ -31,4 +32,28 @@ Resources:
         Variables:
           LISTENER_URL: string
           TOKEN: string
-          NAME_FUNCTION: string 
+          NAME_FUNCTION: string
+  syntheticQueryS3Bucket:
+    Type: 'AWS::IAM::Role'
+    Properties:
+      RoleName: 'dump'
+      AssumeRolePolicyDocument:
+        Version: '2012-10-17'
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service:
+                - lambda.amazonaws.com
+            Action:
+              - 'sts:AssumeRole'
+      Path: /
+      Policies:
+        - PolicyName: 'dump'
+          PolicyDocument:
+            Version: '2012-10-17'
+            Statement:
+              - Effect: Allow
+                Action:
+                  - 's3:GetObject'
+                  - 'lambda:GetFunction'
+                Resource: '*'

service/cloudFormation/sam-template.yml

@@ -15,6 +15,10 @@ Parameters:
     Type: "String"
     Description: "AWS bucket where was uploaded lambdaFunction"
 
+  AWSRegion:
+    Type: "String"
+    Description: "AWS Region where was uploaded lambdaFunction"
+
   ZipNameRoute:
     Type: "String"
     Description: "Zip route in AWS Bucket what was uploaded before"
@@ -39,17 +43,42 @@ Resources:
       Handler: index.handler
       Description: Lambda Function to run playwright test
       FunctionName: !Ref LambdaTestName
+      Role: !GetAtt syntheticQueryS3Bucket.Arn
       MemorySize: 512
       Timeout: 60
       Events:
         CronEvent:
           Type: Schedule
           Properties:
             Schedule: !Ref Timeout
-            Name: RateSchedule
+            Name: !Join [ '_', [ !Ref AWS::StackName, 'rateschudule' ] ]
             Description: Trigger Lambda once in a minute
       Environment:
         Variables:
           LISTENER_URL: !Ref LogzioListenerUrl
           TOKEN: !Ref LogzioToken
-          NAME_FUNCTION: !Ref LambdaTestName
+          NAME_FUNCTION: !Ref LambdaTestName
+          REGION: !Ref AWSRegion
+  syntheticQueryS3Bucket:
+    Type: 'AWS::IAM::Role'
+    Properties:
+      RoleName: !Join [ '-', [ 'LogzioSyntheticMonitoringLambdaRole', !Select [ 4, !Split [ '-', !Select [ 2, !Split [ '/', !Ref AWS::StackId ] ] ] ] ] ]
+      AssumeRolePolicyDocument:
+        Version: 2012-10-17
+        Statement:
+          - Effect: Allow
+            Principal:
+              Service:
+                - s3.amazonaws.com
+            Action:
+              - 'sts:AssumeRole'
+      Path: /
+      Policies:
+      - PolicyName: !Join [ '-', [ 'LogzioSyntheticMonitoringLambdaPolicy', !Select [ 4, !Split [ '-', !Select [ 2, !Split [ '/', !Ref AWS::StackId ] ] ] ] ] ]
+          PolicyDocument:
+            Version: 2012-10-17
+            Statement:
+              - Effect: Allow
+                Action:
+                  - 's3:GetObject'
+                Resource: '*'

service/lambdaFunction/geolocation.js

@@ -0,0 +1,89 @@
+module.exports = {
+    regionData: {
+        'us-east-1': {
+            geoip: {
+                location: [-78.024902, 37.926868],
+            },
+        },
+        'us-east-2': {
+            geoip: {
+                location: [-82.996216, 40.367474],
+            },
+        },
+        'us-west-1': {
+            geoip: {
+                location: [-119.417931, 36.778259],
+            },
+        },
+        'us-west-2': {
+            geoip: {
+                location: [-120.5, 44.0],
+            },
+        },
+        'ap-south-1': {
+            geoip: {
+                location: [72.877426, 19.07609],
+            },
+        },
+        'ap-northeast-3': {
+            geoip: {
+                location: [135.484802, 34.672314],
+            },
+        },
+        'ap-northeast-2': {
+            geoip: {
+                location: [127.024612, 37.5326],
+            },
+        },
+        'ap-southeast-1': {
+            geoip: {
+                location: [103.851959, 1.29027],
+            },
+        },
+        'ap-southeast-2': {
+            geoip: {
+                location: [151.2099, -33.865143],
+            },
+        },
+        'ap-northeast-1': {
+            geoip: {
+                location: [139.839478, 35.652832],
+            },
+        },
+        'ca-central-1': {
+            geoip: {
+                location: [-73.561668, 45.508888],
+            },
+        },
+        'eu-central-1': {
+            geoip: {
+                location: [8.682127, 50.110924],
+            },
+        },
+        'eu-west-1': {
+            geoip: {
+                location: [-6.266155, 53.35014],
+            },
+        },
+        'eu-west-2': {
+            geoip: {
+                location: [-0.118092, 51.509865],
+            },
+        },
+        'eu-west-3': {
+            geoip: {
+                location: [2.349014, 48.864716],
+            },
+        },
+        'eu-north-1': {
+            geoip: {
+                location: [18.06324, 59.334591],
+            },
+        },
+        'sa-east-1': {
+            geoip: {
+                location: [-46.62529, -23.533773],
+            },
+        },
+    },
+};

service/lambdaFunction/logger.js

@@ -1,11 +1,15 @@
-const loggerGenerator = () => {
+const loggerGenerator = (regionData) => {
     return require('logzio-nodejs').createLogger({
         token: process.env.TOKEN,
         protocol: 'https',
         host: process.env.LISTENER_URL,
         port: '8071',
-        type: 'syntetic-scripting', // OPTIONAL (If none is set, it will be 'nodejs')
+        type: 'synthetic-scripting', // OPTIONAL (If none is set, it will be 'nodejs')
         sendIntervalMs: 1000,
+        extraFields: {
+            aws_region: process.env.REGION,
+            ...regionData,
+        },
     });
 };
 module.exports = loggerGenerator;

service/lambdaFunction/rsData.js

@@ -3,6 +3,7 @@ const convertHarToJSON = require('./convertHarToJSON');
 const convertToNumber = require('./convertToNumber');
 const readSendTraceData = require('./rsTraceData');
 const loggerGenerator = require('./logger');
+const { regionData } = require('./geolocation');
 const errorStatusHandler = require('./statusError');
 const createSessionId = require('./sessionId');
 const createResponseStatusClass = require('./responseStatusClass');
@@ -12,7 +13,7 @@ function sleep(ms) {
 }
 
 const readSendData = async (error = '') => {
-    const logger = loggerGenerator();
+    const logger = loggerGenerator(regionData[process.env.REGION]);
     const sessionId = createSessionId();
     const status = errorStatusHandler(error);
     const harsInDir = fs.readdirSync('/tmp');
@@ -22,6 +23,15 @@ const readSendData = async (error = '') => {
             if (file.split('.').length > 1 && file.split('.')[1] === 'har') {
                 const fileData = fs.readFileSync(`/tmp/${file}`);
                 const json = JSON.parse(fileData.toString());
+                /*
+                 * Log entries collect data for each test url,
+                 * To prevent error for submitting test without url(first entry)
+                 */
+                if (!json.log.entries[0].request) {
+                    throw new Error(
+                        "The initial entry is missing. Please verify your test code and ensure that the first entry point (URL) is correctly specified. This is where you should start your end-to-end testing. For example: await page.goto('https://example.com')",
+                    );
+                }
                 const firstEnterence = json.log.entries[0].request.url;
 
                 const parsedData = convertHarToJSON(json);

utils/lambda-creator.js

@@ -76,6 +76,7 @@ exports.createLambda = async (
                     ...variables,
                     TOKEN: token,
                     LISTENER_URL: listenerUrl,
+                    REGION: region,
                     NAME_FUNCTION: functionName,
                 },
             },