Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor toolkit/tools/internal -> toolkit/tools/pkg #5185

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Refactor toolkit/tools/internal -> toolkit/tools/pkg #5185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9a5a9e
toolkit: mv internal/* -> pkg/*
mfrw Mar 30, 2023
c0f6486
toolkit: pkg: update imports
mfrw Mar 30, 2023
4ca2c67
toolkit: tools.mk: update post refactor of internal/* -> pkg/
mfrw Apr 18, 2023
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
8 changes: 4 additions & 4 deletions toolkit/scripts/tools.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ go_tool_list = \
go_tool_targets = $(foreach target,$(go_tool_list),$(TOOL_BINS_DIR)/$(target))
# Common files to monitor for all go targets
go_module_files = $(TOOLS_DIR)/go.mod $(TOOLS_DIR)/go.sum
go_internal_files = $(shell find $(TOOLS_DIR)/internal/ -type f -name '*.go')
go_pkg_files = $(shell find $(TOOLS_DIR)/pkg/ -type f -name '*.go')
go_imagegen_files = $(shell find $(TOOLS_DIR)/imagegen/ -type f -name '*.go')
go_common_files = $(go_module_files) $(go_internal_files) $(go_imagegen_files) $(BUILD_DIR)/tools/internal.test_coverage
go_common_files = $(go_module_files) $(go_pkg_files) $(go_imagegen_files) $(BUILD_DIR)/tools/pkg.test_coverage
# A report on test coverage for all the go tools
test_coverage_report=$(TOOL_BINS_DIR)/test_coverage_report.html

Expand Down Expand Up @@ -85,12 +85,12 @@ $(TOOL_BINS_DIR)/%: $(go_common_files) $(STATUS_FLAGS_DIR)/got_go_deps.flag
cd $(TOOLS_DIR)/$* && \
go test -covermode=atomic -coverprofile=$(BUILD_DIR)/tools/$*.test_coverage ./... && \
CGO_ENABLED=0 go build \
-ldflags="-X github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe.ToolkitVersion=$(RELEASE_VERSION)" \
-ldflags="-X github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe.ToolkitVersion=$(RELEASE_VERSION)" \
-o $(TOOL_BINS_DIR)
endif

# Runs tests for common components
$(BUILD_DIR)/tools/internal.test_coverage: $(go_internal_files) $(go_imagegen_files) $(STATUS_FLAGS_DIR)/got_go_deps.flag
$(BUILD_DIR)/tools/pkg.test_coverage: $(go_pkg_files) $(go_imagegen_files) $(STATUS_FLAGS_DIR)/got_go_deps.flag
cd $(TOOLS_DIR)/$* && \
go test -covermode=atomic -coverprofile=$@ ./...

Expand Down
4 changes: 2 additions & 2 deletions toolkit/tools/boilerplate/boilerplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"os"

"github.com/microsoft/CBL-Mariner/toolkit/tools/boilerplate/hello"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"

"gopkg.in/alecthomas/kingpin.v2"
)
Expand Down
8 changes: 4 additions & 4 deletions toolkit/tools/depsearch/depsearch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"path/filepath"
"sort"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/scheduler/schedulerutils"

"gonum.org/v1/gonum/graph"
Expand Down
6 changes: 3 additions & 3 deletions toolkit/tools/graphPreprocessor/graphPreprocessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ package main
import (
"os"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/pkggraph"

"gopkg.in/alecthomas/kingpin.v2"
)
Expand Down
8 changes: 4 additions & 4 deletions toolkit/tools/graphanalytics/graphanalytics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"sort"
"strings"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/sliceutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/sliceutils"

"gonum.org/v1/gonum/graph"
graphpath "gonum.org/v1/gonum/graph/path"
Expand Down
8 changes: 4 additions & 4 deletions toolkit/tools/grapher/grapher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"fmt"
"os"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkgjson"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/pkgjson"

"gopkg.in/alecthomas/kingpin.v2"
)
Expand Down
14 changes: 7 additions & 7 deletions toolkit/tools/graphpkgfetcher/graphpkgfetcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"path/filepath"
"strings"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/packagerepo/repoutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkgjson"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/rpm"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/packagerepo/repocloner/rpmrepocloner"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/packagerepo/repoutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/pkggraph"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/pkgjson"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/rpm"
"github.com/microsoft/CBL-Mariner/toolkit/tools/scheduler/schedulerutils"

"gonum.org/v1/gonum/graph"
Expand Down
4 changes: 2 additions & 2 deletions toolkit/tools/imageconfigvalidator/imageconfigvalidator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/installutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/exe"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"

"gopkg.in/alecthomas/kingpin.v2"
)
Expand Down
4 changes: 2 additions & 2 deletions toolkit/tools/imageconfigvalidator/imageconfigvalidator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/installutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/jsonutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/jsonutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/_manualrun/manualrun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// manualrun is a tool to test the attendedinstaller in the current terminal window.
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/attendedinstaller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/views/progressview"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/views/userview"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"

"github.com/bendahl/uinput"
"github.com/gdamore/tcell"
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/speakuputils/speakuputils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package speakuputils
import (
"github.com/bendahl/uinput"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/shell"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/shell"
)

// Constants for start/stop speakup functions
Expand Down
2 changes: 1 addition & 1 deletion ...ools/imagegen/attendedinstaller/views/diskview/autopartitionwidget/autopartitionwidget.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uiutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/diskutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// UI constants.
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/views/diskview/diskview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/views/diskview/manualpartitionwidget"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/diskutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// UI constants.
Expand Down
2 changes: 1 addition & 1 deletion .../imagegen/attendedinstaller/views/diskview/manualpartitionwidget/manualpartitionwidget.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uiutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/diskutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/views/finishview/finishview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uitext"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uiutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// UI constants.
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/views/hostnameview/hostnameview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uitext"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uiutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/randomization"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/randomization"
)

// Input validation constants.
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/views/hostnameview/hostnameview_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"testing"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/views/installerview/installerview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uitext"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uiutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// UI constants.
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/attendedinstaller/views/progressview/progressview.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uitext"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/attendedinstaller/uiutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// UI constants.
Expand Down
6 changes: 3 additions & 3 deletions toolkit/tools/imagegen/configuration/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"path/filepath"
"strings"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/jsonutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/jsonutils"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// Artifact [non-ISO image building only] defines the name, type
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/configuration/configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"reflect"
"testing"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"

"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/configuration/disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sort"
"strconv"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// Disk holds the disk partitioning, formatting and size information.
Expand Down
6 changes: 3 additions & 3 deletions toolkit/tools/imagegen/configuration/networkconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"path/filepath"
"strings"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/safechroot"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/safechroot"
)

type Network struct {
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/configuration/networkconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"testing"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
"github.com/stretchr/testify/assert"
)

Expand Down
10 changes: 5 additions & 5 deletions toolkit/tools/imagegen/configuration/packagerepo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"path/filepath"
"strings"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/network"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/safechroot"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/shell"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/network"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/safechroot"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/shell"
)

// PackageRepo defines the RPM repo to pull packages from during the installation
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/configuration/packagerepo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"testing"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/configuration/parse_partition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strconv"
"strings"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/configuration/partition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"unicode"
"unicode/utf16"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/configuration/systemconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"

"github.com/asaskevich/govalidator"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
)

// SystemConfig defines how each system present on the image is supposed to be configured.
Expand Down
8 changes: 4 additions & 4 deletions toolkit/tools/imagegen/diskutils/diskutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"time"

"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/retry"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/shell"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/file"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/retry"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/shell"
)

type blockDevicesOutput struct {
Expand Down
4 changes: 2 additions & 2 deletions toolkit/tools/imagegen/diskutils/encryption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"

"github.com/microsoft/CBL-Mariner/toolkit/tools/imagegen/configuration"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/shell"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/shell"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion toolkit/tools/imagegen/diskutils/initramfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"io"
"os"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"

"github.com/cavaliercoder/go-cpio"
"github.com/klauspost/pgzip"
Expand Down
4 changes: 2 additions & 2 deletions toolkit/tools/imagegen/diskutils/lvm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"fmt"
"path/filepath"

"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/shell"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/logger"
"github.com/microsoft/CBL-Mariner/toolkit/tools/pkg/shell"
)

const (
Expand Down
Loading