Move settings to stack package

Author: ycombinator

internal/testrunner/common.go renamed to internal/stack/settings.go

@@ -2,12 +2,12 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package testrunner
+package stack
 
 import "os"
 
-// StackSettings encapsulate the various settings required to connect to the Elastic Stack.
-type StackSettings struct {
+// Settings encapsulate the various settings required to connect to the Elastic Stack.
+type Settings struct {
 	Elasticsearch struct {
 		Host     string
 		Username string
@@ -18,20 +18,20 @@ type StackSettings struct {
 	}
 }
 
-// GetStackSettingsFromEnv loads Elastic stack connnection settings from
+// CurrentSettings loads Elastic stack connection settings from
 // environment variables and returns them.
-func GetStackSettingsFromEnv() StackSettings {
-	s := StackSettings{}
+func CurrentSettings() Settings {
+	s := Settings{}
 
-	s.Elasticsearch.Host = os.Getenv("ELASTIC_PACKAGE_ELASTICSEARCH_HOST")
+	s.Elasticsearch.Host = os.Getenv(ElasticsearchHostEnv)
 	if s.Elasticsearch.Host == "" {
 		s.Elasticsearch.Host = "http://localhost:9200"
 	}
 
-	s.Elasticsearch.Username = os.Getenv("ELASTIC_PACKAGE_ELASTICSEARCH_USERNAME")
-	s.Elasticsearch.Password = os.Getenv("ELASTIC_PACKAGE_ELASTICSEARCH_PASSWORD")
+	s.Elasticsearch.Username = os.Getenv(ElasticsearchUsernameEnv)
+	s.Elasticsearch.Password = os.Getenv(ElasticsearchPasswordEnv)
 
-	s.Kibana.Host = os.Getenv("ELASTIC_PACKAGE_KIBANA_HOST")
+	s.Kibana.Host = os.Getenv(KibanaHostEnv)
 	if s.Kibana.Host == "" {
 		s.Kibana.Host = "http://localhost:5601"
 	}

internal/testrunner/runners/asset/runner.go

@@ -15,6 +15,7 @@ import (
 	"github.com/elastic/elastic-package/internal/kibana/ingestmanager"
 	"github.com/elastic/elastic-package/internal/logger"
 	"github.com/elastic/elastic-package/internal/packages"
+	"github.com/elastic/elastic-package/internal/stack"
 	"github.com/elastic/elastic-package/internal/testrunner"
 )
 
@@ -30,7 +31,7 @@ const (
 type runner struct {
 	testFolder      testrunner.TestFolder
 	packageRootPath string
-	stackSettings   testrunner.StackSettings
+	stackSettings   stack.Settings
 	esClient        *es.Client
 
 	// Execution order of following handlers is defined in runner.tearDown() method.
@@ -62,7 +63,7 @@ func (r runner) IsConfigRequired() bool {
 func (r runner) Run(options testrunner.TestOptions) ([]testrunner.TestResult, error) {
 	r.testFolder = options.TestFolder
 	r.packageRootPath = options.PackageRootPath
-	r.stackSettings = testrunner.GetStackSettingsFromEnv()
+	r.stackSettings = stack.CurrentSettings()
 	r.esClient = options.ESClient
 
 	return r.run()