Skip to content

Commit

Permalink
Fix v2 module imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@eyalbe4
eyalbe4 committed Jul 4, 2021
1 parent ed915c0 commit 5d91a42
Show file tree
Hide file tree
Showing 141 changed files with 306 additions and 305 deletions.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
- [ ] This pull request is on the dev branch.
- [ ] I used gofmt for formatting the code before submitting the pull request.
-----

2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ We welcome pull requests from the community.
To run the tests, execute the following command from within the root directory of the project:

```sh
go test -v github.com/jfrog/jfrog-cli-core/tests -timeout 0
go test -v github.com/jfrog/jfrog-cli-core/v2/tests -timeout 0
```
8 changes: 4 additions & 4 deletions artifactory/commands/buildinfo/adddependencies.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
regxp "regexp"
"strconv"

commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/utils/config"
commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory"
"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
"github.com/jfrog/jfrog-client-go/artifactory/services"
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/addgit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"
gofrogcmd "github.com/jfrog/gofrog/io"
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
utilsconfig "github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
utilsconfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
"github.com/jfrog/jfrog-client-go/artifactory/services"
clientutils "github.com/jfrog/jfrog-client-go/utils"
Expand Down
8 changes: 4 additions & 4 deletions artifactory/commands/buildinfo/addgit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"testing"
"time"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/coreutils"
"github.com/jfrog/jfrog-cli-core/utils/log"
"github.com/jfrog/jfrog-cli-core/utils/tests"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-cli-core/v2/utils/log"
"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
)

Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/buildappend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"time"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
"github.com/jfrog/jfrog-client-go/artifactory/services"
"github.com/jfrog/jfrog-client-go/http/httpclient"
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/builddiscard.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package buildinfo

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/services"
)

Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/clean.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package buildinfo

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/utils/log"
)

Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/collectenv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"strings"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
"github.com/jfrog/jfrog-client-go/utils/log"
)
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/distribute.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package buildinfo

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/services"
)

Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/promote.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package buildinfo

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/services"
)

Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/buildinfo/publish.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
clientutils "github.com/jfrog/jfrog-client-go/utils"
"sort"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/utils/coreutils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
)
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/buildinfo/xrayscan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package buildinfo
import (
"encoding/json"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/services"
clientutils "github.com/jfrog/jfrog-client-go/utils"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/container/buildcreate.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package container

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
)

type BuildDockerCreateCommand struct {
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/container/containermanager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package container
import (
"strings"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
)

type ContainerManagerCommand struct {
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/container/promote.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package container

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/services"
)

Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/container/pull.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package container

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
)

Expand Down
8 changes: 4 additions & 4 deletions artifactory/commands/container/push.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package container

import (
commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/utils/config"
commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/container"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
servicesutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
clientutils "github.com/jfrog/jfrog-client-go/utils"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
Expand Down
2 changes: 1 addition & 1 deletion artifactory/commands/curl/curl.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package curl

import (
"github.com/jfrog/jfrog-cli-core/common/commands"
"github.com/jfrog/jfrog-cli-core/v2/common/commands"
)

type RtCurlCommand struct {
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/distribution/createbundle.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package distribution

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/distribution/services"
distributionServicesUtils "github.com/jfrog/jfrog-client-go/distribution/services/utils"
clientutils "github.com/jfrog/jfrog-client-go/utils"
Expand Down
8 changes: 4 additions & 4 deletions artifactory/commands/distribution/deletebundle.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"encoding/json"
"fmt"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/utils/coreutils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-client-go/distribution/services"
clientutils "github.com/jfrog/jfrog-client-go/utils"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/distribution/distributebundle.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package distribution

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/distribution/services"
)

Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/distribution/signBundle.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package distribution

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/distribution/services"
clientutils "github.com/jfrog/jfrog-client-go/utils"
)
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/distribution/updatebundle.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package distribution

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/distribution/services"
distributionServicesUtils "github.com/jfrog/jfrog-client-go/distribution/services/utils"
clientutils "github.com/jfrog/jfrog-client-go/utils"
Expand Down
8 changes: 4 additions & 4 deletions artifactory/commands/dotnet/dotnetcommand.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"strings"

"github.com/jfrog/gofrog/io"
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/solution"
"github.com/jfrog/jfrog-cli-core/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet/solution"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/auth"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
Expand Down
2 changes: 1 addition & 1 deletion artifactory/commands/dotnet/dotnetcommand_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package dotnet

import (
"github.com/jfrog/gofrog/io"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
"github.com/stretchr/testify/assert"
"os"
"path/filepath"
Expand Down
2 changes: 1 addition & 1 deletion artifactory/commands/dotnet/dotnetcorecli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package dotnet

import (
gofrogcmd "github.com/jfrog/gofrog/io"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
"github.com/jfrog/jfrog-client-go/utils/log"
"github.com/jfrog/jfrog-client-go/utils/version"
)
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/dotnet/nuget.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dotnet

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet"
"github.com/jfrog/jfrog-cli-core/artifactory/utils/dotnet/solution"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils/dotnet/solution"
clientutils "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
4 changes: 2 additions & 2 deletions artifactory/commands/generic/copy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package generic
import (
"errors"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-client-go/artifactory/services"
"github.com/jfrog/jfrog-client-go/utils/log"
)
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/generic/createaccesstoken.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"strings"

rtUtils "github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/config"
rtUtils "github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-client-go/artifactory/services"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
)
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/generic/delete.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package generic

import (
"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-client-go/artifactory/services"
clientutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/generic/download.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strconv"
"strings"

"github.com/jfrog/jfrog-cli-core/utils/coreutils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-client-go/artifactory/buildinfo"
"github.com/jfrog/jfrog-client-go/artifactory/services"
serviceutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
Expand Down
6 changes: 3 additions & 3 deletions artifactory/commands/generic/generic.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package generic

import (
commandsutils "github.com/jfrog/jfrog-cli-core/artifactory/commands/utils"
"github.com/jfrog/jfrog-cli-core/common/spec"
"github.com/jfrog/jfrog-cli-core/utils/config"
commandsutils "github.com/jfrog/jfrog-cli-core/v2/artifactory/commands/utils"
"github.com/jfrog/jfrog-cli-core/v2/common/spec"
"github.com/jfrog/jfrog-cli-core/v2/utils/config"
)

type GenericCommand struct {
Expand Down
4 changes: 2 additions & 2 deletions artifactory/commands/generic/gitlfsclean.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package generic
import (
"fmt"

"github.com/jfrog/jfrog-cli-core/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/utils/coreutils"
"github.com/jfrog/jfrog-cli-core/v2/artifactory/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-client-go/artifactory/services"
clientutils "github.com/jfrog/jfrog-client-go/artifactory/services/utils"
"github.com/jfrog/jfrog-client-go/utils/errorutils"
Expand Down
Loading

0 comments on commit 5d91a42

Please sign in to comment.