Refactoring: make ingest pipeline name method of DataStreamManifest

Author: ycombinator

internal/packages/assets.go

@@ -0,0 +1 @@
+package packages

internal/packages/packages.go

@@ -20,6 +20,8 @@ const (
 
 	// DataStreamManifestFile is the name of the data stream's manifest file.
 	DataStreamManifestFile = "manifest.yml"
+
+	defaultPipelineName = "default"
 )
 
 // VarValue represents a variable value as defined in a package or data stream
@@ -182,6 +184,13 @@ func ReadDataStreamManifest(path string) (*DataStreamManifest, error) {
 	return &m, nil
 }
 
+func (dsm *DataStreamManifest) GetPipelineNameOrDefault() string {
+	if dsm.Elasticsearch != nil && dsm.Elasticsearch.IngestPipeline != nil && dsm.Elasticsearch.IngestPipeline.Name != "" {
+		return dsm.Elasticsearch.IngestPipeline.Name
+	}
+	return defaultPipelineName
+}
+
 // FindInputByType returns the input for the provided type.
 func (pt *PolicyTemplate) FindInputByType(inputType string) *Input {
 	for _, input := range pt.Inputs {

internal/testrunner/runners/pipeline/ingest_pipeline.go

@@ -23,8 +23,6 @@ import (
 	"github.com/elastic/elastic-package/internal/packages"
 )
 
-const defaultPipelineName = "default"
-
 var ingestPipelineTag = regexp.MustCompile("{{\\s*IngestPipeline.+}}")
 
 type pipelineResource struct {
@@ -57,7 +55,7 @@ func installIngestPipelines(esClient *elasticsearch.Client, dataStreamPath strin
 
 	nonce := time.Now().UnixNano()
 
-	mainPipeline := getWithPipelineNameWithNonce(getPipelineNameOrDefault(dataStreamManifest), nonce)
+	mainPipeline := getWithPipelineNameWithNonce(dataStreamManifest.GetPipelineNameOrDefault(), nonce)
 	pipelines, err := loadIngestPipelineFiles(dataStreamPath, nonce)
 	if err != nil {
 		return "", nil, errors.Wrap(err, "loading ingest pipeline files failed")
@@ -75,13 +73,6 @@ func installIngestPipelines(esClient *elasticsearch.Client, dataStreamPath strin
 	return mainPipeline, jsonPipelines, nil
 }
 
-func getPipelineNameOrDefault(dsm *packages.DataStreamManifest) string {
-	if dsm.Elasticsearch != nil && dsm.Elasticsearch.IngestPipeline != nil && dsm.Elasticsearch.IngestPipeline.Name != "" {
-		return dsm.Elasticsearch.IngestPipeline.Name
-	}
-	return defaultPipelineName
-}
-
 func loadIngestPipelineFiles(dataStreamPath string, nonce int64) ([]pipelineResource, error) {
 	elasticsearchPath := filepath.Join(dataStreamPath, "elasticsearch", "ingest_pipeline")
 	fis, err := ioutil.ReadDir(elasticsearchPath)