Skip to content

Commit 0d5b0be

Browse files
authored
Migrate artifactory commands from cli-core to cli-artifactory (#293)
1 parent f9974b8 commit 0d5b0be

File tree

10 files changed

+17
-12
lines changed

10 files changed

+17
-12
lines changed

Diff for: artifactory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/jfrog/jfrog-cli-security/tests/utils/integration"
2323
securityIntegrationTestUtils "github.com/jfrog/jfrog-cli-security/tests/utils/integration"
2424

25-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/generic"
25+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/generic"
2626
commonCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands"
2727
"github.com/jfrog/jfrog-cli-core/v2/common/project"
2828
"github.com/jfrog/jfrog-cli-core/v2/common/spec"

Diff for: commands/audit/sca/go/golang.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
biutils "github.com/jfrog/build-info-go/utils"
77
"github.com/jfrog/gofrog/datastructures"
8-
goartifactoryutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/golang"
9-
goutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/golang"
8+
goartifactoryutils "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/golang"
9+
goutils "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/golang"
1010
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
1111
"github.com/jfrog/jfrog-cli-security/commands/audit/sca"
1212
"github.com/jfrog/jfrog-cli-security/utils"

Diff for: commands/audit/sca/npm/npm.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
biutils "github.com/jfrog/build-info-go/build/utils"
77
buildinfo "github.com/jfrog/build-info-go/entities"
8-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/npm"
8+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/npm"
99
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
1010
"github.com/jfrog/jfrog-cli-security/utils"
1111
"github.com/jfrog/jfrog-cli-security/utils/techutils"

Diff for: commands/audit/sca/nuget/nuget.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/jfrog/build-info-go/entities"
2222
biutils "github.com/jfrog/build-info-go/utils"
2323

24-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/dotnet"
24+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/dotnet"
2525
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
2626

2727
"github.com/jfrog/jfrog-cli-security/commands/audit/sca"

Diff for: commands/audit/sca/python/python.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
biutils "github.com/jfrog/build-info-go/utils"
1010
"github.com/jfrog/build-info-go/utils/pythonutils"
1111
"github.com/jfrog/gofrog/datastructures"
12-
utils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/python"
12+
utils "github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/python"
1313
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
1414
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
1515
"github.com/jfrog/jfrog-cli-security/commands/audit/sca"

Diff for: commands/audit/sca/yarn/yarn.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/jfrog/build-info-go/build"
1212
bibuildutils "github.com/jfrog/build-info-go/build/utils"
1313
"github.com/jfrog/gofrog/version"
14-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/yarn"
14+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/yarn"
1515
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
1616
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
1717
"github.com/jfrog/jfrog-cli-core/v2/utils/ioutils"

Diff for: go.mod

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ require (
1111
github.com/jfrog/froggit-go v1.16.2
1212
github.com/jfrog/gofrog v1.7.6
1313
github.com/jfrog/jfrog-apps-config v1.0.1
14+
github.com/jfrog/jfrog-cli-artifactory v0.1.11
1415
github.com/jfrog/jfrog-cli-core/v2 v2.57.7
1516
github.com/jfrog/jfrog-client-go v1.49.1
1617
github.com/magiconair/properties v1.8.9
@@ -115,7 +116,9 @@ require (
115116

116117
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20250126110945-81abbdde452f
117118

118-
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
119+
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250128111343-44586261061e
120+
121+
replace github.com/jfrog/jfrog-cli-artifactory => github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c
119122

120123
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
121124

Diff for: go.sum

+4-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,10 @@ github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
127127
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
128128
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
129129
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
130-
github.com/jfrog/jfrog-cli-core/v2 v2.57.7 h1:2cZS9C5jBYpyCF4PoUzvGCnwFA7CsvG6jszCj1I3tsg=
131-
github.com/jfrog/jfrog-cli-core/v2 v2.57.7/go.mod h1:ueB6LtU+gW7/hTyfKyka/BHi52oo5lEH46RodTly1PU=
130+
github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c h1:9975QDk6vBZG7vjsKVCuQB56r4xxeoYHHjmTzxbd4H8=
131+
github.com/jfrog/jfrog-cli-artifactory v0.1.12-0.20250128042424-bb6a289e237c/go.mod h1:/sP5tyuFpH9WJp0+vztczuXcxIYHlMye0CDWCxhy4/M=
132+
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250128111343-44586261061e h1:QieRnuB+YDGS8c5QIt5bcJblE8KnomnHn3fpP9bymI8=
133+
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20250128111343-44586261061e/go.mod h1:ALempEeph7JoZZS2ob7xK+0r9v82z8IBDzQB1hnaxuQ=
132134
github.com/jfrog/jfrog-client-go v1.28.1-0.20250126110945-81abbdde452f h1:2IIy3XfvmEp5zJgakKZiyKGGeVyDsouwYmtD+4QiVd4=
133135
github.com/jfrog/jfrog-client-go v1.28.1-0.20250126110945-81abbdde452f/go.mod h1:ohIfKpMBCQsE9kunrKQ1wvoExpqsPLaluRFO186B5EM=
134136
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=

Diff for: scans_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/jfrog/jfrog-cli-security/utils/jasutils"
2424
"github.com/jfrog/jfrog-cli-security/utils/validations"
2525

26-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/container"
26+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/container"
2727
containerUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
2828

2929
"github.com/jfrog/jfrog-cli-core/v2/common/build"

Diff for: tests/utils/integration/test_integrationutils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
testUtils "github.com/jfrog/jfrog-cli-security/tests/utils"
1616
"github.com/jfrog/jfrog-cli-security/utils/xsc"
1717

18-
"github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/repository"
18+
"github.com/jfrog/jfrog-cli-artifactory/artifactory/commands/repository"
1919
artifactoryUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
2020
commonCommands "github.com/jfrog/jfrog-cli-core/v2/common/commands"
2121
commonTests "github.com/jfrog/jfrog-cli-core/v2/common/tests"

0 commit comments

Comments
 (0)