Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Updated dependencies and fixed npm tests
  • Loading branch information
bhanurp committed Jan 20, 2026
commit a1a39996f25aa8722a095bddeae7f9b9a856c51a
9 changes: 2 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ require (
github.com/docker/docker v28.5.2+incompatible
github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1
github.com/jfrog/archiver/v3 v3.6.1
github.com/jfrog/build-info-go v1.13.1-0.20260107080257-82671efa69a2
github.com/jfrog/build-info-go v1.13.1-0.20260119231731-3cc4a0771bbd
github.com/jfrog/gofrog v1.7.6
github.com/jfrog/jfrog-cli-application v1.0.2-0.20251231144110-a68c3ac11c7a
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260107090044-56a45e5c560e
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260120063955-c654c159290e
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b
github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251225153025-9d8ac181d615
github.com/jfrog/jfrog-cli-platform-services v1.10.1-0.20251205121610-171eb9b0000e
Expand Down Expand Up @@ -295,8 +295,3 @@ replace github.com/gfleury/go-bitbucket-v1 => github.com/gfleury/go-bitbucket-v1
// replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security dev

// replace github.com/jfrog/build-info-go => github.com/reshmifrog/build-info-go v1.8.9-0.20260106113011-c7f131cea484

// Local development replaces
replace github.com/jfrog/build-info-go => github.com/bhanurp/build-info-go v1.10.10-0.20260116061627-18c4e0c011a2

replace github.com/jfrog/jfrog-cli-artifactory => github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20260119065635-f5c37e665300
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -729,10 +729,6 @@ github.com/beevik/etree v1.6.0 h1:u8Kwy8pp9D9XeITj2Z0XtA5qqZEmtJtuXZRQi+j03eE=
github.com/beevik/etree v1.6.0/go.mod h1:bh4zJxiIr62SOf9pRzN7UUYaEDa9HEKafK25+sLc0Gc=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bhanurp/build-info-go v1.10.10-0.20260116061627-18c4e0c011a2 h1:l6S8S5VExaNFzffODKL/2H1h7Bj22yPiKF5yCaUC//Q=
github.com/bhanurp/build-info-go v1.10.10-0.20260116061627-18c4e0c011a2/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20260119065635-f5c37e665300 h1:WMCxxFaAESZJvBCm/i60oBawPzX5Gpaj8yNZVj5vGYw=
github.com/bhanurp/jfrog-cli-artifactory v0.1.12-0.20260119065635-f5c37e665300/go.mod h1:UFfu4DKUBoqzIgF9ljJQvjvgkplq6/lNq74WD23sC4g=
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
Expand Down Expand Up @@ -1208,6 +1204,8 @@ github.com/jellydator/ttlcache/v3 v3.4.0 h1:YS4P125qQS0tNhtL6aeYkheEaB/m8HCqdMMP
github.com/jellydator/ttlcache/v3 v3.4.0/go.mod h1:Hw9EgjymziQD3yGsQdf1FqFdpp7YjFMd4Srg5EJlgD4=
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
github.com/jfrog/build-info-go v1.13.1-0.20260119231731-3cc4a0771bbd h1:rDAJA3RLhdjxgHjpYrPiYEl9RuGwDFODx+bvhU7J2LY=
github.com/jfrog/build-info-go v1.13.1-0.20260119231731-3cc4a0771bbd/go.mod h1:+OCtMb22/D+u7Wne5lzkjJjaWr0LRZcHlDwTH86Mpwo=
github.com/jfrog/froggit-go v1.20.6 h1:Xp7+LlEh0m1KGrQstb+u0aGfjRUtv1eh9xQBV3571jQ=
github.com/jfrog/froggit-go v1.20.6/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=
Expand All @@ -1218,6 +1216,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
github.com/jfrog/jfrog-cli-application v1.0.2-0.20251231144110-a68c3ac11c7a h1:XoJ3w2AFi7zniimALNK3idw9bzY9MwB/FM45TMgxYAY=
github.com/jfrog/jfrog-cli-application v1.0.2-0.20251231144110-a68c3ac11c7a/go.mod h1:xum2HquWO5uExa/A7MQs3TgJJVEeoqTR+6Z4mfBr1Xw=
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260120063955-c654c159290e h1:F/VQ7UJ4jaEr9tLJ8jLfy4BF4Obhhd0pWu007SBSHt8=
github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260120063955-c654c159290e/go.mod h1:LbhCULfa/eIPSXNgQ5Xw8BIZRmJ0qfF2I4sPa7AHXkY=
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b h1:gGGmYXuYvcNns1BnLQI13lC+pgMxrmenx+ramtolQuA=
github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260106204841-744f3f71817b/go.mod h1:+Hnaikp/xCSPD/q7txxRy4Zc0wzjW/usrCSf+6uONSQ=
github.com/jfrog/jfrog-cli-evidence v0.8.3-0.20251225153025-9d8ac181d615 h1:y5an0bojHL00ipHP1QuBUrVcP+XK+yZHHOJ/r1I0RUM=
Expand Down
21 changes: 11 additions & 10 deletions npm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -681,15 +681,14 @@ func TestNpmPublishWithDeploymentView(t *testing.T) {
defer cleanNpmTest(t)
wd, err := os.Getwd()
assert.NoError(t, err, "Failed to get current dir")
defer clientTestUtils.ChangeDirAndAssert(t, wd)
initNpmProjectTest(t)
npmPath := initNpmProjectTest(t)
chdirCallBack := clientTestUtils.ChangeDirWithCallback(t, wd, npmPath)
defer chdirCallBack()
assertPrintedDeploymentViewFunc, cleanupFunc := initDeploymentViewTest(t)
defer cleanupFunc()
runGenericNpm(t, "npm", "publish")
// Check deployment view
assertPrintedDeploymentViewFunc()
// Restore workspace
clientTestUtils.ChangeDirAndAssert(t, wd)
}

func TestNpmPackInstall(t *testing.T) {
Expand Down Expand Up @@ -1209,8 +1208,9 @@ func TestGenericNpm(t *testing.T) {
defer cleanNpmTest(t)
wd, err := os.Getwd()
assert.NoError(t, err, "Failed to get current dir")
defer clientTestUtils.ChangeDirAndAssert(t, wd)
initNpmProjectTest(t)
npmPath := initNpmProjectTest(t)
chdirCallBack := clientTestUtils.ChangeDirWithCallback(t, wd, npmPath)
defer chdirCallBack()

jfrogCli := coretests.NewJfrogCli(execMain, "jfrog", "")
args := []string{"npm", "version"}
Expand Down Expand Up @@ -1291,18 +1291,19 @@ func TestNpmBuildPublishWithCIVcsProps(t *testing.T) {

wd, err := os.Getwd()
assert.NoError(t, err)
defer clientTestUtils.ChangeDirAndAssert(t, wd)

// Setup npm project (this changes the working directory)
initNpmProjectTest(t)
// Setup npm project and change to that directory
npmPath := initNpmProjectTest(t)
chdirCallBack := clientTestUtils.ChangeDirWithCallback(t, wd, npmPath)
defer chdirCallBack()

// Run npm publish with build info collection
runJfrogCli(t, "npm", "publish", "--build-name="+buildName, "--build-number="+buildNumber)

// Publish build info - should set CI VCS props on artifacts
assert.NoError(t, artifactoryCli.Exec("bp", buildName, buildNumber))

// Restore working directory
// Restore working directory before getting build info
clientTestUtils.ChangeDirAndAssert(t, wd)

// Get the published build info to find artifact paths
Expand Down
Loading