chore: make aws serverless stack trigger event optional

previously the serverless stack create task definition for the serverless fargate task and the event bridge triggering event, from now on we want to decouple this logic allowing to create any of them independently

Signed-off-by: Adrian Riobo <ariobolo@redhat.com>

Author: adrianriobo

pkg/provider/aws/action/mac-pool/mac-pool.go

@@ -154,21 +154,40 @@ func (r *MacPoolRequestArgs) addMachinesToPool(n int) error {
 // Run serverless operation for house keeping
 func (r *MacPoolRequestArgs) scheduleHouseKeeper() error {
 	return serverless.Create(
-		getHouseKeepingCommand(
-			r.PoolName,
-			r.Architecture,
-			r.OSVersion,
-			r.OfferedCapacity,
-			r.MaxSize,
-			r.FixedLocation),
-		serverless.Repeat,
-		houseKeepingInterval,
-		fmt.Sprintf("%s-%s-%s",
-			r.PoolName,
-			r.Architecture,
-			r.OSVersion))
+		&serverless.ServerlessArgs{
+			Command: getHouseKeepingCommand(
+				r.PoolName,
+				r.Architecture,
+				r.OSVersion,
+				r.OfferedCapacity,
+				r.MaxSize,
+				r.FixedLocation),
+			ScheduleType:      &serverless.Repeat,
+			Schedulexpression: houseKeepingInterval,
+			LogGroupName: fmt.Sprintf("%s-%s-%s",
+				r.PoolName,
+				r.Architecture,
+				r.OSVersion)})
 }
 
