Skip to content

Commit

Permalink
Move resolution package to internal/
Browse files Browse the repository at this point in the history
  • Loading branch information
@viktigpetterr
viktigpetterr committed May 16, 2023
1 parent 329aad1 commit 1e67593
Show file tree
Hide file tree
Showing 120 changed files with 212 additions and 218 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ dist/
/.env
test/resolve/testdata/pip/requirements.txt.venv/
test/resolve/testdata/pip/.requirements.txt.debricked.lock
pkg/scan/testdata/npm/yarn.lock
pkg/resolution/pm/gradle/.gradle-init-script.debricked.groovy
internal/cmd/scan/testdata/npm/yarn.lock
internal/resolution/pm/gradle/.gradle-init-script.debricked.groovy
4 changes: 2 additions & 2 deletions cmd/debricked/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"os"

"github.com/debricked/cli/pkg/cmd/root"
"github.com/debricked/cli/pkg/wire"
"github.com/debricked/cli/internal/cmd/root"
"github.com/debricked/cli/internal/wire"
)

var version string // Set at compile time
Expand Down
2 changes: 1 addition & 1 deletion internal/client/deb_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"
"testing"

"github.com/stretchr/testify/assert"
testdataClient "github.com/debricked/cli/internal/client/testdata/client"
"github.com/stretchr/testify/assert"
)

var client *DebClient
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/files/files.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package files

