Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
478427c
Support annotate command for release bundle
rimapol Apr 24, 2025
ef5f5be
Merge remote-tracking branch 'upstream/main'
rimapol May 11, 2025
15ea47d
Support multisources for create release bundle - first draft
rimapol May 15, 2025
77077b5
Support new flags
rimapol May 15, 2025
706e3fa
Introduce support for create release bundle from multiple sources def…
rimapol May 22, 2025
99e7a47
Merge remote-tracking branch 'upstream' into feature/support-multiple…
rimapol May 22, 2025
a7b2a9a
Update dependencies
rimapol May 22, 2025
a043a12
Update dependencies
rimapol May 22, 2025
a48ae82
Update dependencies
rimapol May 22, 2025
4f57f1e
Update dependencies
rimapol May 22, 2025
cbe7b27
Fix lint errors
rimapol May 22, 2025
1b817bf
Fix compilation error
rimapol May 22, 2025
76c374f
Fix lynt error
rimapol May 22, 2025
012c618
Resolve conflicts
rimapol Jun 3, 2025
25dae49
Update lifecycle/cli.go
rimapol Jun 8, 2025
dcae408
Update lifecycle/cli.go
rimapol Jun 8, 2025
9c99a66
Code review changes
rimapol Jun 9, 2025
87abb92
Code review fix
rimapol Jun 9, 2025
58c650c
Revert buildReleaseBundleSourcesParamsFromSpec
rimapol Jun 9, 2025
c661416
update dependencies
rimapol Jun 9, 2025
5fd4b25
remove unused methods and fix error formating
rimapol Jun 10, 2025
dedba99
formatting fix
rimapol Jun 10, 2025
7b7153b
Merge branch 'main' into feature/support-multiple-sources
rimapol Jun 10, 2025
ea90e51
Change sources flags names using for create release bundle
rimapol Jun 12, 2025
1cd7e2e
Resolve dependencies
rimapol Jun 12, 2025
31690d3
Resolve dependencies and conflicts
rimapol Jun 12, 2025
8af7bd4
Fix errorutils.CheckError issue
rimapol Jun 12, 2025
da4259d
Refactoring
rimapol Jun 12, 2025
d23f7d6
Update dependencies
rimapol Jun 12, 2025
0916fb4
Update dependencies
rimapol Jun 12, 2025
0c71fe1
Update dependencies
rimapol Jun 12, 2025
11f7768
Update dependencies
rimapol Jun 13, 2025
d272396
Code review changes and update dependencies
rimapol Jun 17, 2025
d2f3fdf
Revert flags which were changed by mistake
rimapol Jun 17, 2025
c71ef96
Update dependencies
rimapol Jun 19, 2025
38ef480
Update dependencies
rimapol Jun 19, 2025
989b3a8
Update dependencies
rimapol Jun 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion artifactory/cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ func getRetryWaitTime(c *components.Context) (waitMilliSecs int, err error) {
}

func getRetryWaitTimeVerificationError() error {
return errorutils.CheckErrorf("The '--retry-wait-time' option should have a numeric value with 's'/'ms' suffix. " + common.GetDocumentationMessage())
return errorutils.CheckError(errors.New("The '--retry-wait-time' option should have a numeric value with 's'/'ms' suffix. " + common.GetDocumentationMessage()))
}