+// // Run serverless operation request
+// func (r *MacPoolRequestArgs) requester() error {
+// 	return serverless.Create(
+// 		getHouseKeepingCommand(
+// 			r.PoolName,
+// 			r.Architecture,
+// 			r.OSVersion,
+// 			r.OfferedCapacity,
+// 			r.MaxSize,
+// 			r.FixedLocation),
+// 		serverless.Repeat,
+// 		houseKeepingInterval,
+// 		fmt.Sprintf("%s-%s-%s",
+// 			r.PoolName,
+// 			r.Architecture,
+// 			r.OSVersion))
+// }
+
 func getHouseKeepingCommand(poolName, arch, osVersion string,
 	offeredCapacity, maxSize int,
 	fixedLocation bool) string {

pkg/provider/aws/modules/serverless/serverless.go

@@ -39,7 +39,7 @@ func OneTimeDelayedTask(ctx *pulumi.Context,
 	r := &serverlessRequestArgs{
 		region:             region,
 		command:            cmd,
-		scheduleType:       OneTime,
+		scheduleType:       &OneTime,
 		scheduleExpression: se,
 		prefix:             prefix,
 		componentID:        componentID,
@@ -114,40 +114,42 @@ func (a *serverlessRequestArgs) deploy(ctx *pulumi.Context) error {
 	if err != nil {
 		return err
 	}
-	subnetID, err := data.GetRandomPublicSubnet(a.region)
-	if err != nil {
-		return err
-	}
-	se := scheduleExpressionByType(a.scheduleType, a.scheduleExpression)
-	_, err = scheduler.NewSchedule(ctx,
-		resourcesUtil.GetResourceName(a.prefix, a.componentID, "fgs"),
-		&scheduler.ScheduleArgs{
-			FlexibleTimeWindow: scheduler.ScheduleFlexibleTimeWindowArgs{
-				Mode:                   scheduler.ScheduleFlexibleTimeWindowModeFlexible,
-				MaximumWindowInMinutes: pulumi.Float64(1),
-			},
-			Target: scheduler.ScheduleTargetArgs{
-				EcsParameters: scheduler.ScheduleEcsParametersArgs{
-					TaskDefinitionArn: td.TaskDefinition.Arn(),
-					LaunchType:        scheduler.ScheduleLaunchTypeFargate,
-					NetworkConfiguration: scheduler.ScheduleNetworkConfigurationArgs{
-						// https://github.com/aws/aws-cdk/issues/13348#issuecomment-1539336376
-						AwsvpcConfiguration: scheduler.ScheduleAwsVpcConfigurationArgs{
-							AssignPublicIp: scheduler.ScheduleAssignPublicIpEnabled,
-							Subnets: pulumi.StringArray{
-								pulumi.String(*subnetID),
+	if len(a.scheduleExpression) > 0 {
+		subnetID, err := data.GetRandomPublicSubnet(a.region)
+		if err != nil {
+			return err
+		}
+		se := scheduleExpressionByType(a.scheduleType, a.scheduleExpression)
+		_, err = scheduler.NewSchedule(ctx,
+			resourcesUtil.GetResourceName(a.prefix, a.componentID, "fgs"),
+			&scheduler.ScheduleArgs{
+				FlexibleTimeWindow: scheduler.ScheduleFlexibleTimeWindowArgs{
+					Mode:                   scheduler.ScheduleFlexibleTimeWindowModeFlexible,
+					MaximumWindowInMinutes: pulumi.Float64(1),
+				},
+				Target: scheduler.ScheduleTargetArgs{
+					EcsParameters: scheduler.ScheduleEcsParametersArgs{
+						TaskDefinitionArn: td.TaskDefinition.Arn(),
+						LaunchType:        scheduler.ScheduleLaunchTypeFargate,
+						NetworkConfiguration: scheduler.ScheduleNetworkConfigurationArgs{
+							// https://github.com/aws/aws-cdk/issues/13348#issuecomment-1539336376
+							AwsvpcConfiguration: scheduler.ScheduleAwsVpcConfigurationArgs{
+								AssignPublicIp: scheduler.ScheduleAssignPublicIpEnabled,
+								Subnets: pulumi.StringArray{
+									pulumi.String(*subnetID),
+								},
 							},
 						},
 					},
+					Arn:     clusterArn,
+					RoleArn: sRoleArn,
 				},
-				Arn:     clusterArn,
-				RoleArn: sRoleArn,
-			},
-			ScheduleExpression:         pulumi.String(*se),
-			ScheduleExpressionTimezone: pulumi.String(data.RegionTimezones[a.region]),
-		})
-	if err != nil {
-		return err
+				ScheduleExpression:         pulumi.String(*se),
+				ScheduleExpressionTimezone: pulumi.String(data.RegionTimezones[a.region]),
+			})
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -358,8 +360,8 @@ func generateOneTimeScheduleExpression(region, delay string) (string, error) {
 	return se, nil
 }
 
-func scheduleExpressionByType(st scheduleType, se string) *string {
-	switch st {
+func scheduleExpressionByType(st *scheduleType, se string) *string {
+	switch *st {
 	case Repeat:
 		e := fmt.Sprintf("rate(%s)", se)
 		return &e

pkg/provider/aws/modules/serverless/stack.go

@@ -12,18 +12,18 @@ import (
 // function to create a mapt servless cmd which will be executed repeatedly
 // interval should match expected expression
 // https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-scheduled-rule-pattern.html
-func Create(command string, scheduleType scheduleType, schedulexpression, logGroupName string) error {
+func Create(args *ServerlessArgs) error {
 	// Initially manage it by setup, may we need to customize the region
 	//
 	// THis was initially created for mac, if no FixedLocation we may
 	// on a situation where region differs from resources managed..is this working??
 	region := os.Getenv("AWS_DEFAULT_REGION")
 	r := &serverlessRequestArgs{
 		region:             region,
-		command:            command,
-		scheduleType:       scheduleType,
-		scheduleExpression: schedulexpression,
-		logGroupName:       logGroupName,
+		command:            args.Command,
+		scheduleType:       args.ScheduleType,
+		scheduleExpression: args.Schedulexpression,
+		logGroupName:       args.LogGroupName,
 		// Being isolated stack these values
 		// do not care
 		prefix:      "mapt",

pkg/provider/aws/modules/serverless/types.go

@@ -22,12 +22,19 @@ const (
 	LimitMemory = "2048"
 )
 
+type ServerlessArgs struct {
+	Command           string
+	ScheduleType      *scheduleType
+	Schedulexpression string
+	LogGroupName      string
+}
+
 type serverlessRequestArgs struct {
 	// need this to find the right ECS cluster to run this serverless
 	region string
 	// command and scheduling to be used for it
 	command            string
-	scheduleType       scheduleType
+	scheduleType       *scheduleType
 	scheduleExpression string
 
 	// optional if we want to set the name for the log group were logs are sent