Skip to content

Commit f75cff3

Browse files
committed
WIP: Logger interface compatibility fixes and build improvements
1 parent a2cf640 commit f75cff3

File tree

5 files changed

+205
-105
lines changed

5 files changed

+205
-105
lines changed

go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ replace (
66
// Should not be updated to 0.2.6 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372)
77
github.com/c-bata/go-prompt => github.com/c-bata/go-prompt v0.2.5
88

9-
// Local development - logger interface compatibility
10-
github.com/jfrog/build-info-go => ../build-info-go
11-
129
// Should not be updated to 0.2.0-beta.2 due to a bug (https://github.com/jfrog/jfrog-cli-core/pull/372)
1310
github.com/pkg/term => github.com/pkg/term v1.1.0
1411
)
@@ -247,6 +244,8 @@ require (
247244
sigs.k8s.io/yaml v1.4.0 // indirect
248245
)
249246

247+
replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20250918200810-b3fccf45dc45
248+
250249
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.59.2-0.20250804083101-9cf424ecc926
251250

252251
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250812100044-b52afcc698c1

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,8 @@ github.com/jellydator/ttlcache/v3 v3.3.0 h1:BdoC9cE81qXfrxeb9eoJi9dWrdhSuwXMAnHT
351351
github.com/jellydator/ttlcache/v3 v3.3.0/go.mod h1:bj2/e0l4jRnQdrnSTaGTsh4GSXvMjQcy41i7th0GVGw=
352352
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
353353
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
354+
github.com/jfrog/build-info-go v1.8.9-0.20250918200810-b3fccf45dc45 h1:/qmb4cd6RDRu2dh4S9nXKDB3aR6c3d6L5p87HkK12Ko=
355+
github.com/jfrog/build-info-go v1.8.9-0.20250918200810-b3fccf45dc45/go.mod h1:szdz9+WzB7+7PGnILLUgyY+OF5qD5geBT7UGNIxibyw=
354356
github.com/jfrog/froggit-go v1.20.3 h1:U3HHT0+AEHUVSSyQBbagQR4fLRqGqzSptPujDZuuDTk=
355357
github.com/jfrog/froggit-go v1.20.3/go.mod h1:obSG1SlsWjktkuqmKtpq7MNTTL63e0ot+ucTnlOMV88=
356358
github.com/jfrog/go-mockhttp v0.3.1 h1:/wac8v4GMZx62viZmv4wazB5GNKs+GxawuS1u3maJH8=

npm_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
6-
utils2 "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
7-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
8-
"github.com/jfrog/jfrog-client-go/http/httpclient"
9-
"github.com/stretchr/testify/require"
10-
"gopkg.in/yaml.v2"
115
"net/http"
126
"os"
137
"os/exec"
@@ -16,6 +10,13 @@ import (
1610
"strings"
1711
"testing"
1812

13+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
14+
utils2 "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
15+
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
16+
"github.com/jfrog/jfrog-client-go/http/httpclient"
17+
"github.com/stretchr/testify/require"
18+
"gopkg.in/yaml.v2"
19+
1920
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/yarn"
2021

2122
buildutils "github.com/jfrog/build-info-go/build/utils"

poetry_test.go

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,33 @@ import (
2626
)
2727

2828
func TestPoetryInstallNativeSyntax(t *testing.T) {
29-
testPoetryInstall(t, false)
29+
testPoetryInstall(t, false, false)
30+
}
31+
32+
func TestPoetryInstallNativeFlexPack(t *testing.T) {
33+
testPoetryInstall(t, false, true)
3034
}
3135

3236
// Deprecated - Test legacy syntax for backward compatibility
3337
func TestPoetryInstallLegacy(t *testing.T) {
34-
testPoetryInstall(t, true)
38+
testPoetryInstall(t, true, false)
3539
}
3640

37-
func testPoetryInstall(t *testing.T, isLegacy bool) {
41+
func testPoetryInstall(t *testing.T, isLegacy bool, useFlexPack bool) {
3842
// Init Poetry test
3943
initPoetryTest(t)
4044

45+
// Set environment for FlexPack implementation if requested
46+
var setEnvCallback func()
47+
if useFlexPack {
48+
setEnvCallback = clientTestUtils.SetEnvWithCallbackAndAssert(t, "JFROG_RUN_NATIVE", "true")
49+
}
50+
defer func() {
51+
if setEnvCallback != nil {
52+
setEnvCallback()
53+
}
54+
}()
55+
4156
// Populate cli config with 'default' server
4257
oldHomeDir, newHomeDir := prepareHomeDir(t)
4358
defer func() {
@@ -226,6 +241,10 @@ func TestPoetryBuildInfoCollection(t *testing.T) {
226241
// Test the FlexPack build info collection functionality
227242
initPoetryTest(t)
228243

244+
// Set environment for FlexPack implementation
245+
setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, "JFROG_RUN_NATIVE", "true")
246+
defer setEnvCallBack()
247+
229248
oldHomeDir, newHomeDir := prepareHomeDir(t)
230249
defer func() {
231250
clientTestUtils.SetEnvAndAssert(t, coreutils.HomeDir, oldHomeDir)
@@ -330,6 +349,10 @@ func TestPoetryFlexPackFeatures(t *testing.T) {
330349
// Test specific FlexPack features for Poetry
331350
initPoetryTest(t)
332351

352+
// Set environment for FlexPack implementation
353+
setEnvCallBack := clientTestUtils.SetEnvWithCallbackAndAssert(t, "JFROG_RUN_NATIVE", "true")
354+
defer setEnvCallBack()
355+
333356
oldHomeDir, newHomeDir := prepareHomeDir(t)
334357
defer func() {
335358
clientTestUtils.SetEnvAndAssert(t, coreutils.HomeDir, oldHomeDir)

0 commit comments

Comments
 (0)