Skip to content

Commit d3d0d25

Browse files
authored
Added config extractor for new npm publish impl (#1374)
1 parent bfb5e9a commit d3d0d25

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

artifactory/utils/search.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ package utils
33
import (
44
"encoding/json"
55
"errors"
6+
buildinfo "github.com/jfrog/build-info-go/entities"
67
ioutils "github.com/jfrog/gofrog/io"
78
"github.com/jfrog/jfrog-client-go/artifactory"
9+
"strings"
810

911
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
1012
"github.com/jfrog/jfrog-client-go/artifactory/services"
@@ -188,3 +190,15 @@ func SearchFiles(servicesManager artifactory.ArtifactoryServicesManager, spec *s
188190
}
189191
return
190192
}
193+
194+
func ConvertArtifactsSearchDetailsToBuildInfoArtifacts(artifactsDetailsReader *content.ContentReader) ([]buildinfo.Artifact, error) {
195+
var buildArtifacts []buildinfo.Artifact
196+
for artifactSearchDetails := new(utils.ResultItem); artifactsDetailsReader.NextRecord(artifactSearchDetails) == nil; artifactSearchDetails = new(utils.ResultItem) {
197+
artifact := artifactSearchDetails.ToArtifact()
198+
if i := strings.LastIndex(artifact.Name, "."); i != -1 {
199+
artifact.Type = artifact.Name[i+1:]
200+
}
201+
buildArtifacts = append(buildArtifacts, artifact)
202+
}
203+
return buildArtifacts, artifactsDetailsReader.GetError()
204+
}

utils/coreutils/cmdutils.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ func ExtractStringOptionFromArgs(args []string, optionName string) (cleanArgs []
216216
return
217217
}
218218

219+
func ExtractUseNativeFromArgs(args []string) (cleanArgs []string, useNpmrc bool, err error) {
220+
return extractBoolOptionFromArgs(args, "run-native")
221+
}
222+
219223
func extractBoolOptionFromArgs(args []string, optionName string) (cleanArgs []string, value bool, err error) {
220224
cleanArgs = append([]string(nil), args...)
221225

0 commit comments

Comments
 (0)