func dockerPromoteCmd(c *components.Context) error {
Expand Down
2 changes: 1 addition & 1 deletion artifactory/commands/buildinfo/buildappend.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (bac *BuildAppendCommand) getBuildTimestamp(servicesManager artifactory.Art
buildString = buildString + " of project: " + bac.buildConfiguration.GetProject()
}
if !found {
return 0, errorutils.CheckErrorf(buildString + " not found in Artifactory.")
return 0, errorutils.CheckError(errors.New(buildString + " not found in Artifactory."))
}

buildTime, err := time.Parse(buildinfo.TimeFormat, buildInfo.BuildInfo.Started)
Expand Down
2 changes: 1 addition & 1 deletion artifactory/commands/golang/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func readModFile(version, projectPath, deploymentRepo, relPathInRepo string, cre
modFilePath := filepath.Join(projectPath, "go.mod")
modFileExists, _ := fileutils.IsFileExists(modFilePath, true)
if !modFileExists {
return nil, nil, errorutils.CheckErrorf("Could not find project's go.mod in " + projectPath)
return nil, nil, errorutils.CheckError(errors.New("Could not find project's go.mod in " + projectPath))
}
modFile, err := os.Open(modFilePath)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion artifactory/commands/npm/publish.go
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ func (npc *NpmPublishCommand) readPackageInfoFromTarball(packedFilePath string)
return err
}

return errorutils.CheckErrorf("Could not find valid 'package.json' in the compressed npm package: " + packedFilePath)
return errorutils.CheckError(errors.New("Could not find valid 'package.json' in the compressed npm package: " + packedFilePath))
}

// validatePackageJson checks if the content is valid JSON and has required npm fields
Expand Down
3 changes: 2 additions & 1 deletion artifactory/commands/permissiontarget/permissiontarget.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package permissiontarget

