Add missing Test Run ID for service up command (#1871)

Add missing test run ID when creating the service using the "elastic-package service up" command
elastic · Jun 3, 2024 · 418d9a2 · 418d9a2
1 parent 4866988
commit 418d9a2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/internal/common/helpers.go b/internal/common/helpers.go
@@ -6,10 +6,16 @@ package common
 
 import (
 	"fmt"
+	"math/rand"
 	"slices"
 	"strings"
 )
 
+const (
+	testRunMaxID = 99999
+	testRunMinID = 10000
+)
+
 // TrimStringSlice removes whitespace from the beginning and end of the contents of a []string.
 func TrimStringSlice(slice []string) {
 	for iterator, item := range slice {
@@ -48,3 +54,7 @@ func ToStringSlice(val interface{}) ([]string, error) {
 	}
 	return s, nil
 }
+
+func CreateTestRunID() string {
+	return fmt.Sprintf("%d", rand.Intn(testRunMaxID-testRunMinID)+testRunMinID)
+}
diff --git a/internal/service/boot.go b/internal/service/boot.go
@@ -12,6 +12,7 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/elastic/elastic-package/internal/common"
 	"github.com/elastic/elastic-package/internal/logger"
 	"github.com/elastic/elastic-package/internal/profile"
 
@@ -64,6 +65,7 @@ func BootUp(ctx context.Context, options Options) error {
 	svcInfo.Name = options.ServiceName
 	svcInfo.Logs.Folder.Agent = system.ServiceLogsAgentDir
 	svcInfo.Logs.Folder.Local = locationManager.ServiceLogDir()
+	svcInfo.Test.RunID = common.CreateTestRunID()
 	deployed, err := serviceDeployer.SetUp(ctx, svcInfo)
 	if err != nil {
 		return fmt.Errorf("can't set up the service deployer: %w", err)

diff --git a/internal/servicedeployer/factory.go b/internal/servicedeployer/factory.go
@@ -31,9 +31,6 @@ type FactoryOptions struct {
 
 	PolicyName string
 
-	PackageName string
-	DataStream  string
-
 	Variant string
 
 	RunTearDown  bool

diff --git a/internal/testrunner/runners/system/runner.go b/internal/testrunner/runners/system/runner.go
@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"math/rand"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -41,9 +40,6 @@ import (
 )
 
 const (
-	testRunMaxID = 99999
-	testRunMinID = 10000
-
 	checkFieldsBody = `{
 		"fields": ["*"],
 		"runtime_mappings": {
@@ -339,8 +335,6 @@ func (r *runner) createServiceOptions(variantName string) servicedeployer.Factor
 		Variant:                variantName,
 		Type:                   servicedeployer.TypeTest,
 		StackVersion:           r.stackVersion.Version(),
-		PackageName:            r.options.TestFolder.Package,
-		DataStream:             r.options.TestFolder.DataStream,
 		RunTearDown:            r.options.RunTearDown,
 		RunTestsOnly:           r.options.RunTestsOnly,
 		RunSetup:               r.options.RunSetup,
@@ -387,7 +381,7 @@ func (r *runner) createServiceInfo() (servicedeployer.ServiceInfo, error) {
 	svcInfo.Name = r.options.TestFolder.Package
 	svcInfo.Logs.Folder.Local = r.locationManager.ServiceLogDir()
 	svcInfo.Logs.Folder.Agent = ServiceLogsAgentDir
-	svcInfo.Test.RunID = createTestRunID()
+	svcInfo.Test.RunID = common.CreateTestRunID()
 
 	if r.options.RunTearDown || r.options.RunTestsOnly {
 		logger.Debug("Skip creating output directory")
@@ -648,10 +642,6 @@ func (r *runner) runTestPerVariant(ctx context.Context, result *testrunner.Resul
 	return partial, nil
 }
 
-func createTestRunID() string {
-	return fmt.Sprintf("%d", rand.Intn(testRunMaxID-testRunMinID)+testRunMinID)
-}
-
 func (r *runner) isSyntheticsEnabled(ctx context.Context, dataStream, componentTemplatePackage string) (bool, error) {
 	resp, err := r.options.API.Cluster.GetComponentTemplate(
 		r.options.API.Cluster.GetComponentTemplate.WithContext(ctx),
@@ -1258,7 +1248,7 @@ func (r *runner) setupAgent(ctx context.Context, config *testConfig, state Servi
 	if !r.options.RunIndependentElasticAgent {
 		return nil, agentdeployer.AgentInfo{}, nil
 	}
-	agentRunID := createTestRunID()
+	agentRunID := common.CreateTestRunID()
 	if r.options.RunTearDown || r.options.RunTestsOnly {
 		agentRunID = state.AgentRunID
 	}