fluxcd
/
cli-utils
mirror of https://github.com/fluxcd/cli-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set module name to `github.com/fluxcd/cli-utils` 

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2023-11-20 08:45:35 +02:00
parent 0b156cb042
commit f812f045c6
No known key found for this signature in database
GPG Key ID: 3299AEB0E4085BAF
218 changed files with 811 additions and 811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -10,7 +10,7 @@ export PATH := $(MYGOBIN):$(PATH)
all: generate license fix vet fmt test lint tidy
"$(MYGOBIN)/stringer":
go install golang.org/x/tools/cmd/stringer@v0.1.10
go install golang.org/x/tools/cmd/stringer@v0.12.0
"$(MYGOBIN)/addlicense":
go install github.com/google/addlicense@v1.0.0
@ -112,12 +112,12 @@ vet:
.PHONY: build
build:
go build -o bin/kapply sigs.k8s.io/cli-utils/cmd;
go build -o bin/kapply github.com/fluxcd/cli-utils/cmd;
mv bin/kapply "$(MYGOBIN)"
.PHONY: build-with-race-detector
build-with-race-detector:
go build -race -o bin/kapply sigs.k8s.io/cli-utils/cmd;
go build -race -o bin/kapply github.com/fluxcd/cli-utils/cmd;
mv bin/kapply "$(MYGOBIN)"
.PHONY: verify-kapply-e2e

12
cmd/apply/cmdapply.go
View File

