chore: aws mac pool allow orchestrate serverless stack, to allow several task specs

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

Author: adrianriobo

Makefile

@@ -2,8 +2,8 @@ VERSION ?= 0.9.0-dev
 CONTAINER_MANAGER ?= podman
 
 # Image URL to use all building/pushing image targets
-IMG ?= quay.io/redhat-developer/mapt:v${VERSION}
-TKN_IMG ?= quay.io/redhat-developer/mapt:v${VERSION}-tkn
+IMG ?= ghcr.io/redhat-developer/mapt:pr-421
+TKN_IMG ?= ghcr.io/redhat-developer/mapt:pr-421-tkn
 
 # Integrations
 # renovate: datasource=github-releases depName=cirruslabs/cirrus-cli

go.mod

@@ -2,7 +2,7 @@ module github.com/redhat-developer/mapt
 
 go 1.23.1
 
-toolchain go1.24.2
+toolchain go1.23.7
 
 require (
 	github.com/coocood/freecache v1.2.4

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

@@ -2,10 +2,15 @@ package macpool
 
 import (
 	"fmt"
+	"strings"
 
+	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 	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/modules/mac"
+	macHost "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/host"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/modules/serverless"
+	"github.com/redhat-developer/mapt/pkg/util"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 )
 
@@ -50,9 +55,11 @@ func houseKeeper(ctx *maptContext.ContextArgs, r *MacPoolRequestArgs) error {
 }
 
 // Run serverless operation for house keeping
-func (r *MacPoolRequestArgs) scheduleHouseKeeper() error {
-	return serverless.Create(
+func scheduleHouseKeeper(ctx *pulumi.Context, r *MacPoolRequestArgs) error {
+	// First I need to create
+	return serverless.Deploy(ctx,
 		&serverless.ServerlessArgs{
+			Prefix: houseKeepingOperation,
 			ContainerName: fmt.Sprintf("housekeeper-%s-%s-%s",
 				r.PoolName,
 				r.Architecture,
@@ -66,12 +73,17 @@ func (r *MacPoolRequestArgs) scheduleHouseKeeper() error {
 				r.FixedLocation),
 			ScheduleType:      &serverless.Repeat,
 			Schedulexpression: houseKeepingInterval,
-			LogGroupName: fmt.Sprintf("%s-%s-%s",
+			LogGroupName: fmt.Sprintf("%s-%s-%s-%s",
+				houseKeepingOperation,
 				r.PoolName,
 				r.Architecture,
 				r.OSVersion)})
 }
 
+// func destroyScheduleHouseKeeper() error {
+// 	return serverless.Destroy(&houseKeepingOperation)
+// }
+
 func houseKeepingCommand(poolName, arch, osVersion string,
 	offeredCapacity, maxSize int,
 	fixedLocation bool) string {
@@ -83,3 +95,89 @@ func houseKeepingCommand(poolName, arch, osVersion string,
 	}
 	return cmd
 }
+
+func (r *MacPoolRequestArgs) addMachinesToPool(n int) error {
+	if err := validateBackedURL(); err != nil {
+		return err
+	}
+	for i := 0; i < n; i++ {
+		hr := r.fillHostRequest()
+		dh, err := macHost.CreatePoolDedicatedHost(hr)
+		if err != nil {
+			return err
+		}
+		mr := r.fillMacRequest()
+		if err = mr.CreateAvailableMacMachine(dh); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// format for remote backed url when creating the dedicated host
+// the backed url from param is used as base and the ID is appended as sub path
+func validateBackedURL() error {
+	if strings.Contains(maptContext.BackedURL(), "file://") {
+		return fmt.Errorf("local backed url is not allowed for mac pool")
+	}
+	return nil
+}
+
+// transform pool request to host request
+// need if we need to expand the pool
+func (r *MacPoolRequestArgs) fillHostRequest() *macHost.PoolMacDedicatedHostRequestArgs {
+	return &macHost.PoolMacDedicatedHostRequestArgs{
+		MacDedicatedHost: &macHost.MacDedicatedHostRequestArgs{
+			Prefix:        r.Prefix,
+			Architecture:  r.Architecture,
+			FixedLocation: r.FixedLocation,
+		},
+		PoolID: &macHost.PoolID{
+			PoolName:  r.PoolName,
+			Arch:      r.Architecture,
+			OSVersion: r.OSVersion,
+		},
+		BackedURL: fmt.Sprintf("%s/%s",
+			maptContext.BackedURL(),
+			util.RandomID("mapt")),
+	}
+}
+
+// If we need less or equal than the max allowed on the pool we create all of them
+// if need are more than allowed we can create just the allowed
+func (r *MacPoolRequestArgs) addCapacity(p *pool) error {
+	allowed := p.maxSize - p.offeredCapacity
+	needed := p.offeredCapacity - p.currentOfferedCapacity()
+	if needed <= allowed {
+		return r.addMachinesToPool(needed)
+	}
+	return r.addMachinesToPool(allowed)
+}
+
+// If we need less or equal than the max allowed on the pool we create all of them
+// if need are more than allowed we can create just the allowed
+// TODO review allocation time is on the wrong order
+func (r *MacPoolRequestArgs) destroyCapacity(p *pool) error {
+	machinesToDestroy := p.currentOfferedCapacity() - r.OfferedCapacity
+	for i := 0; i < machinesToDestroy; i++ {
+		m := p.destroyableMachines[i]
+		// TODO change this
+		maptContext.SetProjectName(*m.ProjectName)
+		if err := aws.DestroyStack(aws.DestroyStackRequest{
+			Stackname: mac.StackMacMachine,
+			Region:    *m.Region,
+			BackedURL: *m.BackedURL,
+		}); err != nil {
+			return err
+		}
+		if err := aws.DestroyStack(aws.DestroyStackRequest{
+			Stackname: mac.StackDedicatedHost,
+			// TODO check if needed to add region for backedURL
+			Region:    *m.Region,
+			BackedURL: *m.BackedURL,
+		}); err != nil {
+			return err
+		}
+	}
+	return nil
+}