Merge remote-tracking branch 'origin/main' into stack-cloud-provider

go.sum

@@ -523,7 +523,7 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=

internal/benchrunner/runners/system/runner.go

@@ -232,7 +232,6 @@ func (r *runner) run() (report reporters.Reportable, err error) {
 		serviceDeployer, err := servicedeployer.Factory(servicedeployer.FactoryOptions{
 			Profile:  r.options.Profile,
 			RootPath: r.options.PackageRootPath,
-			Profile:  r.options.Profile,
 		})
 
 		if err != nil {

internal/stack/boot.go

@@ -22,6 +22,9 @@ const baseComposeProjectName = "elastic-package-stack"
 
 // DockerComposeProjectName returns the docker compose project name for a given profile.
 func DockerComposeProjectName(profile *profile.Profile) string {
+	if profile.ProfileName == "default" {
+		return baseComposeProjectName
+	}
 	return baseComposeProjectName + "-" + profile.ProfileName
 }