Change back to component

DataDog · Oct 18, 2024 · 1c6ef53 · 1c6ef53
1 parent 6ffb987
commit 1c6ef53
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/components/datadog/apps/cpustress/ecs.go b/components/datadog/apps/cpustress/ecs.go
@@ -14,7 +14,7 @@ type EcsComponent struct {
 }
 
 func EcsAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, opts ...pulumi.ResourceOption) (*ecsComp.Workload, error) {
-	namer := e.Namer.WithPrefix("cpustress")
+	namer := e.Namer.WithPrefix("cpustress").WithPrefix("ec2")
 	opts = append(opts, e.WithProviders(config.ProviderAWS, config.ProviderAWSX))
 
 	ecsComponent := &ecsComp.Workload{}

diff --git a/components/datadog/apps/cpustress/ecsFargate.go b/components/datadog/apps/cpustress/ecsFargate.go
@@ -3,24 +3,27 @@ package cpustress
 import (
 	"github.com/DataDog/test-infra-definitions/common/config"
 	fakeintakeComp "github.com/DataDog/test-infra-definitions/components/datadog/fakeintake"
-	ecsComp "github.com/DataDog/test-infra-definitions/components/ecs"
 	"github.com/DataDog/test-infra-definitions/resources/aws"
 	ecsClient "github.com/DataDog/test-infra-definitions/resources/aws/ecs"
 	classicECS "github.com/pulumi/pulumi-aws/sdk/v6/go/aws/ecs"
 	"github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/ecs"
 	"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
 )
 
-func FargateAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, apiKeySSMParamName pulumi.StringInput, fakeIntake *fakeintakeComp.Fakeintake, opts ...pulumi.ResourceOption) (*ecsComp.Workload, error) {
-	namer := e.Namer.WithPrefix("cpustress")
+type EcsFargateComponent struct {
+	pulumi.ResourceState
+}
+
+func FargateAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, apiKeySSMParamName pulumi.StringInput, fakeIntake *fakeintakeComp.Fakeintake, opts ...pulumi.ResourceOption) (*EcsFargateComponent, error) {
+	namer := e.Namer.WithPrefix("cpustress").WithPrefix("fg")
 	opts = append(opts, e.WithProviders(config.ProviderAWS, config.ProviderAWSX))
 
-	EcsFargateComponent := &ecsComp.Workload{}
-	if err := e.Ctx().RegisterComponentResource("dd:apps", namer.ResourceName("grp"), EcsFargateComponent, opts...); err != nil {
+	ecsFargateComponent := &EcsFargateComponent{}
+	if err := e.Ctx().RegisterComponentResource("dd:apps", namer.ResourceName("grp"), ecsFargateComponent, opts...); err != nil {
 		return nil, err
 	}
 
-	opts = append(opts, pulumi.Parent(EcsFargateComponent))
+	opts = append(opts, pulumi.Parent(ecsFargateComponent))
 
 	stressContainer := &ecs.TaskDefinitionContainerDefinitionArgs{
 		Name:  pulumi.String("stress-ng"),
@@ -64,5 +67,5 @@ func FargateAppDefinition(e aws.Environment, clusterArn pulumi.StringInput, apiK
 		return nil, err
 	}
 
-	return EcsFargateComponent, nil
+	return ecsFargateComponent, nil
 }