Fix for 'include' flag with spec file (#1503)

Make Include field public to allow JSON unmarshaling from spec files and direct field access.
This is cleaner and more consistent with other fields like Exclusions.

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,14 @@ 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") {
+		spec.Include = strings.Split(c.GetStringFlagValue("include"), ";")
+	}
 }
 
 // If `fieldName` exist in the cli args, read it to `field` as a string.

common/spec/builder.go

@@ -230,7 +230,7 @@ func (b *builder) BuildSpec() *SpecFiles {
 				IncludeDeps:             strconv.FormatBool(b.includeDeps),
 				Symlinks:                strconv.FormatBool(b.symlinks),
 				Transitive:              strconv.FormatBool(b.transitive),
-				include:                 b.include,
+				Include:                 b.include,
 			},
 		},
 	}

common/spec/specfiles.go

@@ -92,15 +92,15 @@ type File struct {
 	Symlinks                string
 	Transitive              string
 	TargetPathInArchive     string
-	include                 []string
-	Package                 string `json:"package,omitempty"`
+	Include                 []string `json:"include,omitempty"`
+	Package                 string   `json:"package,omitempty"`
 	Version                 string `json:"version,omitempty"`
 	Type                    string `json:"type,omitempty"`
 	RepoKey                 string `json:"repoKey,omitempty"`
 }
 
 func (f File) GetInclude() []string {
-	return f.include
+	return f.Include
 }
 
 func (f File) IsFlat(defaultValue bool) (bool, error) {
@@ -188,6 +188,7 @@ func (f *File) ToCommonParams() (*utils.CommonParams, error) {
 	params.Offset = f.Offset
 	params.Limit = f.Limit
 	params.ArchiveEntries = f.ArchiveEntries
+	params.Include = f.Include
 	return params, nil
 }
 

plugins/common/config.go

@@ -63,4 +63,12 @@ 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") {
+		spec.Include = strings.Split(c.GetStringFlagValue("include"), ";")
+	}
 }