Merge pull request #144 from cwaltken-edrans/fix_timeout

Fix continuous execution of lambda functions
goadapp · Jul 17, 2017 · 2618332 · 2618332
2 parents 600a708 + a76312e
commit 2618332
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 28 deletions.
diff --git a/infrastructure/aws/aws.go b/infrastructure/aws/aws.go
@@ -44,7 +44,7 @@ func (infra *AwsInfrastructure) invokeLambda(args interface{}) {
 	svc := lambda.New(session.New(), infra.config)
 
 	svc.InvokeAsync(&lambda.InvokeAsyncInput{
-		FunctionName: aws.String("goad:" + version.LambdaVersion()),
+		FunctionName: aws.String("goad"),
 		InvokeArgs:   toJSONReadSeeker(args),
 	})
 }
@@ -245,7 +245,7 @@ func (infra *AwsInfrastructure) createIAMLambdaRolePolicy(roleName string) error
 						 "lambda:Invoke*"
 				 ],
 				 "Resource": [
-						 "arn:aws:lambda:*:*:goad:*"
+						 "arn:aws:lambda:*:*:function:goad"
 				 ]
 		 },
 			{

diff --git a/lambda/lambda.go b/lambda/lambda.go
@@ -544,7 +544,7 @@ func (l *goadLambda) forkNewLambda() {
 	j, _ := json.Marshal(args)
 
 	output, err := svc.InvokeAsync(&lambda.InvokeAsyncInput{
-		FunctionName: aws.String("goad:" + version.LambdaVersion()),
+		FunctionName: aws.String("goad"),
 		InvokeArgs:   bytes.NewReader(j),
 	})
 	fmt.Println(output)
@@ -563,31 +563,20 @@ func (l *goadLambda) getInvokeArgsForFork() invokeArgs {
 	settings := l.Settings
 	params := settings.RequestParameters
 	args.Flags = []string{
-		"-u",
-		fmt.Sprintf("%s", params.URL),
-		"-c",
-		fmt.Sprintf("%s", strconv.Itoa(settings.ConcurrencyCount)),
-		"-n",
-		fmt.Sprintf("%s", strconv.Itoa(settings.MaxRequestCount)),
-		"-p",
-		fmt.Sprintf("%s", strconv.Itoa(l.Settings.CompletedRequestCount)),
-		"-N",
-		fmt.Sprintf("%s", strconv.Itoa(settings.StresstestTimeout)),
-		"-s",
-		fmt.Sprintf("%s", settings.SqsURL),
-		"-q",
-		fmt.Sprintf("%s", settings.QueueRegion),
-		"-t",
-		fmt.Sprintf("%s", settings.ClientTimeout.String()),
-		"-f",
-		fmt.Sprintf("%s", settings.ReportingFrequency.String()),
-		"-r",
-		fmt.Sprintf("%s", settings.LambdaRegion),
-		"-m",
-		fmt.Sprintf("%s", params.RequestMethod),
-		"-b",
-		fmt.Sprintf("%s", params.RequestBody),
-	}
+		fmt.Sprintf("--concurrency=%s", strconv.Itoa(settings.ConcurrencyCount)),
+		fmt.Sprintf("--requests=%s", strconv.Itoa(settings.MaxRequestCount)),
+		fmt.Sprintf("--completed-count=%s", strconv.Itoa(l.Settings.CompletedRequestCount)),
+		fmt.Sprintf("--execution-time=%s", strconv.Itoa(settings.StresstestTimeout)),
+		fmt.Sprintf("--sqsurl=%s", settings.SqsURL),
+		fmt.Sprintf("--queue-region=%s", settings.QueueRegion),
+		fmt.Sprintf("--client-timeout=%s", settings.ClientTimeout),
+		fmt.Sprintf("--frequency=%s", settings.ReportingFrequency),
+		fmt.Sprintf("--aws-region=%s", settings.LambdaRegion),
+		fmt.Sprintf("--method=%s", settings.RequestParameters.RequestMethod),
+		fmt.Sprintf("--body=%s", settings.RequestParameters.RequestBody),
+	}
+	args.Flags = append(args.Flags, fmt.Sprintf("%s", params.URL))
+	fmt.Println(args.Flags)
 	return args
 }