Code clean up

DataDog · May 21, 2024 · a5bd6db · a5bd6db
1 parent 6fcad86
commit a5bd6db
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/resources/local/docker/vm.go b/resources/local/docker/vm.go
@@ -2,10 +2,12 @@ package docker
 
 import (
 	"fmt"
-	"github.com/DataDog/test-infra-definitions/components/os"
+	"math/rand"
 
 	"github.com/DataDog/test-infra-definitions/common/config"
 	"github.com/DataDog/test-infra-definitions/common/utils"
+	"github.com/DataDog/test-infra-definitions/components/os"
+
 	"github.com/pulumi/pulumi-docker/sdk/v4/go/docker"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
@@ -53,7 +55,7 @@ func NewInstance(e Environment, args VMArgs, opts ...pulumi.ResourceOption) (*do
 
 	// Create Agent container and attach to environment Docker network
 	instance, err := docker.NewContainer(e.Ctx(), "agent-container", &docker.ContainerArgs{
-		Name:         pulumi.String(fmt.Sprintf("agent-%v", e.Ctx().Stack())),
+		Name:         pulumi.String(fmt.Sprintf("agent-%v-%s", e.Ctx().Stack(), getPostfix())),
 		Image:        hostImage.ImageName,
 		CgroupnsMode: pulumi.String("host"),
 		Privileged:   pulumi.Bool(true),
@@ -65,7 +67,7 @@ func NewInstance(e Environment, args VMArgs, opts ...pulumi.ResourceOption) (*do
 				Type:     pulumi.String("bind"),
 			},
 		},
-		Rm:          pulumi.Bool(false),
+		Rm:          pulumi.Bool(true),
 		StopTimeout: pulumi.IntPtr(5),
 		Ports: docker.ContainerPortArray{
 			&docker.ContainerPortArgs{
@@ -76,9 +78,6 @@ func NewInstance(e Environment, args VMArgs, opts ...pulumi.ResourceOption) (*do
 		NetworksAdvanced: &docker.ContainerNetworksAdvancedArray{
 			&docker.ContainerNetworksAdvancedArgs{
 				Name: e.DockerNetwork.Name,
-				Aliases: pulumi.StringArray{
-					pulumi.String("agent"),
-				},
 			},
 		},
 	}, utils.MergeOptions(opts, e.WithProviders(config.ProviderDocker))...)
@@ -87,3 +86,12 @@ func NewInstance(e Environment, args VMArgs, opts ...pulumi.ResourceOption) (*do
 	}
 	return instance, nil
 }
+
+func getPostfix() string {
+	const charset = "abcdefghijklmnopqrstuvwxyz0123456789"
+	b := make([]byte, 5)
+	for i := range b {
+		b[i] = charset[rand.Intn(len(charset))]
+	}
+	return string(b)
+}
diff --git a/scenarios/aws/fakeintake/local.go b/scenarios/aws/fakeintake/local.go
@@ -2,6 +2,8 @@ package fakeintake
 
 import (
 	"fmt"
+	"math/rand"
+
 	"github.com/DataDog/test-infra-definitions/common/config"
 	"github.com/DataDog/test-infra-definitions/common/utils"
 	"github.com/DataDog/test-infra-definitions/components"
@@ -19,6 +21,7 @@ func NewLocalInstance(e docker.Environment, name string, option ...Option) (*fak
 	}
 
 	return components.NewComponent(&e, e.Namer.ResourceName(name), func(fi *fakeintake.Fakeintake) error {
+		fmt.Println("NewLocalInstance.NewComponent")
 		opts := []pulumi.ResourceOption{pulumi.Parent(fi)}
 
 		// Get fake intake image
@@ -32,15 +35,17 @@ func NewLocalInstance(e docker.Environment, name string, option ...Option) (*fak
 		}
 
 		// Start fake intake is a container
+		postfix := getPostfix()
 		fiContainer, err := pdocker.NewContainer(e.Ctx(), "fakeintakeContainer", &pdocker.ContainerArgs{
-			Name:        pulumi.String(fmt.Sprintf("fakeintake-%v", e.Ctx().Stack())),
+			Name:        pulumi.String(fmt.Sprintf("fakeintake-%v-%s", e.Ctx().Stack(), postfix)),
 			Image:       fiImage.ImageId,
-			Rm:          pulumi.Bool(false),
+			Rm:          pulumi.Bool(true),
 			StopTimeout: pulumi.IntPtr(5),
-			Hostname:    pulumi.String("fakeintake"),
+			Hostname:    pulumi.String(fmt.Sprintf("fakeintake-%s", postfix)),
 			Ports: pdocker.ContainerPortArray{
 				&pdocker.ContainerPortArgs{
 					Internal: pulumi.Int(80),
+					Protocol: pulumi.String("tcp"),
 				},
 			},
 			NetworksAdvanced: &pdocker.ContainerNetworksAdvancedArray{
@@ -66,3 +71,12 @@ func NewLocalInstance(e docker.Environment, name string, option ...Option) (*fak
 		return nil
 	})
 }
+
+func getPostfix() string {
+	const charset = "abcdefghijklmnopqrstuvwxyz0123456789"
+	b := make([]byte, 5)
+	for i := range b {
+		b[i] = charset[rand.Intn(len(charset))]
+	}
+	return string(b)
+}
diff --git a/scenarios/local/docker/vm.go b/scenarios/local/docker/vm.go
@@ -16,7 +16,6 @@ import (
 )
 
 func NewVM(e docker.Environment, name string, params ...ec2.VMOption) (*remote.Host, error) {
-
 	vArgs, err := ec2.BuildArgs(params...)
 	if err != nil {
 		return nil, err
@@ -56,7 +55,7 @@ func NewVM(e docker.Environment, name string, params ...ec2.VMOption) (*remote.H
 
 		return remote.InitHost(&e,
 			conn.ToConnectionOutputWithContext(e.Ctx().Context()),
-			os.Ubuntu2204,
+			*dos,
 			"root",
 			command.WaitForSuccessfulConnection,
 			comp,