Skip to content

Commit 89e7db4

Browse files
authored
feat: move value pkg out of internal (#4543)
Signed-off-by: Kit Patella <kit@defenseunicorns.com>
1 parent 4c7645e commit 89e7db4

31 files changed

+18
-19
lines changed

src/cmd/dev.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/zarf-dev/zarf/src/api/v1alpha1"
2626
"github.com/zarf-dev/zarf/src/config"
2727
"github.com/zarf-dev/zarf/src/config/lang"
28-
"github.com/zarf-dev/zarf/src/internal/value"
2928
"github.com/zarf-dev/zarf/src/pkg/archive"
3029
"github.com/zarf-dev/zarf/src/pkg/lint"
3130
"github.com/zarf-dev/zarf/src/pkg/logger"
@@ -35,6 +34,7 @@ import (
3534
"github.com/zarf-dev/zarf/src/pkg/state"
3635
"github.com/zarf-dev/zarf/src/pkg/transform"
3736
"github.com/zarf-dev/zarf/src/pkg/utils"
37+
"github.com/zarf-dev/zarf/src/pkg/value"
3838
)
3939

4040
var defaultRegistry = fmt.Sprintf("%s:%d", helpers.IPV4Localhost, state.ZarfInClusterContainerRegistryNodePort)

src/cmd/package.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,22 @@ import (
2424
goyaml "github.com/goccy/go-yaml"
2525
"github.com/spf13/cobra"
2626
"github.com/spf13/viper"
27-
"github.com/zarf-dev/zarf/src/internal/value"
28-
"github.com/zarf-dev/zarf/src/pkg/images"
29-
"github.com/zarf-dev/zarf/src/pkg/packager"
3027
"oras.land/oras-go/v2/registry"
3128

3229
"github.com/zarf-dev/zarf/src/api/v1alpha1"
3330
"github.com/zarf-dev/zarf/src/config"
3431
"github.com/zarf-dev/zarf/src/config/lang"
3532
"github.com/zarf-dev/zarf/src/pkg/cluster"
33+
"github.com/zarf-dev/zarf/src/pkg/images"
3634
"github.com/zarf-dev/zarf/src/pkg/lint"
3735
"github.com/zarf-dev/zarf/src/pkg/logger"
3836
"github.com/zarf-dev/zarf/src/pkg/message"
37+
"github.com/zarf-dev/zarf/src/pkg/packager"
3938
"github.com/zarf-dev/zarf/src/pkg/packager/filters"
4039
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
4140
"github.com/zarf-dev/zarf/src/pkg/state"
4241
"github.com/zarf-dev/zarf/src/pkg/utils"
42+
"github.com/zarf-dev/zarf/src/pkg/value"
4343
"github.com/zarf-dev/zarf/src/pkg/zoci"
4444
)
4545

src/internal/template/template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"github.com/Masterminds/sprig/v3"
2121
"github.com/goccy/go-yaml"
2222
"github.com/zarf-dev/zarf/src/api/v1alpha1"
23-
"github.com/zarf-dev/zarf/src/internal/value"
2423
"github.com/zarf-dev/zarf/src/pkg/logger"
24+
"github.com/zarf-dev/zarf/src/pkg/value"
2525
"github.com/zarf-dev/zarf/src/pkg/variables"
2626
)
2727

src/internal/template/template_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212

1313
"github.com/stretchr/testify/require"
1414
"github.com/zarf-dev/zarf/src/api/v1alpha1"
15-
"github.com/zarf-dev/zarf/src/internal/value"
15+
"github.com/zarf-dev/zarf/src/pkg/value"
1616
"github.com/zarf-dev/zarf/src/pkg/variables"
1717
)
1818

src/pkg/packager/actions/actions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"github.com/zarf-dev/zarf/src/api/v1alpha1"
2020
ptmpl "github.com/zarf-dev/zarf/src/internal/packager/template"
2121
"github.com/zarf-dev/zarf/src/internal/template"
22-
"github.com/zarf-dev/zarf/src/internal/value"
2322
"github.com/zarf-dev/zarf/src/pkg/logger"
2423
"github.com/zarf-dev/zarf/src/pkg/utils"
2524
"github.com/zarf-dev/zarf/src/pkg/utils/exec"
25+
"github.com/zarf-dev/zarf/src/pkg/value"
2626
"github.com/zarf-dev/zarf/src/pkg/variables"
2727
)
2828