import (
"github.com/debricked/cli/pkg/cmd/files/find"
"github.com/debricked/cli/pkg/file"
"github.com/debricked/cli/internal/cmd/files/find"
"github.com/debricked/cli/internal/file"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/files/files_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package files
import (
"testing"

"github.com/debricked/cli/pkg/file"
"github.com/debricked/cli/internal/file"
"github.com/stretchr/testify/assert"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/cmd/report/report.go
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package report

import (
"github.com/debricked/cli/pkg/cmd/report/license"
"github.com/debricked/cli/pkg/cmd/report/vulnerability"
licenseReport "github.com/debricked/cli/pkg/report/license"
vulnerabilityReport "github.com/debricked/cli/pkg/report/vulnerability"
"github.com/debricked/cli/internal/cmd/report/license"
"github.com/debricked/cli/internal/cmd/report/vulnerability"
licenseReport "github.com/debricked/cli/internal/report/license"
vulnerabilityReport "github.com/debricked/cli/internal/report/vulnerability"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/report/report_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package report
import (
"testing"

"github.com/debricked/cli/pkg/report/license"
"github.com/debricked/cli/pkg/report/vulnerability"
"github.com/debricked/cli/internal/report/license"
"github.com/debricked/cli/internal/report/vulnerability"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/resolve/resolve.go → internal/cmd/resolve/resolve.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"path/filepath"

"github.com/debricked/cli/pkg/file"
"github.com/debricked/cli/pkg/resolution"
"github.com/debricked/cli/internal/file"
"github.com/debricked/cli/internal/resolution"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/cmd/resolve/resolve_test.go → internal/cmd/resolve/resolve_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"errors"
"testing"

"github.com/debricked/cli/pkg/file"
"github.com/debricked/cli/pkg/file/testdata"
"github.com/debricked/cli/pkg/resolution"
resolveTestdata "github.com/debricked/cli/pkg/resolution/testdata"
"github.com/debricked/cli/internal/file"
"github.com/debricked/cli/internal/file/testdata"
"github.com/debricked/cli/internal/resolution"
resolveTestdata "github.com/debricked/cli/internal/resolution/testdata"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
)
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/root/root.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package root

import (
"github.com/debricked/cli/pkg/cmd/files"
"github.com/debricked/cli/pkg/cmd/report"
"github.com/debricked/cli/pkg/cmd/resolve"
"github.com/debricked/cli/pkg/cmd/scan"
"github.com/debricked/cli/pkg/wire"
"github.com/debricked/cli/internal/cmd/files"
"github.com/debricked/cli/internal/cmd/report"
"github.com/debricked/cli/internal/cmd/resolve"
"github.com/debricked/cli/internal/cmd/scan"
"github.com/debricked/cli/internal/wire"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/root/root_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package root
import (
"testing"

"github.com/debricked/cli/pkg/wire"
"github.com/debricked/cli/internal/wire"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/scan/scan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"path/filepath"

"github.com/debricked/cli/pkg/file"
"github.com/debricked/cli/pkg/scan"
"github.com/debricked/cli/internal/file"
"github.com/debricked/cli/internal/scan"
"github.com/fatih/color"
"github.com/spf13/cobra"
"github.com/spf13/viper"
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/scan/scan_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package scan
import (
"testing"

"github.com/debricked/cli/pkg/scan"
"github.com/debricked/cli/internal/scan"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
Expand Down
0 pkg/scan/testdata/npm/package.json → internal/cmd/scan/testdata/npm/package.json
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/resolution/file/file_batch.go → internal/resolution/file/file_batch.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package file

import "github.com/debricked/cli/pkg/resolution/pm"
import "github.com/debricked/cli/internal/resolution/pm"

type IBatch interface {
Files() []string
Expand Down
2 changes: 1 addition & 1 deletion pkg/resolution/file/file_batch_factory.go → ...nal/resolution/file/file_batch_factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"path"
"regexp"

"github.com/debricked/cli/pkg/resolution/pm"
"github.com/debricked/cli/internal/resolution/pm"
)

type IBatchFactory interface {
Expand Down
4 changes: 2 additions & 2 deletions ...esolution/file/file_batch_factory_test.go → ...esolution/file/file_batch_factory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package file
import (
"testing"

"github.com/debricked/cli/pkg/resolution/pm"
"github.com/debricked/cli/pkg/resolution/pm/testdata"
"github.com/debricked/cli/internal/resolution/pm"
"github.com/debricked/cli/internal/resolution/pm/testdata"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/resolution/file/file_batch_test.go → internal/resolution/file/file_batch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package file
import (
"testing"

"github.com/debricked/cli/pkg/resolution/pm/testdata"
"github.com/debricked/cli/internal/resolution/pm/testdata"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions .../file/testdata/file_batch_factory_mock.go → .../file/testdata/file_batch_factory_mock.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package testdata

import (
"github.com/debricked/cli/pkg/resolution/file"
"github.com/debricked/cli/pkg/resolution/pm"
"github.com/debricked/cli/internal/resolution/file"
"github.com/debricked/cli/internal/resolution/pm"
)

type BatchFactoryMock struct {
Expand Down
0 ...solution/file/testdata/file_batch_mock.go → ...solution/file/testdata/file_batch_mock.go
View file
File renamed without changes.
0 pkg/resolution/job/base_job.go → internal/resolution/job/base_job.go
View file
File renamed without changes.
0 pkg/resolution/job/base_job_test.go → internal/resolution/job/base_job_test.go
View file
File renamed without changes.
0 pkg/resolution/job/error.go → internal/resolution/job/error.go
View file
File renamed without changes.
0 pkg/resolution/job/errors.go → internal/resolution/job/errors.go
View file
File renamed without changes.
0 pkg/resolution/job/errors_test.go → internal/resolution/job/errors_test.go
View file
File renamed without changes.
0 pkg/resolution/job/job.go → internal/resolution/job/job.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/resolution/job/testdata/job_mock.go → internal/resolution/job/testdata/job_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package testdata
import (
"fmt"

"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/internal/resolution/job"
)

type JobMock struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/resolution/job/testdata/job_test_util.go → .../resolution/job/testdata/job_test_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"runtime"
"testing"

"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/internal/resolution/job"
"github.com/stretchr/testify/assert"
)

Expand Down
0 pkg/resolution/pm/gomod/cmd_factory.go → internal/resolution/pm/gomod/cmd_factory.go
View file
File renamed without changes.
0 pkg/resolution/pm/gomod/cmd_factory_test.go → ...l/resolution/pm/gomod/cmd_factory_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/resolution/pm/gomod/job.go → internal/resolution/pm/gomod/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package gomod
import (
"path/filepath"

"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/pkg/resolution/pm/util"
"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/job"
"github.com/debricked/cli/internal/resolution/pm/util"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/resolution/pm/gomod/job_test.go → internal/resolution/pm/gomod/job_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"errors"
"testing"

jobTestdata "github.com/debricked/cli/pkg/resolution/job/testdata"
"github.com/debricked/cli/pkg/resolution/pm/gomod/testdata"
"github.com/debricked/cli/pkg/resolution/pm/writer"
writerTestdata "github.com/debricked/cli/pkg/resolution/pm/writer/testdata"
jobTestdata "github.com/debricked/cli/internal/resolution/job/testdata"
"github.com/debricked/cli/internal/resolution/pm/gomod/testdata"
"github.com/debricked/cli/internal/resolution/pm/writer"
writerTestdata "github.com/debricked/cli/internal/resolution/pm/writer/testdata"
"github.com/stretchr/testify/assert"
)

Expand Down
0 pkg/resolution/pm/gomod/pm.go → internal/resolution/pm/gomod/pm.go
View file
File renamed without changes.
0 pkg/resolution/pm/gomod/pm_test.go → internal/resolution/pm/gomod/pm_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/resolution/pm/gomod/strategy.go → internal/resolution/pm/gomod/strategy.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gomod

import (
"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/job"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

type Strategy struct {
Expand Down
0 pkg/resolution/pm/gomod/strategy_test.go → ...rnal/resolution/pm/gomod/strategy_test.go
View file
File renamed without changes.
0 ...ion/pm/gomod/testdata/cmd_factory_mock.go → ...ion/pm/gomod/testdata/cmd_factory_mock.go
View file
File renamed without changes.
0 pkg/resolution/pm/gradle/cmd_factory.go → internal/resolution/pm/gradle/cmd_factory.go
View file
File renamed without changes.
0 pkg/resolution/pm/gradle/cmd_factory_test.go → .../resolution/pm/gradle/cmd_factory_test.go
View file
File renamed without changes.
0 ...dle/gradle-init/gradle-init-script.groovy → ...dle/gradle-init/gradle-init-script.groovy
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...solution/pm/gradle/init_script_handler.go → ...solution/pm/gradle/init_script_handler.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gradle

import (
"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

type IInitScriptHandler interface {
Expand Down
2 changes: 1 addition & 1 deletion ...ion/pm/gradle/init_script_handler_test.go → ...ion/pm/gradle/init_script_handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"testing"

writerTestdata "github.com/debricked/cli/pkg/resolution/pm/writer/testdata"
writerTestdata "github.com/debricked/cli/internal/resolution/pm/writer/testdata"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/resolution/pm/gradle/job.go → internal/resolution/pm/gradle/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"path/filepath"
"strings"

"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/job"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

type Job struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/resolution/pm/gradle/job_test.go → internal/resolution/pm/gradle/job_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"errors"
"testing"

jobTestdata "github.com/debricked/cli/pkg/resolution/job/testdata"
"github.com/debricked/cli/pkg/resolution/pm/gradle/testdata"
"github.com/debricked/cli/pkg/resolution/pm/writer"
writerTestdata "github.com/debricked/cli/pkg/resolution/pm/writer/testdata"
jobTestdata "github.com/debricked/cli/internal/resolution/job/testdata"
"github.com/debricked/cli/internal/resolution/pm/gradle/testdata"
"github.com/debricked/cli/internal/resolution/pm/writer"
writerTestdata "github.com/debricked/cli/internal/resolution/pm/writer/testdata"
"github.com/stretchr/testify/assert"
)

Expand Down
0 pkg/resolution/pm/gradle/meta_file_finder.go → .../resolution/pm/gradle/meta_file_finder.go
View file
File renamed without changes.
0 ...lution/pm/gradle/meta_file_finder_test.go → ...lution/pm/gradle/meta_file_finder_test.go
View file
File renamed without changes.
0 pkg/resolution/pm/gradle/pm.go → internal/resolution/pm/gradle/pm.go
View file
File renamed without changes.
0 pkg/resolution/pm/gradle/pm_test.go → internal/resolution/pm/gradle/pm_test.go
View file
File renamed without changes.
0 pkg/resolution/pm/gradle/project.go → internal/resolution/pm/gradle/project.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/resolution/pm/gradle/setup.go → internal/resolution/pm/gradle/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sort"
"strings"

"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

const (
Expand Down
0 pkg/resolution/pm/gradle/setup_err.go → internal/resolution/pm/gradle/setup_err.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/resolution/pm/gradle/setup_test.go → internal/resolution/pm/gradle/setup_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"runtime"
"testing"

writerTestdata "github.com/debricked/cli/pkg/resolution/pm/writer/testdata"
writerTestdata "github.com/debricked/cli/internal/resolution/pm/writer/testdata"

"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/pm/writer"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/resolution/pm/gradle/strategy.go → internal/resolution/pm/gradle/strategy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/fatih/color"

"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/job"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

type Strategy struct {
Expand Down
0 pkg/resolution/pm/gradle/strategy_test.go → ...nal/resolution/pm/gradle/strategy_test.go
View file
File renamed without changes.
0 ...on/pm/gradle/testdata/cmd_factory_mock.go → ...on/pm/gradle/testdata/cmd_factory_mock.go
View file
File renamed without changes.
0 ...n/pm/gradle/testdata/project/build.gradle → ...n/pm/gradle/testdata/project/build.gradle
View file
File renamed without changes.
0 ...lution/pm/gradle/testdata/project/gradlew → ...lution/pm/gradle/testdata/project/gradlew
View file
File renamed without changes.
0 ...on/pm/gradle/testdata/project/gradlew.bat → ...on/pm/gradle/testdata/project/gradlew.bat
View file
File renamed without changes.
0 ...m/gradle/testdata/project/settings.gradle → ...m/gradle/testdata/project/settings.gradle
View file
File renamed without changes.
0 .../testdata/project/subproject/build.gradle → .../testdata/project/subproject/build.gradle
View file
File renamed without changes.
0 pkg/resolution/pm/maven/cmd_factory.go → internal/resolution/pm/maven/cmd_factory.go
View file
File renamed without changes.
0 pkg/resolution/pm/maven/cmd_factory_test.go → ...l/resolution/pm/maven/cmd_factory_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/resolution/pm/maven/job.go → internal/resolution/pm/maven/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"path/filepath"

"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/internal/resolution/job"
)

type Job struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/resolution/pm/maven/job_test.go → internal/resolution/pm/maven/job_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"testing"

jobTestdata "github.com/debricked/cli/pkg/resolution/job/testdata"
"github.com/debricked/cli/pkg/resolution/pm/maven/testdata"
jobTestdata "github.com/debricked/cli/internal/resolution/job/testdata"
"github.com/debricked/cli/internal/resolution/pm/maven/testdata"
"github.com/stretchr/testify/assert"
)

Expand Down
0 pkg/resolution/pm/maven/pm.go → internal/resolution/pm/maven/pm.go
View file
File renamed without changes.
0 pkg/resolution/pm/maven/pm_test.go → internal/resolution/pm/maven/pm_test.go
View file
File renamed without changes.
0 pkg/resolution/pm/maven/pom_service.go → internal/resolution/pm/maven/pom_service.go
View file
File renamed without changes.
0 pkg/resolution/pm/maven/pom_service_test.go → ...l/resolution/pm/maven/pom_service_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/resolution/pm/maven/strategy.go → internal/resolution/pm/maven/strategy.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package maven

import (
"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/internal/resolution/job"
)

type Strategy struct {
Expand Down
0 pkg/resolution/pm/maven/strategy_test.go → ...rnal/resolution/pm/maven/strategy_test.go
View file
File renamed without changes.
0 ...ion/pm/maven/testdata/cmd_factory_mock.go → ...ion/pm/maven/testdata/cmd_factory_mock.go
View file
File renamed without changes.
0 ...esolution/pm/maven/testdata/guava/pom.xml → ...esolution/pm/maven/testdata/guava/pom.xml
View file
File renamed without changes.
0 pkg/resolution/pm/maven/testdata/notAPom.xml → .../resolution/pm/maven/testdata/notAPom.xml
View file
File renamed without changes.
0 pkg/resolution/pm/maven/testdata/pom.xml → ...rnal/resolution/pm/maven/testdata/pom.xml
View file
File renamed without changes.
0 pkg/resolution/pm/pip/cmd_factory.go → internal/resolution/pm/pip/cmd_factory.go
View file
File renamed without changes.
0 pkg/resolution/pm/pip/cmd_factory_test.go → ...nal/resolution/pm/pip/cmd_factory_test.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions pkg/resolution/pm/pip/job.go → internal/resolution/pm/pip/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"path/filepath"
"strings"

"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/pkg/resolution/pm/util"
"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/job"
"github.com/debricked/cli/internal/resolution/pm/util"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions pkg/resolution/pm/pip/job_test.go → internal/resolution/pm/pip/job_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strings"
"testing"

jobTestdata "github.com/debricked/cli/pkg/resolution/job/testdata"
"github.com/debricked/cli/pkg/resolution/pm/pip/testdata"
"github.com/debricked/cli/pkg/resolution/pm/writer"
writerTestdata "github.com/debricked/cli/pkg/resolution/pm/writer/testdata"
jobTestdata "github.com/debricked/cli/internal/resolution/job/testdata"
"github.com/debricked/cli/internal/resolution/pm/pip/testdata"
"github.com/debricked/cli/internal/resolution/pm/writer"
writerTestdata "github.com/debricked/cli/internal/resolution/pm/writer/testdata"
"github.com/stretchr/testify/assert"
)

Expand Down
0 pkg/resolution/pm/pip/pm.go → internal/resolution/pm/pip/pm.go
View file
File renamed without changes.
0 pkg/resolution/pm/pip/pm_test.go → internal/resolution/pm/pip/pm_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/resolution/pm/pip/strategy.go → internal/resolution/pm/pip/strategy.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package pip

import (
"github.com/debricked/cli/pkg/resolution/job"
"github.com/debricked/cli/pkg/resolution/pm/writer"
"github.com/debricked/cli/internal/resolution/job"
"github.com/debricked/cli/internal/resolution/pm/writer"
)

type Strategy struct {
Expand Down
0 pkg/resolution/pm/pip/strategy_test.go → internal/resolution/pm/pip/strategy_test.go
View file
File renamed without changes.
0 ...ution/pm/pip/testdata/cmd_factory_mock.go → ...ution/pm/pip/testdata/cmd_factory_mock.go
View file
File renamed without changes.
0 pkg/resolution/pm/pip/testdata/list.txt → internal/resolution/pm/pip/testdata/list.txt
View file
File renamed without changes.
0 ...solution/pm/pip/testdata/requirements.txt → ...solution/pm/pip/testdata/requirements.txt
View file
File renamed without changes.
0 pkg/resolution/pm/pip/testdata/show.txt → internal/resolution/pm/pip/testdata/show.txt
View file
File renamed without changes.
Loading

0 comments on commit 1e67593

Please sign in to comment.