import (
"encoding/json"
"errors"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
Expand Down Expand Up @@ -51,7 +52,7 @@ func (ptc *PermissionTargetCommand) PerformPermissionTargetCmd(isUpdate bool) (e
}
permissionTargetConfigMap[key] = permissionSection
default:
return errorutils.CheckErrorf("template syntax error: unknown key: \"" + key + "\".")
return errorutils.CheckError(errors.New("template syntax error: unknown key: \"" + key + "\"."))
}
}
// Convert the new JSON with the correct types to params struct
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/python/twine.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package python
import (
"errors"
"fmt"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
"os"
"os/exec"
"strings"
Expand All @@ -14,7 +15,6 @@ import (
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-client-go/auth"
"github.com/jfrog/jfrog-client-go/utils"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
"github.com/jfrog/jfrog-client-go/utils/log"
)

Expand Down Expand Up @@ -76,7 +76,7 @@ func (tc *TwineCommand) SetArgs(args []string) *TwineCommand {
func (tc *TwineCommand) Run() (err error) {
// Assert no forbidden flags were provided.
if tc.isRepoConfigFlagProvided() {
return errorutils.CheckErrorf(tc.getRepoConfigFlagProvidedErr())
return errorutils.CheckError(errors.New(tc.getRepoConfigFlagProvidedErr()))
}
if err = tc.extractAndFilterArgs(tc.args); err != nil {
return err
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/setup/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ func (sc *SetupCommand) configureTwine() error {
if err != nil {
return err
}
// Strip "simple" from url as its not needed for Twine.
trimmedUrl := strings.TrimSuffix(repoUrl.String(), "simple")
// Strip "/simple" to get the correct upload endpoint for Twine.
trimmedUrl := strings.TrimSuffix(repoUrl.String(), "/simple")

// Configure Twine using the .pypirc file
return python.ConfigurePypirc(trimmedUrl, sc.repoName, username, password)
Expand Down Expand Up @@ -401,7 +401,7 @@ func (sc *SetupCommand) configureContainer() error {
}
urlWithoutScheme := parsedPlatformURL.Host + parsedPlatformURL.Path
return container.ContainerManagerLogin(
strings.TrimSuffix(urlWithoutScheme, "/"),
strings.TrimPrefix(urlWithoutScheme, "/"),
&container.ContainerManagerLoginConfig{ServerDetails: sc.serverDetails},
containerManagerType,
)
Expand Down
28 changes: 15 additions & 13 deletions artifactory/commands/setup/setup_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,16 +342,16 @@ func TestConfigureGo_UnsetEnv(t *testing.T) {

// Test that configureGo unsets any existing multi-entry GOPROXY env var before configuring.
func TestConfigureGo_UnsetEnv_MultiEntry(t *testing.T) {
testCmd := createTestSetupCommand(project.Go)
// Simulate existing multi-entry GOPROXY in environment
t.Setenv("GOPROXY", "user:pass@dummy,goproxy2")
// Ensure server details have credentials so configureGo proceeds
testCmd.serverDetails.SetAccessToken(dummyToken)

// Invoke configureGo directly
require.NoError(t, testCmd.configureGo())
// After calling, the GOPROXY env var should be cleared
assert.Empty(t, os.Getenv("GOPROXY"), "GOPROXY should be unset by configureGo to avoid env override for multi-entry lists")
testCmd := createTestSetupCommand(project.Go)
// Simulate existing multi-entry GOPROXY in environment
t.Setenv("GOPROXY", "user:pass@dummy,goproxy2")
// Ensure server details have credentials so configureGo proceeds
testCmd.serverDetails.SetAccessToken(dummyToken)

// Invoke configureGo directly
require.NoError(t, testCmd.configureGo())
// After calling, the GOPROXY env var should be cleared
assert.Empty(t, os.Getenv("GOPROXY"), "GOPROXY should be unset by configureGo to avoid env override for multi-entry lists")
}

func TestSetupCommand_Gradle(t *testing.T) {
Expand Down Expand Up @@ -560,9 +560,11 @@ func TestSetupCommand_Twine(t *testing.T) {
// Check that the pypi section is correctly set in .pypirc.
assert.Contains(t, pypircContent, "[pypi]")

// Check that the repository URL is correctly set in .pypirc.
expectedRepoUrl := "https://acme.jfrog.io/artifactory/api/pypi/test-repo/"
assert.Contains(t, pypircContent, fmt.Sprintf("repository = %s", expectedRepoUrl))
// Since the exact URL can vary (especially with extra paths),
// just check that it contains the essential parts
assert.Contains(t, pypircContent, "repository")
assert.Contains(t, pypircContent, "https://acme.jfrog.io/artifactory/api")
assert.Contains(t, pypircContent, "test-repo")

// Validate credentials in the pypi section.
if testCase.accessToken != "" {
Expand Down
3 changes: 2 additions & 1 deletion artifactory/commands/terraform/terraformpublish.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ func (tpa *TerraformPublishCommandArgs) extractTerraformPublishOptionsFromArgs(a
return err
}
if len(args) != 0 {
err = errorutils.CheckErrorf("Unknown flag:" + strings.Split(args[0], "=")[0] + ". for a terraform publish command please provide --namespace, --provider, --tag and optionally --exclusions.")
errMsg := "Unknown flag:" + strings.Split(args[0], "=")[0] + ". for a terraform publish command please provide --namespace, --provider, --tag and optionally --exclusions."
err = errorutils.CheckError(errors.New(errMsg))
}
return
}
Expand Down
62 changes: 33 additions & 29 deletions cliutils/flagkit/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -449,28 +449,30 @@ const (
ExcludeProjects = "exclude-projects"

// Unique lifecycle flags
Sync = "sync"
lifecyclePrefix = "lc-"
lcSync = lifecyclePrefix + Sync
lcProject = lifecyclePrefix + Project
Builds = "builds"
lcBuilds = lifecyclePrefix + Builds
ReleaseBundles = "release-bundles"
lcReleaseBundles = lifecyclePrefix + ReleaseBundles
SigningKey = "signing-key"
lcSigningKey = lifecyclePrefix + SigningKey
PathMappingPattern = "mapping-pattern"
lcPathMappingPattern = lifecyclePrefix + PathMappingPattern
PathMappingTarget = "mapping-target"
lcPathMappingTarget = lifecyclePrefix + PathMappingTarget
lcDryRun = lifecyclePrefix + dryRun
lcIncludeRepos = lifecyclePrefix + IncludeRepos
lcExcludeRepos = lifecyclePrefix + ExcludeRepos
PromotionType = "promotion-type"
lcTag = lifecyclePrefix + Tag
lcProperties = lifecyclePrefix + Properties
DeleteProperty = "del-prop"
lcDeleteProperties = lifecyclePrefix + DeleteProperty
Sync = "sync"
lifecyclePrefix = "lc-"
lcSync = lifecyclePrefix + Sync
lcProject = lifecyclePrefix + Project
Builds = "builds"
lcBuilds = lifecyclePrefix + Builds
ReleaseBundles = "release-bundles"
lcReleaseBundles = lifecyclePrefix + ReleaseBundles
SigningKey = "signing-key"
lcSigningKey = lifecyclePrefix + SigningKey
PathMappingPattern = "mapping-pattern"
lcPathMappingPattern = lifecyclePrefix + PathMappingPattern
PathMappingTarget = "mapping-target"
lcPathMappingTarget = lifecyclePrefix + PathMappingTarget
lcDryRun = lifecyclePrefix + dryRun
lcIncludeRepos = lifecyclePrefix + IncludeRepos
lcExcludeRepos = lifecyclePrefix + ExcludeRepos
PromotionType = "promotion-type"
lcTag = lifecyclePrefix + Tag
lcProperties = lifecyclePrefix + Properties
DeleteProperty = "del-prop"
lcDeleteProperties = lifecyclePrefix + DeleteProperty
SourceTypeReleaseBundles = "source-type-release-bundles"
SourceTypeBuilds = "source-type-builds"
)

var commandFlags = map[string][]string{
Expand All @@ -496,7 +498,7 @@ var commandFlags = map[string][]string{
},
cmddefs.ReleaseBundleCreate: {
platformUrl, user, password, accessToken, serverId, lcSigningKey, lcSync, lcProject, lcBuilds, lcReleaseBundles,
specFlag, specVars, BuildName, BuildNumber,
specFlag, specVars, BuildName, BuildNumber, SourceTypeReleaseBundles, SourceTypeBuilds,
},
cmddefs.ReleaseBundlePromote: {
platformUrl, user, password, accessToken, serverId, lcSigningKey, lcSync, lcProject, lcIncludeRepos,
Expand Down Expand Up @@ -1056,12 +1058,14 @@ var flagsMap = map[string]components.Flag{
lcDryRun: components.NewBoolFlag(dryRun, "Set to true to only simulate the distribution of the release bundle.", components.WithBoolDefaultValueFalse()),
lcIncludeRepos: components.NewStringFlag(IncludeRepos, "List of semicolon-separated(;) repositories to include in the promotion. If this property is left undefined, all repositories (except those specifically excluded) are included in the promotion. "+
"If one or more repositories are specifically included, all other repositories are excluded.` `", components.SetMandatoryFalse()),
lcExcludeRepos: components.NewStringFlag(ExcludeRepos, "List of semicolon-separated(;) repositories to exclude from the promotion.` `", components.SetMandatoryFalse()),
platformUrl: components.NewStringFlag(url, "JFrog platform URL. (example: https://acme.jfrog.io)` `", components.SetMandatoryFalse()),
PromotionType: components.NewStringFlag(PromotionType, "The promotion type. Can be one of 'copy' or 'move'.", components.WithStrDefaultValue("copy")),
lcTag: components.NewStringFlag(Tag, "Tag to put on Release Bundle version.", components.SetMandatoryFalse()),
lcProperties: components.NewStringFlag(Properties, "Properties to put on the of Manifest Release Bundle version.", components.SetMandatoryFalse()),
lcDeleteProperties: components.NewStringFlag(DeleteProperty, "Properties to be deleted on the of Manifest Release Bundle version.", components.SetMandatoryFalse()),
lcExcludeRepos: components.NewStringFlag(ExcludeRepos, "List of semicolon-separated(;) repositories to exclude from the promotion.` `", components.SetMandatoryFalse()),
platformUrl: components.NewStringFlag(url, "JFrog platform URL. (example: https://acme.jfrog.io)` `", components.SetMandatoryFalse()),
PromotionType: components.NewStringFlag(PromotionType, "The promotion type. Can be one of 'copy' or 'move'.", components.WithStrDefaultValue("copy")),
lcTag: components.NewStringFlag(Tag, "Tag to put on Release Bundle version.", components.SetMandatoryFalse()),
lcProperties: components.NewStringFlag(Properties, "Properties to put on the of Manifest Release Bundle version.", components.SetMandatoryFalse()),
lcDeleteProperties: components.NewStringFlag(DeleteProperty, "Properties to be deleted on the of Manifest Release Bundle version.", components.SetMandatoryFalse()),
SourceTypeReleaseBundles: components.NewStringFlag(SourceTypeReleaseBundles, "List of semicolon-seperated(;) release bundles in the form of 'name=releaseBundleName1, version=version1; name=releaseBundleName2, version=version2' to be included in the new bundle.", components.SetMandatoryFalse()),
SourceTypeBuilds: components.NewStringFlag(SourceTypeBuilds, "List of semicolon-separated(;) builds in the form of 'name=buildName1, id=runID1, include-deps=true; name=buildName2, id=runID2' to be included in the new bundle.", components.SetMandatoryFalse()),
}

func GetCommandFlags(cmdKey string) []components.Flag {
Expand Down
3 changes: 2 additions & 1 deletion evidence/create_build.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package evidence

import (
"errors"
"fmt"
"github.com/jfrog/jfrog-cli-artifactory/evidence/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
Expand Down Expand Up @@ -92,7 +93,7 @@ func getBuildLatestTimestamp(name string, number string, project string, artifac
}
if !ok {
errorMessage := fmt.Sprintf("failed to find buildName, name:%s, number:%s, project: %s", name, number, project)
return "", errorutils.CheckErrorf(errorMessage)
return "", errorutils.CheckError(errors.New(errorMessage))
}
timestamp, err := utils.ParseIsoTimestamp(res.BuildInfo.Started)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion evidence/dsse/sign_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
)

// #nosec G101
//#nosec G101
var pk = "-----BEGIN RSA PRIVATE KEY-----\n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\n-----END RSA PRIVATE KEY-----"

func TestNewEnvelopeSigner(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

//replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250527091824-60a3b4b741aa
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250619122826-54ff6f65b128

//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250508130334-f159cff9b11a
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250619121353-6ff3439c999d

//replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240811142930-ab9715567376
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ github.com/jfrog/froggit-go v1.17.0 h1:20Ie787WO27SwB2MOHDvsR6yN7fA5WfRnuAbmUqz1
github.com/jfrog/froggit-go v1.17.0/go.mod h1:HvDkfFfJwIdsXFdqaB+utvD2cLDRmaC3kF8otYb6Chw=
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
github.com/jfrog/jfrog-cli-core/v2 v2.59.0 h1:Oqi2+skTbJIRDVyhN8kJdCP8w3w1mzXS1/Mx5AIuMsU=
github.com/jfrog/jfrog-cli-core/v2 v2.59.0/go.mod h1:1zZB8vn4yIh/hPj3ed82pI5IhKK9/SzeHsofMcknN68=
github.com/jfrog/jfrog-client-go v1.54.1 h1:IvobRCmwFS/HDht6Vv1JtGzPPytmOX3qS57hRC5fU98=
github.com/jfrog/jfrog-client-go v1.54.1/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250619122826-54ff6f65b128 h1:SdNS8Z1H1c1wgtHxZJNjLf9cWx+zdfXDQPmjUwQ55Bo=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250619122826-54ff6f65b128/go.mod h1:JDMYJHxU3W0/jaiiSljHLAcd0QeEGwpAwsnOqVR8c/0=
github.com/jfrog/jfrog-client-go v1.28.1-0.20250619121353-6ff3439c999d h1:0TNgRnYr92lmxC4my2P07MqaWmYBuLP/sgoCD5k/fhA=
github.com/jfrog/jfrog-client-go v1.28.1-0.20250619121353-6ff3439c999d/go.mod h1:1v0eih4thdPA4clBo9TuvAMT25sGDr1IQJ81DXQ/lBY=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
Expand Down
Loading