Merge pull request #345 from stefanprodan/ssa-0.36

Update `fluxcd/pkg/ssa` to v0.36.0

cmd/timoni/build_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/fluxcd/pkg/ssa"
+	ssautil "github.com/fluxcd/pkg/ssa/utils"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
@@ -41,7 +41,7 @@ func TestBuild(t *testing.T) {
 		))
 		g.Expect(err).ToNot(HaveOccurred())
 
-		objects, err := ssa.ReadObjects(strings.NewReader(output))
+		objects, err := ssautil.ReadObjects(strings.NewReader(output))
 		g.Expect(err).ToNot(HaveOccurred())
 
 		g.Expect(output).To(ContainSubstring("tcp://example.internal"))
@@ -67,7 +67,7 @@ func TestBuild(t *testing.T) {
 
 		g.Expect(output).To(ContainSubstring("\"kind\": \"List\""))
 
-		objects, err := ssa.ReadObjects(strings.NewReader(output))
+		objects, err := ssautil.ReadObjects(strings.NewReader(output))
 		g.Expect(err).ToNot(HaveOccurred())
 		g.Expect(len(objects)).To(BeEquivalentTo(2))
 	})
@@ -87,7 +87,7 @@ func TestBuild(t *testing.T) {
 
 		g.Expect(output).To(ContainSubstring("tcp://example.com"))
 
-		objects, err := ssa.ReadObjects(strings.NewReader(output))
+		objects, err := ssautil.ReadObjects(strings.NewReader(output))
 		g.Expect(err).ToNot(HaveOccurred())
 
 		g.Expect(len(objects)).To(BeEquivalentTo(2))
@@ -113,7 +113,7 @@ func TestBuild(t *testing.T) {
 		// this domain is specified in the YAML file
 		g.Expect(output).To(ContainSubstring("tcp://yaml.example.com"))
 
-		objects, err := ssa.ReadObjects(strings.NewReader(output))
+		objects, err := ssautil.ReadObjects(strings.NewReader(output))
 		g.Expect(err).ToNot(HaveOccurred())
 
 		g.Expect(len(objects)).To(BeEquivalentTo(2))
@@ -137,7 +137,7 @@ func TestBuild(t *testing.T) {
 		))
 		g.Expect(err).ToNot(HaveOccurred())
 
-		objects, err := ssa.ReadObjects(strings.NewReader(output))
+		objects, err := ssautil.ReadObjects(strings.NewReader(output))
 		g.Expect(err).ToNot(HaveOccurred())
 
 		g.Expect(len(objects)).To(BeEquivalentTo(1))

cmd/timoni/bundle_build_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/fluxcd/pkg/ssa"
+	ssautil "github.com/fluxcd/pkg/ssa/utils"
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
@@ -112,7 +112,7 @@ bundle:
 				output, err := execCommand()
 				g.Expect(err).ToNot(HaveOccurred())
 
-				objects, err := ssa.ReadObjects(strings.NewReader(output))
+				objects, err := ssautil.ReadObjects(strings.NewReader(output))
 				g.Expect(err).ToNot(HaveOccurred())
 				g.Expect(objects).To(HaveLen(2))
 

cmd/timoni/dyff.go

@@ -25,6 +25,8 @@ import (
 	"sort"
 
 	"github.com/fluxcd/pkg/ssa"
+	ssaerr "github.com/fluxcd/pkg/ssa/errors"
+	ssautil "github.com/fluxcd/pkg/ssa/utils"
 	"github.com/gonvenience/ytbx"
 	"github.com/homeport/dyff/pkg/dyff"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -102,8 +104,8 @@ func instanceDryRunDiff(ctx context.Context,
 
 		change, liveObject, mergedObject, err := rm.Diff(ctx, r, diffOpts)
 		if err != nil {
-			if ssa.IsImmutableError(err) {
-				if ssa.AnyInMetadata(r, map[string]string{
+			if ssaerr.IsImmutableError(err) {
+				if ssautil.AnyInMetadata(r, map[string]string{
 					apiv1.ForceAction: apiv1.EnabledValue,
 				}) {
 					log.Info(colorizeJoin(r, ssa.CreatedAction, dryRunServer))

cmd/timoni/log.go

@@ -28,6 +28,7 @@ import (
 	"github.com/fatih/color"
 	"github.com/fluxcd/cli-utils/pkg/kstatus/status"
 	"github.com/fluxcd/pkg/ssa"
+	ssautil "github.com/fluxcd/pkg/ssa/utils"
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zerologr"
 	gcrLog "github.com/google/go-containerregistry/pkg/logs"
@@ -152,7 +153,7 @@ func colorizeNamespaceFromArgs() string {
 }
 
 func colorizeUnstructured(object *unstructured.Unstructured) string {
-	return colorizeSubject(ssa.FmtUnstructured(object))
+	return colorizeSubject(ssautil.FmtUnstructured(object))
 }
 
 func colorizeAction(action ssa.Action) string {

cmd/timoni/mod_vendor_crd.go

@@ -28,7 +28,7 @@ import (
 	"strings"
 
 	"cuelang.org/go/cue/cuecontext"
-	"github.com/fluxcd/pkg/ssa"
+	ssautil "github.com/fluxcd/pkg/ssa/utils"
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/yaml"
@@ -127,7 +127,7 @@ func runVendorCrdCmd(cmd *cobra.Command, args []string) error {
 
 	// Extract the Kubernetes CRDs from the multi-doc YAML.
 	var builder strings.Builder
-	objects, err := ssa.ReadObjects(bytes.NewReader(crdData))
+	objects, err := ssautil.ReadObjects(bytes.NewReader(crdData))
 	if err != nil {
 		return fmt.Errorf("parsing CRDs failed: %w", err)
 	}

cmd/timoni/mod_vet.go

@@ -24,7 +24,7 @@ import (
 
 	"cuelang.org/go/cue/cuecontext"
 	"cuelang.org/go/pkg/strings"
-	"github.com/fluxcd/pkg/ssa"
+	ssautil "github.com/fluxcd/pkg/ssa/utils"
 	"github.com/google/go-containerregistry/pkg/name"
 	cp "github.com/otiai10/copy"
 	"github.com/spf13/cobra"
@@ -175,7 +175,7 @@ func runVetModCmd(cmd *cobra.Command, args []string) error {
 
 	for _, object := range objects {
 		log.Info(fmt.Sprintf("%s %s",
-			colorizeSubject(ssa.FmtUnstructured(object)), colorizeInfo("valid resource")))
+			colorizeSubject(ssautil.FmtUnstructured(object)), colorizeInfo("valid resource")))
 	}
 
 	images, err := builder.GetContainerImages(buildResult)

go.mod

@@ -6,33 +6,33 @@ require (
 	cuelang.org/go v0.7.1
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/briandowns/spinner v1.23.0
-	github.com/distribution/distribution/v3 v3.0.0-20231211161154-c087d1956f8c
+	github.com/distribution/distribution/v3 v3.0.0-alpha.1
 	github.com/fatih/color v1.16.0
-	github.com/fluxcd/cli-utils v0.36.0-flux.2
-	github.com/fluxcd/pkg/sourceignore v0.4.0
-	github.com/fluxcd/pkg/ssa v0.35.0
+	github.com/fluxcd/cli-utils v0.36.0-flux.3
+	github.com/fluxcd/pkg/sourceignore v0.5.0
+	github.com/fluxcd/pkg/ssa v0.36.0
 	github.com/fluxcd/pkg/tar v0.4.0
-	github.com/getkin/kin-openapi v0.122.0
-	github.com/go-logr/logr v1.3.0
+	github.com/getkin/kin-openapi v0.123.0
+	github.com/go-logr/logr v1.4.1
 	github.com/go-logr/zerologr v1.2.3
 	github.com/gonvenience/ytbx v1.4.4
 	github.com/google/go-cmp v0.6.0
-	github.com/google/go-containerregistry v0.17.0
+	github.com/google/go-containerregistry v0.19.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
-	github.com/homeport/dyff v1.6.0
+	github.com/homeport/dyff v1.7.1
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/onsi/gomega v1.30.0
+	github.com/onsi/gomega v1.31.1
 	github.com/otiai10/copy v1.14.0
 	github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
-	github.com/rs/zerolog v1.31.0
+	github.com/rs/zerolog v1.32.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
-	k8s.io/api v0.28.4
-	k8s.io/apiextensions-apiserver v0.28.4
-	k8s.io/apimachinery v0.28.4
-	k8s.io/cli-runtime v0.28.4
-	k8s.io/client-go v0.28.4
+	k8s.io/api v0.28.6
+	k8s.io/apiextensions-apiserver v0.28.6
+	k8s.io/apimachinery v0.28.6
+	k8s.io/cli-runtime v0.28.6
+	k8s.io/client-go v0.28.6
 	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/yaml v1.4.0
 )
@@ -44,6 +44,7 @@ require (
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bshuster-repo/logrus-logstash-hook v1.0.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chai2010/gettext-go v1.0.2 // indirect
 	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
@@ -65,32 +66,33 @@ require (
 	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.7.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
 	github.com/go-git/go-billy/v5 v5.5.0 // indirect
 	github.com/go-git/go-git/v5 v5.11.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-openapi/swag v0.22.8 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/gonvenience/bunt v1.3.5 // indirect
-	github.com/gonvenience/neat v1.3.12 // indirect
+	github.com/gonvenience/neat v1.3.13 // indirect
 	github.com/gonvenience/term v1.0.2 // indirect
 	github.com/gonvenience/text v1.0.7 // indirect
-	github.com/gonvenience/wrap v1.1.2 // indirect
+	github.com/gonvenience/wrap v1.2.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/gorilla/handlers v1.5.1 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
 	github.com/hashicorp/golang-lru/arc/v2 v2.0.5 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.5 // indirect
 	github.com/imdario/mergo v0.3.15 // indirect
@@ -135,38 +137,53 @@ require (
 	github.com/redis/go-redis/v9 v9.1.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sergi/go-diff v1.3.1 // indirect
+	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/texttheater/golang-levenshtein v1.0.1 // indirect
 	github.com/vbatts/tar-split v0.11.3 // indirect
 	github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
-	go.opentelemetry.io/otel v1.16.0 // indirect
-	go.opentelemetry.io/otel/metric v1.16.0 // indirect
-	go.opentelemetry.io/otel/trace v1.16.0 // indirect
+	go.opentelemetry.io/contrib/exporters/autoexport v0.46.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
+	go.opentelemetry.io/otel v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.44.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
+	go.opentelemetry.io/otel/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
+	go.opentelemetry.io/otel/trace v1.21.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
-	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/oauth2 v0.15.0 // indirect
-	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/oauth2 v0.16.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/term v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/grpc v1.59.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/component-base v0.28.4 // indirect
+	k8s.io/component-base v0.28.6 // indirect
 	k8s.io/klog/v2 v2.100.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20231206194836-bf4651e18aa8 // indirect
-	k8s.io/kubectl v0.28.4 // indirect
+	k8s.io/kubectl v0.28.6 // indirect
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/kustomize/api v0.16.0 // indirect