minor fixes

Author: KevinFairise2

resources/aws/ec2/dedicated_host.go

@@ -49,20 +49,10 @@ func NewDedicatedHost(e aws.Environment, name string, args DedicatedHostArgs, op
 		availabilityZone = pulumi.String(args.AvailabilityZone)
 	}
 
-	// Set default tags if none provided
-	if args.Tags == nil {
-		args.Tags = pulumi.StringMap{
-			"Name": e.Namer.DisplayName(255, pulumi.String(name)),
-		}
-	} else if _, exists := args.Tags["Name"]; !exists {
-		args.Tags["Name"] = e.Namer.DisplayName(255, pulumi.String(name))
-	}
-
 	dedicatedHostArgs := &ec2.DedicatedHostArgs{
 		InstanceType:     pulumi.String(args.InstanceType),
 		AvailabilityZone: availabilityZone,
 		HostRecovery:     pulumi.String(args.HostRecovery),
-		Tags:             args.Tags,
 	}
 
 	return ec2.NewDedicatedHost(e.Ctx(),

resources/aws/environment.go

@@ -25,7 +25,6 @@ const (
 	// AWS Infra
 	DDInfraDefaultVPCIDParamName           = "aws/defaultVPCID"
 	DDInfraDefaultSubnetsParamName         = "aws/defaultSubnets"
-	DDInfraSubnetIdOverrideParamName       = "aws/subnetId"
 	DDInfraDefaultSecurityGroupsParamName  = "aws/defaultSecurityGroups"
 	DDInfraDefaultInstanceTypeParamName    = "aws/defaultInstanceType"
 	DDInfraDefaultInstanceProfileParamName = "aws/defaultInstanceProfile"
@@ -38,7 +37,6 @@ const (
 	DDInfraDefaultShutdownBehavior         = "aws/defaultShutdownBehavior"
 	DDInfraDefaultInternalRegistry         = "aws/defaultInternalRegistry"
 	DDInfraDefaultInternalDockerhubMirror  = "aws/defaultInternalDockerhubMirror"
-	DDInfraHostIdParamName                 = "aws/hostId"
 	DDInfraUseMacosCompatibleSubnets       = "aws/useMacosCompatibleSubnets"
 
 	// AWS ECS
@@ -289,10 +287,6 @@ func (e *Environment) DefaultShutdownBehavior() string {
 	return e.GetStringWithDefault(e.InfraConfig, DDInfraDefaultShutdownBehavior, e.envDefault.ddInfra.defaultShutdownBehavior)
 }
 
-func (e *Environment) HostId() string {
-	return e.InfraConfig.Get(DDInfraHostIdParamName)
-}
-
 func (e *Environment) UseMacosCompatibleSubnets() bool {
 	return e.GetBoolWithDefault(e.InfraConfig, DDInfraUseMacosCompatibleSubnets, e.envDefault.ddInfra.useMacosCompatibleSubnets)
 }

scenarios/aws/ec2/vm.go

@@ -1,7 +1,6 @@
 package ec2
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/DataDog/test-infra-definitions/common/config"
@@ -35,7 +34,6 @@ func NewVM(e aws.Environment, name string, params ...VMOption) (*remote.Host, er
 	if err != nil {
 		return nil, err
 	}
-	fmt.Printf("AMI INFO: %+v", amiInfo)
 	sshUser := amiInfo.defaultUser
 	if infraSSHUser := e.InfraSSHUser(); infraSSHUser != "" {
 		sshUser = infraSSHUser
@@ -175,13 +173,6 @@ func defaultVMArgs(e aws.Environment, vmArgs *vmArgs) error {
 		if vmArgs.tenancy == "" {
 			vmArgs.tenancy = "host"
 		}
-		// Set host ID if provided in environment
-		if vmArgs.hostId == "" {
-			hostId := e.HostId()
-			if hostId != "" {
-				vmArgs.hostId = hostId
-			}
-		}
 	}
 
 	// Handle custom user data and defaults per os

scenarios/aws/ec2/vmargs.go

@@ -16,7 +16,7 @@ import (
 //   - [WithInstanceType]
 //   - [WithUserData]
 //   - [WithName]
-//   - [WithHostId]
+//   - [WithHostID]
 //
 // [Functional options pattern]: https://dave.cheney.net/2014/10/17/functional-options-for-friendly-apis