Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions cmd/crossplane/render/contextfn/context.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,11 @@ import (
"maps"
"sync"

fnv1 "github.com/crossplane/function-sdk-go/proto/v1"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/structpb"

fnv1 "github.com/crossplane/crossplane/v2/proto/fn/v1"
)

// FunctionName is the pkgv1.Function.Name used for the in-process context
Expand Down
3 changes: 1 addition & 2 deletions cmd/crossplane/render/contextfn/context_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ import (
"encoding/json"
"testing"

fnv1 "github.com/crossplane/function-sdk-go/proto/v1"
"github.com/google/go-cmp/cmp"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/testing/protocmp"
"google.golang.org/protobuf/types/known/structpb"

fnv1 "github.com/crossplane/crossplane/v2/proto/fn/v1"
)

func mustStruct(t *testing.T, m map[string]any) *structpb.Struct {
Expand Down
3 changes: 1 addition & 2 deletions cmd/crossplane/render/contextfn/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ import (
"sync"
"time"

fnv1 "github.com/crossplane/function-sdk-go/proto/v1"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/protobuf/types/known/structpb"
"k8s.io/apimachinery/pkg/runtime"

"github.com/crossplane/crossplane-runtime/v2/pkg/errors"
"github.com/crossplane/crossplane-runtime/v2/pkg/logging"

fnv1 "github.com/crossplane/crossplane/v2/proto/fn/v1"
)

// Handle is the owner of a running in-process context function.
Expand Down
3 changes: 1 addition & 2 deletions cmd/crossplane/render/contextfn/listener_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ import (
"testing"
"time"

fnv1 "github.com/crossplane/function-sdk-go/proto/v1"
"github.com/google/go-cmp/cmp"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/protobuf/testing/protocmp"

"github.com/crossplane/crossplane-runtime/v2/pkg/logging"

fnv1 "github.com/crossplane/crossplane/v2/proto/fn/v1"
)

func TestListenerRoundTrip(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/render/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.
package render

import (
fnv1 "github.com/crossplane/function-sdk-go/proto/v1"
"github.com/crossplane/function-sdk-go/resource"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
Expand All @@ -31,7 +32,6 @@ import (
ucomposite "github.com/crossplane/crossplane-runtime/v2/pkg/resource/unstructured/composite"

opsv1alpha1 "github.com/crossplane/crossplane/apis/v2/ops/v1alpha1"
fnv1 "github.com/crossplane/crossplane/v2/proto/fn/v1"

renderv1alpha1 "github.com/crossplane/cli/v2/proto/render/v1alpha1"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/crossplane/render/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"strings"
"time"

fnv1 "github.com/crossplane/function-sdk-go/proto/v1"
corev1 "k8s.io/api/core/v1"
kunstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/kube-openapi/pkg/spec3"
Expand All @@ -37,7 +38,6 @@ import (
apiextensionsv1 "github.com/crossplane/crossplane/apis/v2/apiextensions/v1"
opsv1alpha1 "github.com/crossplane/crossplane/apis/v2/ops/v1alpha1"
pkgv1 "github.com/crossplane/crossplane/apis/v2/pkg/v1"
fnv1 "github.com/crossplane/crossplane/v2/proto/fn/v1"

renderv1alpha1 "github.com/crossplane/cli/v2/proto/render/v1alpha1"
)
Expand Down
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/containerd/errdefs v1.0.0
github.com/crossplane/crossplane-runtime/v2 v2.3.0-rc.0.0.20260416145853-f43d88270996
github.com/crossplane/crossplane/apis/v2 v2.0.0-20260415071903-2b072b20c4bd
github.com/crossplane/crossplane/v2 v2.2.1
github.com/crossplane/function-sdk-go v0.6.1-0.20260422203639-1c756d23b966
github.com/docker/cli v29.4.0+incompatible
github.com/docker/docker v28.5.2+incompatible
Expand Down Expand Up @@ -173,6 +172,7 @@ require (
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/term v0.5.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
Expand Down Expand Up @@ -221,7 +221,10 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
Expand Down
Loading
Loading