@ -9,16 +9,16 @@ import (
"strings"
"time"
"github.com/fluxcd/cli-utils/cmd/flagutils"
"github.com/fluxcd/cli-utils/pkg/apply"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/manifestreader"
"github.com/fluxcd/cli-utils/pkg/printers"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"sigs.k8s.io/cli-utils/cmd/flagutils"
"sigs.k8s.io/cli-utils/pkg/apply"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/manifestreader"
"sigs.k8s.io/cli-utils/pkg/printers"
)
func GetRunner(factory cmdutil.Factory, invFactory inventory.ClientFactory,

12
cmd/destroy/cmddestroy.go
View File

@ -9,16 +9,16 @@ import (
"strings"
"time"
"github.com/fluxcd/cli-utils/cmd/flagutils"
"github.com/fluxcd/cli-utils/pkg/apply"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/manifestreader"
"github.com/fluxcd/cli-utils/pkg/printers"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"sigs.k8s.io/cli-utils/cmd/flagutils"
"sigs.k8s.io/cli-utils/pkg/apply"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/manifestreader"
"sigs.k8s.io/cli-utils/pkg/printers"
)
// GetRunner creates and returns the Runner which stores the cobra command.

2
cmd/diff/cmddiff.go
View File

@ -6,13 +6,13 @@ package diff
import (
"os"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/klog/v2"
"k8s.io/kubectl/pkg/cmd/diff"
"k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"sigs.k8s.io/cli-utils/pkg/common"
)
const tmpDirPrefix = "diff-cmd"

2
cmd/flagutils/utils.go
View File

@ -6,8 +6,8 @@ package flagutils
import (
"fmt"
"github.com/fluxcd/cli-utils/pkg/inventory"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/cli-utils/pkg/inventory"
)
const (

2
cmd/flagutils/utils_test.go
View File

@ -7,7 +7,7 @@ import (
"fmt"
"testing"
"sigs.k8s.io/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/inventory"
)
func TestConvertInventoryPolicy(t *testing.T) {

2
cmd/initcmd/cmdinit.go
View File

@ -4,11 +4,11 @@
package initcmd
import (
"github.com/fluxcd/cli-utils/pkg/config"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"sigs.k8s.io/cli-utils/pkg/config"
)
// InitRunner encapsulates the structures for the init command.

18
cmd/main.go
View File

@ -11,21 +11,21 @@ import (
"strings"
"time"
"github.com/fluxcd/cli-utils/cmd/apply"
"github.com/fluxcd/cli-utils/cmd/destroy"
"github.com/fluxcd/cli-utils/cmd/diff"
"github.com/fluxcd/cli-utils/cmd/initcmd"
"github.com/fluxcd/cli-utils/cmd/preview"
"github.com/fluxcd/cli-utils/cmd/status"
"github.com/fluxcd/cli-utils/pkg/flowcontrol"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/manifestreader"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest"
"k8s.io/component-base/cli"
"k8s.io/klog/v2"
"k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/cmd/apply"
"sigs.k8s.io/cli-utils/cmd/destroy"
"sigs.k8s.io/cli-utils/cmd/diff"
"sigs.k8s.io/cli-utils/cmd/initcmd"
"sigs.k8s.io/cli-utils/cmd/preview"
"sigs.k8s.io/cli-utils/cmd/status"
"sigs.k8s.io/cli-utils/pkg/flowcontrol"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/manifestreader"
// This is here rather than in the libraries because of
// https://github.com/kubernetes-sigs/kustomize/issues/2060

14
cmd/preview/cmdpreview.go
View File

@ -9,17 +9,17 @@ import (
"strings"
"time"
"github.com/fluxcd/cli-utils/cmd/flagutils"
"github.com/fluxcd/cli-utils/pkg/apply"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/manifestreader"
"github.com/fluxcd/cli-utils/pkg/printers"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"sigs.k8s.io/cli-utils/cmd/flagutils"
"sigs.k8s.io/cli-utils/pkg/apply"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/manifestreader"
"sigs.k8s.io/cli-utils/pkg/printers"
)
var (

30
cmd/status/cmdstatus.go
View File

@ -9,25 +9,25 @@ import (
"strings"
"time"
"github.com/fluxcd/cli-utils/cmd/flagutils"
"github.com/fluxcd/cli-utils/cmd/status/printers"
"github.com/fluxcd/cli-utils/cmd/status/printers/printer"
"github.com/fluxcd/cli-utils/pkg/apply/poller"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/aggregator"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/collector"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/manifestreader"
"github.com/fluxcd/cli-utils/pkg/object"
printcommon "github.com/fluxcd/cli-utils/pkg/print/common"
pkgprinters "github.com/fluxcd/cli-utils/pkg/printers"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/slice"
"sigs.k8s.io/cli-utils/cmd/flagutils"
"sigs.k8s.io/cli-utils/cmd/status/printers"
"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
"sigs.k8s.io/cli-utils/pkg/apply/poller"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/aggregator"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/manifestreader"
"sigs.k8s.io/cli-utils/pkg/object"
printcommon "sigs.k8s.io/cli-utils/pkg/print/common"
pkgprinters "sigs.k8s.io/cli-utils/pkg/printers"
)
const (

14
cmd/status/cmdstatus_test.go
View File

@ -11,18 +11,18 @@ import (
"testing"
"time"
"github.com/fluxcd/cli-utils/pkg/apply/poller"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/manifestreader"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/spf13/cobra"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/runtime/schema"
cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/apply/poller"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/manifestreader"
"sigs.k8s.io/cli-utils/pkg/object"
)
var (

16
cmd/status/printers/event/printer.go
View File

@ -7,15 +7,15 @@ import (
"fmt"
"strings"
"github.com/fluxcd/cli-utils/cmd/status/printers/printer"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/collector"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/print/list"
"github.com/fluxcd/cli-utils/pkg/printers/events"
"k8s.io/cli-runtime/pkg/genericclioptions"
"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/print/list"
"sigs.k8s.io/cli-utils/pkg/printers/events"
)
// Printer implements the Printer interface and outputs the resource

16
cmd/status/printers/json/printer.go
View File

@ -9,15 +9,15 @@ import (
"strings"
"time"
"github.com/fluxcd/cli-utils/cmd/status/printers/printer"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/collector"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/print/list"
jsonprinter "github.com/fluxcd/cli-utils/pkg/printers/json"
"k8s.io/cli-runtime/pkg/genericclioptions"
"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/print/list"
jsonprinter "sigs.k8s.io/cli-utils/pkg/printers/json"
)
// Printer implements the Printer interface and outputs the resource

6
cmd/status/printers/printer/printer.go
View File

@ -4,9 +4,9 @@
package printer
import (
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/collector"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/object"
)
// PrintData records data required for printing

8
cmd/status/printers/printers.go
View File

@ -4,11 +4,11 @@
package printers
import (
"github.com/fluxcd/cli-utils/cmd/status/printers/event"
"github.com/fluxcd/cli-utils/cmd/status/printers/json"
"github.com/fluxcd/cli-utils/cmd/status/printers/printer"
"github.com/fluxcd/cli-utils/cmd/status/printers/table"
"k8s.io/cli-runtime/pkg/genericclioptions"
"sigs.k8s.io/cli-utils/cmd/status/printers/event"
"sigs.k8s.io/cli-utils/cmd/status/printers/json"
"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
"sigs.k8s.io/cli-utils/cmd/status/printers/table"
)
// CreatePrinter return an implementation of the Printer interface. The

8
cmd/status/printers/table/adapter.go
View File

@ -6,10 +6,10 @@ package table
import (
"strings"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
pe "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/print/table"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/collector"
pe "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/print/table"
)
// CollectorAdapter wraps the ResourceStatusCollector and

10
cmd/status/printers/table/printer.go
View File

@ -8,12 +8,12 @@ import (
"io"
"time"
"github.com/fluxcd/cli-utils/cmd/status/printers/printer"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/collector"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/print/table"
"k8s.io/cli-runtime/pkg/genericclioptions"
"sigs.k8s.io/cli-utils/cmd/status/printers/printer"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/collector"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/print/table"
)
const (

4
go.mod
View File

@ -1,6 +1,6 @@
module sigs.k8s.io/cli-utils
module github.com/fluxcd/cli-utils
go 1.18
go 1.20
require (
github.com/google/go-cmp v0.5.9

2
hack/run-in-gopath.sh
View File

@ -4,7 +4,7 @@
set -o errexit -o nounset -o pipefail -o posix
PKG_PATH="sigs.k8s.io/cli-utils"
PKG_PATH="github.com/fluxcd/cli-utils"
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd -P)"

2
pkg/apis/actuation/doc.go
View File

@ -5,4 +5,4 @@
// cli-utils.kubernetes.io API group.
// +k8s:deepcopy-gen=package
// +groupName=cli-utils.kubernetes.io
package actuation // import "sigs.k8s.io/cli-utils/pkg/apis/actuation"
package actuation // import "github.com/fluxcd/cli-utils/pkg/apis/actuation"

2
pkg/apis/actuation/zz_generated.deepcopy.go
View File

@ -1,7 +1,7 @@
//go:build !ignore_autogenerated
// +build !ignore_autogenerated
// Copyright 2022 The Kubernetes Authors.
// Copyright 2023 The Kubernetes Authors.
// SPDX-License-Identifier: Apache-2.0
// Code generated by deepcopy-gen. DO NOT EDIT.

28
pkg/apply/applier.go
View File

@ -8,26 +8,26 @@ import (
"fmt"
"time"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/filter"
"github.com/fluxcd/cli-utils/pkg/apply/info"
"github.com/fluxcd/cli-utils/pkg/apply/mutator"
"github.com/fluxcd/cli-utils/pkg/apply/prune"
"github.com/fluxcd/cli-utils/pkg/apply/solver"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/object/validation"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/filter"
"sigs.k8s.io/cli-utils/pkg/apply/info"
"sigs.k8s.io/cli-utils/pkg/apply/mutator"
"sigs.k8s.io/cli-utils/pkg/apply/prune"
"sigs.k8s.io/cli-utils/pkg/apply/solver"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/object/validation"
)
// Applier performs the step of applying a set of resources into a cluster,

8
pkg/apply/applier_builder.go
View File

@ -4,16 +4,16 @@
package apply
import (
"github.com/fluxcd/cli-utils/pkg/apply/info"
"github.com/fluxcd/cli-utils/pkg/apply/prune"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/rest"
"k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/apply/info"
"sigs.k8s.io/cli-utils/pkg/apply/prune"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
)
type ApplierBuilder struct {

20
pkg/apply/applier_test.go
View File

@ -9,20 +9,20 @@ import (
"testing"
"time"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/inventory"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"github.com/fluxcd/cli-utils/pkg/multierror"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/object/validation"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubectl/pkg/scheme"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/inventory"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
"sigs.k8s.io/cli-utils/pkg/multierror"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/object/validation"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var (

4
pkg/apply/builder.go
View File

@ -7,14 +7,14 @@ import (
"errors"
"fmt"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/rest"
"k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
)
type commonBuilder struct {

4
pkg/apply/cache/resource_cache.go vendored
View File

@ -4,9 +4,9 @@
package cache
import (
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
)
// ResourceStatus wraps an unstructured resource object, combined with the

4
pkg/apply/cache/resource_cache_map.go vendored
View File

@ -6,9 +6,9 @@ package cache
import (
"sync"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
)
// ResourceCacheMap stores ResourceStatus objects in a map indexed by resource ID.

12
pkg/apply/common_test.go
View File

@ -12,6 +12,12 @@ import (
"regexp"
"testing"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/jsonpath"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
v1 "k8s.io/api/core/v1"
@ -27,12 +33,6 @@ import (
"k8s.io/klog/v2"
cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
"k8s.io/kubectl/pkg/scheme"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/jsonpath"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
"sigs.k8s.io/cli-utils/pkg/object"
)
type inventoryInfo struct {

26
pkg/apply/destroyer.go
View File

@ -8,24 +8,24 @@ import (
"fmt"
"time"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/filter"
"github.com/fluxcd/cli-utils/pkg/apply/info"
"github.com/fluxcd/cli-utils/pkg/apply/prune"
"github.com/fluxcd/cli-utils/pkg/apply/solver"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/object/validation"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/filter"
"sigs.k8s.io/cli-utils/pkg/apply/info"
"sigs.k8s.io/cli-utils/pkg/apply/prune"
"sigs.k8s.io/cli-utils/pkg/apply/solver"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/object/validation"
)
// Destroyer performs the step of grabbing all the previous inventory objects and

8
pkg/apply/destroyer_builder.go
View File

@ -4,16 +4,16 @@
package apply
import (
"github.com/fluxcd/cli-utils/pkg/apply/info"
"github.com/fluxcd/cli-utils/pkg/apply/prune"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/rest"
"k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/apply/info"
"sigs.k8s.io/cli-utils/pkg/apply/prune"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
)
type DestroyerBuilder struct {

12
pkg/apply/destroyer_test.go
View File

@ -9,13 +9,13 @@ import (
"testing"
"time"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/inventory"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/inventory"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
func TestDestroyerCancel(t *testing.T) {

4
pkg/apply/event/event.go
View File

@ -7,9 +7,9 @@ import (
"fmt"
"strings"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/object"
)
// Type determines the type of events that are available.

2
pkg/apply/filter/current-uids-filter_test.go
View File

@ -6,9 +6,9 @@ package filter
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/testutil"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
func TestCurrentUIDFilter(t *testing.T) {

8
pkg/apply/filter/dependency-filter.go
View File

@ -7,11 +7,11 @@ import (
"fmt"
"strings"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
//go:generate stringer -type=Relationship -linecomment

12
pkg/apply/filter/dependency-filter_test.go
View File

@ -7,13 +7,13 @@ import (
"fmt"
"testing"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var idInvalid = object.ObjMetadata{

4
pkg/apply/filter/inventory-policy-apply-filter.go
View File

@ -7,13 +7,13 @@ import (
"context"
"fmt"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/dynamic"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
)
// InventoryPolicyApplyFilter implements ValidationFilter interface to determine

8
pkg/apply/filter/inventory-policy-apply-filter_test.go
View File

@ -6,14 +6,14 @@ package filter
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/testutil"
"k8s.io/apimachinery/pkg/api/meta/testrestmapper"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
dynamicfake "k8s.io/client-go/dynamic/fake"
"k8s.io/kubectl/pkg/scheme"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var invObjTemplate = &unstructured.Unstructured{

2
pkg/apply/filter/inventory-policy-prune-filter.go
View File

@ -4,8 +4,8 @@
package filter
import (
"github.com/fluxcd/cli-utils/pkg/inventory"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/inventory"
)
// InventoryPolicyPruneFilter implements ValidationFilter interface to determine

8
pkg/apply/filter/inventory-policy-prune-filter_test.go
View File

@ -6,11 +6,11 @@ package filter
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/testutil"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var inventoryObj = &unstructured.Unstructured{

2
pkg/apply/filter/local-namespaces-filter.go
View File

@ -6,10 +6,10 @@ package filter
import (
"fmt"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/cli-utils/pkg/object"
)
var (

2
pkg/apply/filter/local-namespaces-filter_test.go
View File

@ -6,9 +6,9 @@ package filter
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/testutil"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var testNamespace = &unstructured.Unstructured{

2
pkg/apply/filter/prevent-remove-filter.go
View File

@ -6,8 +6,8 @@ package filter
import (
"fmt"
"github.com/fluxcd/cli-utils/pkg/common"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/common"
)
// PreventRemoveFilter implements ValidationFilter interface to determine

4
pkg/apply/filter/prevent-remove-filter_test.go
View File

@ -6,9 +6,9 @@ package filter
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/testutil"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var defaultObj = &unstructured.Unstructured{

2
pkg/apply/info/helper.go
View File

@ -4,10 +4,10 @@
package info
import (
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/cli-runtime/pkg/resource"
"sigs.k8s.io/cli-utils/pkg/object"
)
// Helper provides functions for interacting with Info objects.

2
pkg/apply/main_test.go
View File

@ -12,7 +12,7 @@ import (
// TestMain executes the tests for this package, with optional logging.
// To see all logs, use:
// go test sigs.k8s.io/cli-utils/pkg/apply -v -args -v=5
// go test github.com/fluxcd/cli-utils/pkg/apply -v -args -v=5
func TestMain(m *testing.M) {
klog.InitFlags(nil)
os.Exit(m.Run())

10
pkg/apply/mutator/apply_time_mutator.go
View File

@ -10,17 +10,17 @@ import (
"fmt"
"strings"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/jsonpath"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/object/mutation"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/dynamic"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/jsonpath"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/object/mutation"
)
// ApplyTimeMutator mutates an object by injecting values specified by the

6
pkg/apply/mutator/apply_time_mutator_test.go
View File

@ -7,6 +7,9 @@ import (
"context"
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
ktestutil "github.com/fluxcd/cli-utils/pkg/kstatus/polling/testutil"
"github.com/fluxcd/cli-utils/pkg/object"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta/testrestmapper"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -15,9 +18,6 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/client-go/dynamic/fake"
"k8s.io/kubectl/pkg/scheme"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
ktestutil "sigs.k8s.io/cli-utils/pkg/kstatus/polling/testutil"
"sigs.k8s.io/cli-utils/pkg/object"
// Using gopkg.in/yaml.v3 instead of sigs.k8s.io/yaml on purpose.
// yaml.v3 correctly parses ints:

2
pkg/apply/mutator/main_test.go
View File

@ -12,7 +12,7 @@ import (
// TestMain executes the tests for this package, with optional logging.
// To see all logs, use:
// go test sigs.k8s.io/cli-utils/pkg/kyq -v -args -v=5
// go test github.com/fluxcd/cli-utils/pkg/kyq -v -args -v=5
func TestMain(m *testing.M) {
klog.InitFlags(nil)
os.Exit(m.Run())

6
pkg/apply/poller/poller.go
View File

@ -6,9 +6,9 @@ package poller
import (
"context"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/object"
)
// Poller defines the interface the applier needs to poll for status of resources.

4
pkg/apply/prune/event-factory.go
View File

@ -5,9 +5,9 @@
package prune
import (
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/object"
)
// EventFactory is an abstract interface describing functions to generate

4
pkg/apply/prune/event-factory_test.go
View File

@ -7,9 +7,9 @@ import (
"fmt"
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/object"
)
func TestEventFactory(t *testing.T) {

2
pkg/apply/prune/main_test.go
View File

@ -12,7 +12,7 @@ import (
// TestMain executes the tests for this package, with optional logging.
// To see all logs, use:
// go test sigs.k8s.io/cli-utils/pkg/apply/prune -v -args -v=5
// go test github.com/fluxcd/cli-utils/pkg/apply/prune -v -args -v=5
func TestMain(m *testing.M) {
klog.InitFlags(nil)
os.Exit(m.Run())

10
pkg/apply/prune/prune.go
View File

@ -15,6 +15,11 @@ import (
"context"
"errors"
"github.com/fluxcd/cli-utils/pkg/apply/filter"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -22,11 +27,6 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/klog/v2"
"k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/apply/filter"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
)
// Pruner implements GetPruneObjs to calculate which objects to prune and Prune

16
pkg/apply/prune/prune_test.go
View File

@ -9,6 +9,14 @@ import (
"strings"
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/filter"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
apierrors "k8s.io/apimachinery/pkg/api/errors"
@ -22,14 +30,6 @@ import (
"k8s.io/client-go/dynamic"
"k8s.io/client-go/dynamic/fake"
"k8s.io/kubectl/pkg/scheme"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/filter"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var testNamespace = "test-inventory-namespace"

2
pkg/apply/solver/main_test.go
View File

@ -12,7 +12,7 @@ import (
// TestMain executes the tests for this package, with optional logging.
// To see all logs, use:
// go test sigs.k8s.io/cli-utils/pkg/apply/solver -v -args -v=5
// go test github.com/fluxcd/cli-utils/pkg/apply/solver -v -args -v=5
func TestMain(m *testing.M) {
klog.InitFlags(nil)
os.Exit(m.Run())

24
pkg/apply/solver/solver.go
View File

@ -18,23 +18,23 @@ import (
"fmt"
"time"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/filter"
"github.com/fluxcd/cli-utils/pkg/apply/info"
"github.com/fluxcd/cli-utils/pkg/apply/mutator"
"github.com/fluxcd/cli-utils/pkg/apply/prune"
"github.com/fluxcd/cli-utils/pkg/apply/task"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/object/graph"
"github.com/fluxcd/cli-utils/pkg/object/validation"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/filter"
"sigs.k8s.io/cli-utils/pkg/apply/info"
"sigs.k8s.io/cli-utils/pkg/apply/mutator"
"sigs.k8s.io/cli-utils/pkg/apply/prune"
"sigs.k8s.io/cli-utils/pkg/apply/task"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/object/graph"
"sigs.k8s.io/cli-utils/pkg/object/validation"
)
type TaskQueueBuilder struct {

20
pkg/apply/solver/solver_test.go
View File

@ -7,20 +7,20 @@ import (
"testing"
"time"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/apply/prune"
"github.com/fluxcd/cli-utils/pkg/apply/task"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/object/graph"
"github.com/fluxcd/cli-utils/pkg/object/validation"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/apply/prune"
"sigs.k8s.io/cli-utils/pkg/apply/task"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/object/graph"
"sigs.k8s.io/cli-utils/pkg/object/validation"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var (

16
pkg/apply/task/apply_task.go
View File

@ -22,14 +22,14 @@ import (
"k8s.io/kubectl/pkg/cmd/apply"
cmddelete "k8s.io/kubectl/pkg/cmd/delete"
applyerror "sigs.k8s.io/cli-utils/pkg/apply/error"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/filter"
"sigs.k8s.io/cli-utils/pkg/apply/info"
"sigs.k8s.io/cli-utils/pkg/apply/mutator"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
applyerror "github.com/fluxcd/cli-utils/pkg/apply/error"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/filter"
"github.com/fluxcd/cli-utils/pkg/apply/info"
"github.com/fluxcd/cli-utils/pkg/apply/mutator"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
)
// applyOptions defines the two key functions on the ApplyOptions

12
pkg/apply/task/apply_task_test.go
View File

@ -9,6 +9,12 @@ import (
"sync"
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -16,12 +22,6 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/discovery"
"k8s.io/client-go/dynamic"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
type resourceInfo struct {

14
pkg/apply/task/delete_inv_task_test.go
View File

@ -6,15 +6,15 @@ package task
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
func TestDeleteInvTask(t *testing.T) {

10
pkg/apply/task/inv_add_task.go
View File

@ -4,14 +4,14 @@
package task
import (
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
)
var (

12
pkg/apply/task/inv_add_task_test.go
View File

@ -6,13 +6,13 @@ package task
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
)
var namespace = "test-namespace"

10
pkg/apply/task/inv_set_task.go
View File

@ -4,13 +4,13 @@
package task
import (
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
)
// DeleteOrUpdateInvTask encapsulates structures necessary to set the

12
pkg/apply/task/inv_set_task_test.go
View File

@ -6,13 +6,13 @@ package task
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var objInvalid = &unstructured.Unstructured{

4
pkg/apply/task/printer_adapter.go
View File

@ -7,11 +7,11 @@ import (
"fmt"
"io"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/printers"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/object"
)
// KubectlPrinterAdapter is a workaround for capturing progress from

2
pkg/apply/task/printer_adapter_test.go
View File

@ -8,9 +8,9 @@ import (
"sync"
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apply/event"
)
func TestKubectlPrinterAdapter(t *testing.T) {

12
pkg/apply/task/prune_task.go
View File

@ -4,14 +4,14 @@
package task
import (
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/filter"
"github.com/fluxcd/cli-utils/pkg/apply/prune"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/filter"
"sigs.k8s.io/cli-utils/pkg/apply/prune"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
// PruneTask prunes objects from the cluster

4
pkg/apply/task/send_event_task.go
View File

@ -4,8 +4,8 @@
package task
import (
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/apply/taskrunner"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/apply/taskrunner"
)
// SendEventTask is an implementation of the Task interface

4
pkg/apply/taskrunner/condition.go
View File

@ -4,8 +4,8 @@
package taskrunner
import (
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
)
// Condition is a type that defines the types of conditions

8
pkg/apply/taskrunner/condition_test.go
View File

@ -6,13 +6,13 @@ package taskrunner
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
ktestutil "github.com/fluxcd/cli-utils/pkg/kstatus/polling/testutil"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
ktestutil "sigs.k8s.io/cli-utils/pkg/kstatus/polling/testutil"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
)
var deployment1y = `

10
pkg/apply/taskrunner/context.go
View File

@ -4,12 +4,12 @@
package taskrunner
import (
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/object/graph"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/object/graph"
)
// NewTaskContext returns a new TaskContext

2
pkg/apply/taskrunner/main_test.go
View File

@ -12,7 +12,7 @@ import (
// TestMain executes the tests for this package, with optional logging.
// To see all logs, use:
// go test sigs.k8s.io/cli-utils/pkg/apply/taskrunner -v -args -v=5
// go test github.com/fluxcd/cli-utils/pkg/apply/taskrunner -v -args -v=5
func TestMain(m *testing.M) {
klog.InitFlags(nil)
os.Exit(m.Run())

10
pkg/apply/taskrunner/runner.go
View File

@ -7,12 +7,12 @@ import (
"context"
"fmt"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
"sigs.k8s.io/cli-utils/pkg/object"
)
// NewTaskStatusRunner returns a new TaskStatusRunner.

14
pkg/apply/taskrunner/runner_test.go
View File

@ -10,15 +10,15 @@ import (
"testing"
"time"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
pollevent "github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/kstatus/watcher"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
pollevent "sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/kstatus/watcher"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var (

6
pkg/apply/taskrunner/task.go
View File

@ -9,13 +9,13 @@ import (
"sync"
"time"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
)
var (

14
pkg/apply/taskrunner/task_test.go
View File

@ -7,14 +7,14 @@ import (
"testing"
"time"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/apply/cache"
"github.com/fluxcd/cli-utils/pkg/apply/event"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/apply/cache"
"sigs.k8s.io/cli-utils/pkg/apply/event"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
var testDeployment1YAML = `

2
pkg/common/path_test.go
View File

@ -10,9 +10,9 @@ import (
"strings"
"testing"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"k8s.io/cli-runtime/pkg/genericclioptions"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
const (

4
pkg/config/initoptions.go
View File

@ -11,12 +11,12 @@ import (
"strings"
"time"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/inventory/configmap"
"github.com/google/uuid"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/klog/v2"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/inventory/configmap"
"sigs.k8s.io/kustomize/kyaml/kio"
"sigs.k8s.io/kustomize/kyaml/kio/filters"
"sigs.k8s.io/kustomize/kyaml/openapi"

4
pkg/errors/errors.go
View File

@ -12,9 +12,9 @@ import (
"strings"
"text/template"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/fluxcd/cli-utils/pkg/manifestreader"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/inventory"
"sigs.k8s.io/cli-utils/pkg/manifestreader"
)
const (

2
pkg/errors/errors_test.go
View File

@ -8,8 +8,8 @@ import (
"strings"
"testing"
"github.com/fluxcd/cli-utils/pkg/inventory"
"github.com/stretchr/testify/assert"
"sigs.k8s.io/cli-utils/pkg/inventory"
)
func TestTextForError(t *testing.T) {

5
pkg/flowcontrol/flowcontrol_test.go
View File

@ -5,18 +5,17 @@ package flowcontrol
import (
"bytes"
"context"
"io"
"net/http"
"net/http/httptest"
"testing"
"time"
"context"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
flowcontrolapi "k8s.io/api/flowcontrol/v1beta2"
"k8s.io/client-go/rest"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
func TestIsEnabled(t *testing.T) {

2
pkg/inventory/fake-builder.go
View File

@ -9,6 +9,7 @@ import (
"net/http"
"regexp"
"github.com/fluxcd/cli-utils/pkg/object"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/api/meta/testrestmapper"
@ -21,7 +22,6 @@ import (
"k8s.io/client-go/restmapper"
cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
"k8s.io/kubectl/pkg/scheme"
"sigs.k8s.io/cli-utils/pkg/object"
)
var (

6
pkg/inventory/fake-inventory-client.go
View File

@ -6,11 +6,11 @@ package inventory
import (
"context"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
// FakeClient is a testing implementation of the Client interface.

6
pkg/inventory/inventory-client.go
View File

@ -7,6 +7,9 @@ import (
"context"
"fmt"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -17,9 +20,6 @@ import (
"k8s.io/klog/v2"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
// Client expresses an interface for interacting with

6
pkg/inventory/inventory-client_test.go
View File

@ -7,6 +7,9 @@ import (
"fmt"
"testing"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@ -17,9 +20,6 @@ import (
"k8s.io/cli-runtime/pkg/resource"
clienttesting "k8s.io/client-go/testing"
cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
func podStatus(info *resource.Info) actuation.ObjectStatus {

4
pkg/inventory/inventory_error.go
View File

@ -8,8 +8,8 @@ package inventory
import (
"fmt"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/object"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/object"
)
const noInventoryErrorStr = `Package uninitialized. Please run "init" command.

4
pkg/inventory/inventory_test.go
View File

@ -7,11 +7,11 @@ import (
"regexp"
"testing"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/cli-runtime/pkg/resource"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
var testNamespace = "test-inventory-namespace"

6
pkg/inventory/inventorycm.go
View File

@ -13,6 +13,9 @@ import (
"encoding/json"
"fmt"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -20,9 +23,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/dynamic"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
var ConfigMapGVK = schema.GroupVersionKind{

4
pkg/inventory/inventorycm_test.go
View File

@ -6,9 +6,9 @@ package inventory
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/google/go-cmp/cmp"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/object"
)
func TestBuildObjMap(t *testing.T) {

4
pkg/inventory/manager.go
View File

@ -6,10 +6,10 @@ package inventory
import (
"fmt"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/object"
)
// Manager wraps an Inventory with convenience methods that use ObjMetadata.

4
pkg/inventory/manager_test.go
View File

@ -6,10 +6,10 @@ package inventory
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/object"
)
func TestObjectStatusGetSet(t *testing.T) {

2
pkg/inventory/policy.go
View File

@ -6,8 +6,8 @@ package inventory
import (
"fmt"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
)
// Policy defines if an inventory object can take over

4
pkg/inventory/policy_test.go
View File

@ -6,10 +6,10 @@ package inventory
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/testutil"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/testutil"
)
type fakeInventoryInfo struct {

6
pkg/inventory/storage.go
View File

@ -15,13 +15,13 @@ import (
"fmt"
"strings"
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/common"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/dynamic"
"k8s.io/klog/v2"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/common"
"sigs.k8s.io/cli-utils/pkg/object"
)
// The default inventory name stored in the inventory template.

4
pkg/inventory/type-conv.go
View File

@ -4,9 +4,9 @@
package inventory
import (
"github.com/fluxcd/cli-utils/pkg/apis/actuation"
"github.com/fluxcd/cli-utils/pkg/object"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/cli-utils/pkg/apis/actuation"
"sigs.k8s.io/cli-utils/pkg/object"
)
// ObjectReferenceFromObjMetadata converts an ObjMetadata to a ObjectReference

2
pkg/jsonpath/jsonpath_test.go
View File

@ -6,9 +6,9 @@ package jsonpath
import (
"testing"
ktestutil "github.com/fluxcd/cli-utils/pkg/kstatus/polling/testutil"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
ktestutil "sigs.k8s.io/cli-utils/pkg/kstatus/polling/testutil"
"sigs.k8s.io/yaml"
)

2
pkg/jsonpath/main_test.go
View File

@ -11,7 +11,7 @@ import (
)
// TestMain executes the tests for this package, with logging enabled.
// go test sigs.k8s.io/cli-utils/pkg/jsonpath -v -args -v=5
// go test github.com/fluxcd/cli-utils/pkg/jsonpath -v -args -v=5
func TestMain(m *testing.M) {
klog.InitFlags(nil)
os.Exit(m.Run())

4
pkg/kstatus/polling/aggregator/aggregator.go
View File

@ -4,8 +4,8 @@
package aggregator
import (
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
)
// AggregateStatus computes the aggregate status for all the resources.

6
pkg/kstatus/polling/aggregator/aggregator_test.go
View File

@ -6,11 +6,11 @@ package aggregator
import (
"testing"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/event"
"github.com/fluxcd/cli-utils/pkg/kstatus/status"
"github.com/fluxcd/cli-utils/pkg/object"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/event"
"sigs.k8s.io/cli-utils/pkg/kstatus/status"
"sigs.k8s.io/cli-utils/pkg/object"
)
var resourceIdentifiers = map[string]object.ObjMetadata{

4
pkg/kstatus/polling/clusterreader/caching_reader.go
View File

@ -9,6 +9,8 @@ import (
"fmt"
"sync"
"github.com/fluxcd/cli-utils/pkg/kstatus/polling/engine"
"github.com/fluxcd/cli-utils/pkg/object"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
@ -19,8 +21,6 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/tools/pager"
"sigs.k8s.io/cli-utils/pkg/kstatus/polling/engine"
"sigs.k8s.io/cli-utils/pkg/object"
"sigs.k8s.io/controller-runtime/pkg/client"
)

Some files were not shown because too many files have changed in this diff Show More