Fix for 'include' flag with spec file

Author: agrasth

common/cliutils/spec.go

@@ -1,11 +1,12 @@
 package cliutils
 
 import (
+	"strconv"
+	"strings"
+
 	speccore "github.com/jfrog/jfrog-cli-core/v2/common/spec"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
-	"strconv"
-	"strings"
 )
 
 func GetSpec(c *components.Context, isDownload, overrideFieldsIfSet bool) (specFiles *speccore.SpecFiles, err error) {
@@ -58,6 +59,15 @@ func OverrideFieldsIfSet(spec *speccore.File, c *components.Context) {
 	overrideStringIfSet(&spec.Symlinks, c, "symlinks")
 	overrideStringIfSet(&spec.Transitive, c, "transitive")
 	overrideStringIfSet(&spec.PublicGpgKey, c, "gpg-key")
+	overrideIncludeIfSet(spec, c)
+}
+
+// If `include` exist in the cli args, read it to spec.include as an array split by `;`.
+func overrideIncludeIfSet(spec *speccore.File, c *components.Context) {
+	if c.IsFlagSet("include") {
+		include := strings.Split(c.GetStringFlagValue("include"), ";")
+		spec.SetInclude(include)
+	}
 }
 
 // If `fieldName` exist in the cli args, read it to `field` as a string.

common/project/projectconfig.go

@@ -247,3 +247,26 @@ func ReadResolutionOnlyConfiguration(confFilePath string) (*RepositoryConfig, er
 	}
 	return GetRepoConfigByPrefix(confFilePath, ProjectConfigResolverPrefix, vConfig)
 }
+
+// GetDeploymentConfiguration reads the deployment configuration from the project config file
+func GetDeploymentConfiguration(projectType ProjectType) (*RepositoryConfig, error) {
+	// Get configuration file path.
+	confFilePath, exists, err := GetProjectConfFilePath(projectType)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		return nil, errorutils.CheckErrorf("%s Project configuration does not exist.", projectType.String())
+	}
+	return ReadDeploymentConfiguration(confFilePath)
+}
+
+// ReadDeploymentConfiguration reads the deployer section from the config file
+func ReadDeploymentConfiguration(confFilePath string) (*RepositoryConfig, error) {
+	log.Debug("Preparing to read the deployment config file", confFilePath)
+	vConfig, err := ReadConfigFile(confFilePath, YAML)
+	if err != nil {
+		return nil, err
+	}
+	return GetRepoConfigByPrefix(confFilePath, ProjectConfigDeployerPrefix, vConfig)
+}

common/spec/specfiles.go

@@ -103,6 +103,10 @@ func (f File) GetInclude() []string {
 	return f.include
 }
 
+func (f *File) SetInclude(include []string) {
+	f.include = include
+}
+
 func (f File) IsFlat(defaultValue bool) (bool, error) {
 	return clientutils.StringToBool(f.Flat, defaultValue)
 }

plugins/common/config.go

@@ -63,4 +63,13 @@ func OverrideSpecFieldsIfSet(spec *spec.File, c *components.Context) {
 	OverrideStringIfSet(&spec.Symlinks, c, "symlinks")
 	OverrideStringIfSet(&spec.Transitive, c, "transitive")
 	OverrideStringIfSet(&spec.PublicGpgKey, c, "gpg-key")
+	overrideIncludeIfSet(spec, c)
+}
+
+// If `include` exist in the cli args, read it to spec.include as an array split by `;`.
+func overrideIncludeIfSet(spec *spec.File, c *components.Context) {
+	if c.IsFlagSet("include") {
+		include := strings.Split(c.GetStringFlagValue("include"), ";")
+		spec.SetInclude(include)
+	}
 }