chore: aws added tags to fargate task spec

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

Author: adrianriobo

cmd/mapt/cmd/aws/services/mac-pool.go

@@ -175,6 +175,7 @@ func request() *cobra.Command {
 
 			ctx := &maptContext.ContextArgs{
 				ResultsOutput: viper.GetString(params.ConnectionDetailsOutput),
+				Serverless:    viper.IsSet(params.Serverless),
 				Debug:         viper.IsSet(params.Debug),
 				DebugLevel:    viper.GetUint(params.DebugLevel),
 				Tags:          viper.GetStringMapString(params.Tags),
@@ -221,6 +222,7 @@ func request() *cobra.Command {
 	flagSet.StringP(awsParams.MACArch, "", awsParams.MACArchDefault, awsParams.MACArchDesc)
 	flagSet.StringP(awsParams.MACOSVersion, "", awsParams.MACOSVersion, awsParams.MACOSVersionDefault)
 	flagSet.StringP(params.Timeout, "", "", params.TimeoutDesc)
+	flagSet.Bool(params.Serverless, false, params.ServerlessDesc)
 	flagSet.AddFlagSet(params.GetGHActionsFlagset())
 	params.AddCirrusFlags(flagSet)
 	c.PersistentFlags().AddFlagSet(flagSet)

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

@@ -10,6 +10,7 @@ import (
 	"github.com/redhat-developer/mapt/pkg/provider/aws"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/modules/iam"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac"
+	macConstants "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/constants"
 	macHost "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/host"
 	macMachine "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/machine"
 	macUtil "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/util"
@@ -35,6 +36,9 @@ func Create(ctx *maptContext.ContextArgs, r *MacPoolRequestArgs) error {
 	if err := r.scheduleHouseKeeper(); err != nil {
 		return err
 	}
+	if err := r.createRequestTaskSpec(); err != nil {
+		return err
+	}
 	return r.requestReleaserAccount()
 }
 
@@ -91,6 +95,10 @@ func HouseKeeper(ctx *maptContext.ContextArgs, r *MacPoolRequestArgs) error {
 }
 
 func Request(ctx *maptContext.ContextArgs, r *RequestMachineArgs) error {
+	// If remote run through serverless
+	if r.Remote {
+		return requestRemote(ctx, r)
+	}
 	// First get full info on the pool and the next machine for request
 	p, err := getPool(r.PoolName, r.Architecture, r.OSVersion)
 	if err != nil {
@@ -129,6 +137,11 @@ func Request(ctx *maptContext.ContextArgs, r *RequestMachineArgs) error {
 		*hi.Host.HostId)
 }
 
+func requestRemote(ctx *maptContext.ContextArgs, r *RequestMachineArgs) error {
+
+	return fmt.Errorf("not implemented yet")
+}
+
 func Release(ctx *maptContext.ContextArgs, hostID string) error {
 	return macUtil.Release(ctx, hostID)
 }
@@ -155,7 +168,7 @@ func (r *MacPoolRequestArgs) addMachinesToPool(n int) error {
 func (r *MacPoolRequestArgs) scheduleHouseKeeper() error {
 	return serverless.Create(
 		&serverless.ServerlessArgs{
-			Command: getHouseKeepingCommand(
+			Command: houseKeepingCommand(
 				r.PoolName,
 				r.Architecture,
 				r.OSVersion,
@@ -170,28 +183,31 @@ func (r *MacPoolRequestArgs) scheduleHouseKeeper() error {
 				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))
-// }
+// Run serverless operation request
+// check how we will call it from the request?
+// may add tags and find or add arn to stack?
+func (r *MacPoolRequestArgs) createRequestTaskSpec() error {
+	return serverless.Create(
+		&serverless.ServerlessArgs{
+			Command: requestCommand(
+				r.PoolName,
+				r.Architecture,
+				r.OSVersion),
+			LogGroupName: fmt.Sprintf("%s-%s-%s-request",
+				r.PoolName,
+				r.Architecture,
+				r.OSVersion),
+			Tags: map[string]string{
+				macConstants.TagKeyArch:      r.Architecture,
+				macConstants.TagKeyOSVersion: r.OSVersion,
+				macConstants.TagKeyPoolName:  r.PoolName,
+			}})
+}
 
-func getHouseKeepingCommand(poolName, arch, osVersion string,
+func houseKeepingCommand(poolName, arch, osVersion string,
 	offeredCapacity, maxSize int,
 	fixedLocation bool) string {
-	cmd := fmt.Sprintf(houseKeepingCommand,
+	cmd := fmt.Sprintf(houseKeepingCommandRegex,
 		poolName, arch, osVersion,
 		offeredCapacity, maxSize)
 	if fixedLocation {
@@ -200,6 +216,12 @@ func getHouseKeepingCommand(poolName, arch, osVersion string,
 	return cmd
 }
 
+func requestCommand(poolName, arch, osVersion string) string {
+	cmd := fmt.Sprintf(requestCommandRegex,
+		poolName, arch, osVersion)
+	return cmd
+}
+
 // 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 {

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

@@ -5,10 +5,15 @@ import (
 )
 
 const (
-	houseKeepingCommand            = "aws mac-pool house-keep --name %s --arch %s --version %s --offered-capacity %d --max-size %d --serverless "
+	houseKeepingCommandRegex       = "aws mac-pool house-keep --name %s --arch %s --version %s --offered-capacity %d --max-size %d --serverless "
 	houseKeepingFixedLocationParam = "--fixed-location "
 	// https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-scheduled-rule-pattern.html#eb-rate-expressions
 	houseKeepingInterval = "27 minutes"
+
+	requestCommandRegex = "aws mac-pool request --name %s --arch %s --version %s --serverless "
+	// requestTimeoutParam   = "--timeout "
+	// itCirrusPWTokenParam  = "--it-cirrus-pw-token "
+	// itCirrusPWLabelsParam = "--it-cirrus-pw-labels "
 )
 
 type MacPoolRequestArgs struct {
@@ -39,17 +44,13 @@ type RequestMachineArgs struct {
 	OSVersion    string
 	// If timeout is set a severless scheduled task will be created to self destroy the resources
 	Timeout string
+	// If remote is set we will run the action through the serverless task spec
+	Remote bool
 }
 
 type ReleaseMachineArgs struct {
 }
 
-// type PoolID struct {
-// 	PoolName  string
-// 	Arch      string
-// 	OSVersion string
-// }
-
 type pool struct {
 	// pool params
 	name            string

pkg/provider/aws/modules/mac/constants/constants.go

@@ -0,0 +1,10 @@
+package constants
+
+const (
+	TagKeyPrefix    = "prefix"
+	TagKeyBackedURL = "backedURL"
+	TagKeyArch      = "arch"
+	// tags added when dedicated host is part of a pool
+	TagKeyOSVersion = "osVersion"
+	TagKeyPoolName  = "poolName"
+)

pkg/provider/aws/modules/mac/host/host.go

@@ -13,6 +13,7 @@ import (
 	awsConstants "github.com/redhat-developer/mapt/pkg/provider/aws/constants"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/data"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac"
+	macConstants "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/constants"
 	"github.com/redhat-developer/mapt/pkg/provider/util/output"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	resourcesUtil "github.com/redhat-developer/mapt/pkg/util/resources"
@@ -28,9 +29,9 @@ import (
 
 func CreatePoolDedicatedHost(args *PoolMacDedicatedHostRequestArgs) (dhi *mac.HostInformation, err error) {
 	tags := map[string]string{
-		tagKeyBackedURL:         args.BackedURL,
-		tagKeyPrefix:            args.MacDedicatedHost.Prefix,
-		maptContext.TagKeyRunID: maptContext.RunID(),
+		macConstants.TagKeyBackedURL: args.BackedURL,
+		macConstants.TagKeyPrefix:    args.MacDedicatedHost.Prefix,
+		maptContext.TagKeyRunID:      maptContext.RunID(),
 	}
 	maps.Copy(tags, args.PoolID.asTags())
 	return createDedicatedHost(args.MacDedicatedHost, args.BackedURL, tags, false)
@@ -40,10 +41,10 @@ func CreatePoolDedicatedHost(args *PoolMacDedicatedHostRequestArgs) (dhi *mac.Ho
 func CreateDedicatedHost(args *MacDedicatedHostRequestArgs) (dhi *mac.HostInformation, err error) {
 	backedURL := getBackedURL()
 	tags := map[string]string{
-		tagKeyBackedURL:         backedURL,
-		tagKeyPrefix:            args.Prefix,
-		tagKeyArch:              args.Architecture,
-		maptContext.TagKeyRunID: maptContext.RunID(),
+		macConstants.TagKeyBackedURL: backedURL,
+		macConstants.TagKeyPrefix:    args.Prefix,
+		macConstants.TagKeyArch:      args.Architecture,
+		maptContext.TagKeyRunID:      maptContext.RunID(),
 	}
 	return createDedicatedHost(args, backedURL, tags, true)
 }

pkg/provider/aws/modules/mac/host/types.go

@@ -1,16 +1,13 @@
 package host
 
+import (
+	macConstants "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/constants"
+)
+
 const (
 	// mapt internal ID for the component: nac dedicated host
 	awsMacHostID = "amh"
 
-	tagKeyPrefix    = "prefix"
-	tagKeyBackedURL = "backedURL"
-	tagKeyArch      = "arch"
-	// tags added when dedicated host is part of a pool
-	tagKeyOSVersion = "osVersion"
-	tagKeyPoolName  = "poolName"
-
 	outputDedicatedHostID = "ammDedicatedHostID"
 	outputDedicatedHostAZ = "ammDedicatedHostAZ"
 	outputRegion          = "ammRegion"
@@ -32,9 +29,9 @@ type PoolID struct {
 
 func (p *PoolID) asTags() map[string]string {
 	return map[string]string{
-		tagKeyArch:      p.Arch,
-		tagKeyOSVersion: p.OSVersion,
-		tagKeyPoolName:  p.PoolName,
+		macConstants.TagKeyArch:      p.Arch,
+		macConstants.TagKeyOSVersion: p.OSVersion,
+		macConstants.TagKeyPoolName:  p.PoolName,
 	}
 }
 

pkg/provider/aws/modules/mac/host/util.go

@@ -10,6 +10,7 @@ import (
 	maptContext "github.com/redhat-developer/mapt/pkg/manager/context"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/data"
 	"github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac"
+	macConstants "github.com/redhat-developer/mapt/pkg/provider/aws/modules/mac/constants"
 	"github.com/redhat-developer/mapt/pkg/util/logging"
 	"golang.org/x/exp/slices"
 )
@@ -18,7 +19,7 @@ import (
 // it will return the list ordered by allocation time
 func GetMatchingHostsInformation(arch string) ([]*mac.HostInformation, error) {
 	matchingTags := maptContext.GetTags()
-	matchingTags[tagKeyArch] = arch
+	matchingTags[macConstants.TagKeyArch] = arch
 	return GetMatchingHostsInStateInformation(matchingTags, nil)
 }
 
@@ -72,12 +73,12 @@ func GetMatchingHostsInStateInformation(matchingTags map[string]string, state *e
 func GetHostInformation(h ec2Types.Host) *mac.HostInformation {
 	az := *h.AvailabilityZone
 	region := az[:len(az)-1]
-	archValue := awsArchIDbyArch[*getTagValue(h.Tags, tagKeyArch)]
+	archValue := awsArchIDbyArch[*getTagValue(h.Tags, macConstants.TagKeyArch)]
 	return &mac.HostInformation{
 		Arch:        &archValue,
-		OSVersion:   getTagValue(h.Tags, tagKeyOSVersion),
-		BackedURL:   getTagValue(h.Tags, tagKeyBackedURL),
-		Prefix:      getTagValue(h.Tags, tagKeyPrefix),
+		OSVersion:   getTagValue(h.Tags, macConstants.TagKeyOSVersion),
+		BackedURL:   getTagValue(h.Tags, macConstants.TagKeyBackedURL),
+		Prefix:      getTagValue(h.Tags, macConstants.TagKeyPrefix),
 		ProjectName: getTagValue(h.Tags, maptContext.TagKeyProjectName),
 		RunID:       getTagValue(h.Tags, maptContext.TagKeyRunID),
 		Region:      &region,

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

@@ -86,6 +86,10 @@ func (a *serverlessRequestArgs) deploy(ctx *pulumi.Context) error {
 		lga.Args.SkipDestroy = pulumi.Bool(false)
 		lga.Args.Name = pulumi.String(a.logGroupName)
 	}
+	tags := maptContext.ResourceTags()
+	if a.tags != nil {
+		tags = a.tags
+	}
 	td, err := awsxecs.NewFargateTaskDefinition(ctx,
 		resourcesUtil.GetResourceName(a.prefix, a.componentID, "fg-task"),
 		&awsxecs.FargateTaskDefinitionArgs{
@@ -104,6 +108,7 @@ func (a *serverlessRequestArgs) deploy(ctx *pulumi.Context) error {
 				RoleArn: roleArn,
 			},
 			LogGroup: lga,
+			Tags:     pulumi.StringMapInput(tags),
 		})
 	if err != nil {
 		return err

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

@@ -3,10 +3,12 @@ package serverless
 import (
 	"os"
 
+	"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/util/logging"
+	utilMaps "github.com/redhat-developer/mapt/pkg/util/maps"
 )
 
 // function to create a mapt servless cmd which will be executed repeatedly
@@ -29,6 +31,11 @@ func Create(args *ServerlessArgs) error {
 		prefix:      "mapt",
 		componentID: "sf",
 	}
+	if args.Tags != nil {
+		r.tags = utilMaps.Convert(args.Tags,
+			func(name string) string { return name },
+			func(value string) pulumi.StringInput { return pulumi.String(value) })
+	}
 	stack := manager.Stack{
 		StackName:           maptContext.StackNameByProject(maptServerlessDefaultPrefix),
 		ProjectName:         maptContext.ProjectName(),

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

@@ -1,5 +1,7 @@
 package serverless
 
+import "github.com/pulumi/pulumi/sdk/v3/go/pulumi"
+
 var (
 	// stackName = "mapt-serverless"
 
@@ -23,10 +25,13 @@ const (
 )
 
 type ServerlessArgs struct {
-	Command           string
+	Command string
+	// From here params are optional
+	LogGroupName string
+	Tags         map[string]string
+	// If no schedule info is added just create the task spec
 	ScheduleType      *scheduleType
 	Schedulexpression string
-	LogGroupName      string
 }
 
 type serverlessRequestArgs struct {
@@ -42,4 +47,5 @@ type serverlessRequestArgs struct {
 	logGroupName string
 	// optional params in case we create serverless inside a stack
 	prefix, componentID string
+	tags                pulumi.StringMap
 }