PENDING TO EXTEND executionDefaults

Signed-off-by: Adrian Riobo <[email protected]>

Author: adrianriobo

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

@@ -55,7 +55,8 @@ func houseKeeper(ctx *maptContext.ContextArgs, r *MacPoolRequestArgs) error {
 }
 
 // Run serverless operation for house keeping
-func scheduleHouseKeeper(ctx *pulumi.Context, r *MacPoolRequestArgs) error {
+func houseKeeperTaskSpecScheduler(ctx *pulumi.Context, r *MacPoolRequestArgs,
+	vpcID, subnetID, sgID *string) error {
 	// First I need to create
 	return serverless.Deploy(ctx,
 		&serverless.ServerlessArgs{
@@ -77,7 +78,12 @@ func scheduleHouseKeeper(ctx *pulumi.Context, r *MacPoolRequestArgs) error {
 				houseKeepingOperation,
 				r.PoolName,
 				r.Architecture,
-				r.OSVersion)})
+				r.OSVersion),
+			ExecutionDefaults: map[string]*string{
+				serverless.TaskExecDefaultVPCID:    vpcID,
+				serverless.TaskExecDefaultSubnetID: subnetID,
+				serverless.TaskExecDefaultSGID:     sgID,
+			}})
 }
 
 // func destroyScheduleHouseKeeper() error {

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

@@ -3,19 +3,25 @@ package macpool
 import (
 	"encoding/json"
 	"fmt"
+	"os"
 
 	"github.com/pulumi/pulumi/sdk/v3/go/auto"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	"github.com/redhat-developer/mapt/pkg/manager"
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/aws"
+	"github.com/redhat-developer/mapt/pkg/provider/aws/data"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/modules/iam"
 	macUtil "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/util"
+	"github.com/redhat-developer/mapt/pkg/provider/aws/modules/network"
+	securityGroup "github.com/redhat-developer/mapt/pkg/provider/aws/services/ec2/security-group"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
+	resourcesUtil "github.com/redhat-developer/mapt/pkg/util/resources"
 )
 
 const (
-	stackName = "stackMacPool"
+	stackName    = "stackMacPool"
+	awsMacPoolID = "amp"
 )
 
 // Create works as an orchestrator for create n machines based on offered capacity
@@ -84,19 +90,55 @@ func (r *MacPoolRequestArgs) deploy(ctx *pulumi.Context) error {
 	// }
 	// TODO create the SG and pass it to the specs
 	// Run once the housekeeper to initialize the pool
-	if err := scheduleHouseKeeper(ctx, r); err != nil {
+	// Create SG with ingress rules
+
+	poolRegion := os.Getenv("AWS_DEFAULT_REGION")
+	azID, err := data.GetRandomAvailabilityZone(poolRegion, nil)
+	if err != nil {
 		return err
 	}
-	if err := requestTaskSpec(ctx, r); err != nil {
+	nr := network.NetworkRequest{
+		Prefix: r.Prefix,
+		ID:     awsMacPoolID,
+		Region: poolRegion,
+		AZ:     *azID,
+	}
+	vpc, targetSubnet, _, _, _, err := nr.Network(ctx)
+	if err != nil {
 		return err
 	}
-	if err := releaseTaskSpec(
-		ctx,
-		r.PoolName,
-		r.Architecture,
-		r.OSVersion); err != nil {
+	sshRunnerSG, err := securityGroup.SGRequest{
+		Name:        resourcesUtil.GetResourceName(r.Prefix, awsMacPoolID, "ssh-runner-sg"),
+		VPC:         vpc,
+		Description: fmt.Sprintf("sg for %s", awsMacPoolID),
+	}.Create(ctx)
+	if err != nil {
 		return err
 	}
+	// We will add values for VPC, Subnet and SG as tags,
+	// the meaning of those tags would be recommended values for running the tasks
+	// As one step is create the task spec (which does not use those values)
+	// And second step is set a scheduler or one time execution / direct execution
+	// in this case those values are needed, so basically we could pick them up from the tags
+	// on the task spec otherwise any other values can be used
+	_ = pulumi.All(vpc.ID(), targetSubnet.ID(), sshRunnerSG.SG.ID()).ApplyT(
+		func(args []interface{}) error {
+			vpcID := args[0].(string)
+			subnetID := args[1].(string)
+			sgID := args[2].(string)
+			if err := houseKeeperTaskSpecScheduler(ctx, r, &vpcID, &subnetID, &sgID); err != nil {
+				return err
+			}
+			if err := requestTaskSpec(ctx, r, &vpcID, &subnetID, &sgID); err != nil {
+				return err
+			}
+			return releaseTaskSpec(
+				ctx,
+				r.PoolName,
+				r.Architecture,
+				r.OSVersion,
+				&vpcID, &subnetID, &sgID)
+		}).(pulumi.StringOutput)
 	return requestReleaserAccount(ctx, r)
 }
 

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

@@ -38,7 +38,7 @@ func releaseRemote(ctx *maptContext.ContextArgs, hostID string) error {
 		&serverless.MaptServerlessClusterName, &containerName, &cmd)
 }
 
-func releaseTaskSpec(ctx *pulumi.Context, poolName, arch, osVersion string) error {
+func releaseTaskSpec(ctx *pulumi.Context, poolName, arch, osVersion string, vpcID, subnetID, sgID *string) error {
 	name := releaseTaskContainerName(poolName, arch, osVersion)
 	return serverless.Deploy(
 		ctx,
@@ -47,6 +47,11 @@ func releaseTaskSpec(ctx *pulumi.Context, poolName, arch, osVersion string) erro
 			ContainerName: name,
 			Command:       releaseCommand,
 			LogGroupName:  name,
+			ExecutionDefaults: map[string]*string{
+				serverless.TaskExecDefaultVPCID:    vpcID,
+				serverless.TaskExecDefaultSubnetID: subnetID,
+				serverless.TaskExecDefaultSGID:     sgID,
+			},
 			Tags: serverlessTags(
 				poolName,
 				arch,

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

@@ -76,7 +76,7 @@ func requestRemote(ctx *maptContext.ContextArgs, r *RequestMachineArgs) error {
 // Run serverless operation request
 // check how we will call it from the request?
 // may add tags and find or add arn to stack?
-func requestTaskSpec(ctx *pulumi.Context, r *MacPoolRequestArgs) error {
+func requestTaskSpec(ctx *pulumi.Context, r *MacPoolRequestArgs, vpcID, subnetID, sgID *string) error {
 	name := requestTaskContainerName(
 		r.PoolName,
 		r.Architecture,
@@ -90,6 +90,11 @@ func requestTaskSpec(ctx *pulumi.Context, r *MacPoolRequestArgs) error {
 				r.Architecture,
 				r.OSVersion),
 			LogGroupName: name,
+			ExecutionDefaults: map[string]*string{
+				serverless.TaskExecDefaultVPCID:    vpcID,
+				serverless.TaskExecDefaultSubnetID: subnetID,
+				serverless.TaskExecDefaultSGID:     sgID,
+			},
 			Tags: serverlessTags(
 				r.PoolName,
 				r.Architecture,