src/pkg/packager/actions/actions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/stretchr/testify/require"
1212

1313
"github.com/zarf-dev/zarf/src/api/v1alpha1"
14-
"github.com/zarf-dev/zarf/src/internal/value"
1514
"github.com/zarf-dev/zarf/src/pkg/utils"
15+
"github.com/zarf-dev/zarf/src/pkg/value"
1616
)
1717

1818
func Test_actionCmdMutation(t *testing.T) {

src/pkg/packager/deploy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/zarf-dev/zarf/src/internal/packager/requirements"
2525
ptmpl "github.com/zarf-dev/zarf/src/internal/packager/template"
2626
"github.com/zarf-dev/zarf/src/internal/template"
27-
"github.com/zarf-dev/zarf/src/internal/value"
2827
"github.com/zarf-dev/zarf/src/pkg/cluster"
2928
"github.com/zarf-dev/zarf/src/pkg/feature"
3029
"github.com/zarf-dev/zarf/src/pkg/images"
@@ -36,6 +35,7 @@ import (
3635
"github.com/zarf-dev/zarf/src/pkg/state"
3736
"github.com/zarf-dev/zarf/src/pkg/transform"
3837
"github.com/zarf-dev/zarf/src/pkg/utils"
38+
"github.com/zarf-dev/zarf/src/pkg/value"
3939
"github.com/zarf-dev/zarf/src/pkg/variables"
4040
"golang.org/x/sync/errgroup"
4141
corev1 "k8s.io/api/core/v1"

src/pkg/packager/find_images.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import (
1414
"strings"
1515
"time"
1616

17-
"github.com/zarf-dev/zarf/src/pkg/state"
18-
1917
"github.com/distribution/reference"
2018
flux "github.com/fluxcd/source-controller/api/v1"
2119
"github.com/goccy/go-yaml"
@@ -24,12 +22,13 @@ import (
2422
"github.com/zarf-dev/zarf/src/config"
2523
"github.com/zarf-dev/zarf/src/internal/packager/helm"
2624
"github.com/zarf-dev/zarf/src/internal/packager/template"
27-
"github.com/zarf-dev/zarf/src/internal/value"
2825
"github.com/zarf-dev/zarf/src/pkg/images"
2926
"github.com/zarf-dev/zarf/src/pkg/logger"
3027
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
3128
"github.com/zarf-dev/zarf/src/pkg/packager/load"
29+
"github.com/zarf-dev/zarf/src/pkg/state"
3230
"github.com/zarf-dev/zarf/src/pkg/utils"
31+
"github.com/zarf-dev/zarf/src/pkg/value"
3332
v1 "k8s.io/api/apps/v1"
3433
batchv1 "k8s.io/api/batch/v1"
3534
corev1 "k8s.io/api/core/v1"

src/pkg/packager/inspect.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616
"github.com/zarf-dev/zarf/src/internal/packager/helm"
1717
"github.com/zarf-dev/zarf/src/internal/packager/template"
1818
tmpl "github.com/zarf-dev/zarf/src/internal/template"
19-
"github.com/zarf-dev/zarf/src/internal/value"
2019
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
2120
"github.com/zarf-dev/zarf/src/pkg/packager/load"
2221
"github.com/zarf-dev/zarf/src/pkg/state"
2322
"github.com/zarf-dev/zarf/src/pkg/utils"
23+
"github.com/zarf-dev/zarf/src/pkg/value"
2424
"github.com/zarf-dev/zarf/src/pkg/variables"
2525
"helm.sh/helm/v3/pkg/chartutil"
2626
)

src/pkg/packager/inspect_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/require"
10-
"github.com/zarf-dev/zarf/src/internal/value"
1110
"github.com/zarf-dev/zarf/src/pkg/feature"
11+
"github.com/zarf-dev/zarf/src/pkg/value"
1212
"github.com/zarf-dev/zarf/src/test/testutil"
1313
)
1414

0 commit comments

Comments
 (0)