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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
env:
# Common versions
GO_VERSION: '1.25.14'
GOLANGCI_VERSION: 'v2.12.2'
GOLANGCI_VERSION: 'v2.13.1'
DOCKER_BUILDX_VERSION: 'v0.36.1'

# These environment variables are important to the Crossplane CLI install.sh
Expand Down
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ linters:
# useful in theory to catch fields that are accidentally omitted. Seems like
# it would have many more false positives than useful catches, though.
- exhaustruct
- exhaustruct_v5

# Warns about TODO comments. The rationale being they should be issues
# instead. We're okay with using TODO to track minor cleanups for next time
Expand Down
2 changes: 1 addition & 1 deletion fn.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1.RunFunctionRequest)
}

// Initialize the requirements.
requirements := &fnv1.Requirements{ExtraResources: make(map[string]*fnv1.ResourceSelector), Resources: make(map[string]*fnv1.ResourceSelector)}
requirements := &fnv1.Requirements{ExtraResources: make(map[string]*fnv1.ResourceSelector), Resources: make(map[string]*fnv1.ResourceSelector)} //nolint:staticcheck // continue supporting deprecated interface

// Override the TTL if specified in the observed composite.
if v, found := observedComposite.Resource.GetAnnotations()[annotationKeyTTL]; found {
Expand Down
8 changes: 4 additions & 4 deletions fn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1115,7 +1115,7 @@ func TestRunFunction(t *testing.T) {
Meta: &fnv1.ResponseMeta{Ttl: durationpb.New(response.DefaultTTL)},
Results: []*fnv1.Result{},
Requirements: &fnv1.Requirements{
ExtraResources: map[string]*fnv1.ResourceSelector{
ExtraResources: map[string]*fnv1.ResourceSelector{ //nolint:staticcheck // maintain support for deprecated interface
"cool-extra-resource": {
ApiVersion: "example.org/v1",
Kind: "CoolExtraResource",
Expand Down Expand Up @@ -1731,7 +1731,7 @@ func TestRunFunction(t *testing.T) {
},
},
Requirements: &fnv1.Requirements{
ExtraResources: map[string]*fnv1.ResourceSelector{
ExtraResources: map[string]*fnv1.ResourceSelector{ //nolint:staticcheck // maintain support for deprecated interface
"cool-extra-resource": {
ApiVersion: "example.org/v1",
Kind: "CoolExtraResource",
Expand Down Expand Up @@ -1780,7 +1780,7 @@ func TestRunFunction(t *testing.T) {
}
}
}`),
ExtraResources: map[string]*fnv1.Resources{
ExtraResources: map[string]*fnv1.Resources{ //nolint:staticcheck // maintain support for deprecated interface
"cool-extra-resource": {
Items: []*fnv1.Resource{
{
Expand Down Expand Up @@ -1835,7 +1835,7 @@ func TestRunFunction(t *testing.T) {
},
},
Requirements: &fnv1.Requirements{
ExtraResources: map[string]*fnv1.ResourceSelector{
ExtraResources: map[string]*fnv1.ResourceSelector{ //nolint:staticcheck // maintain support for deprecated interface
"cool-extra-resource": {
ApiVersion: "example.org/v1",
Kind: "CoolExtraResource",
Expand Down
Loading