Skip to content

Commit 3bf8f5d

Browse files
authored
Merge pull request #37 from stevendborrelli/update
update depdencecies for v1 functions
2 parents 1296a6c + e0a710e commit 3bf8f5d

File tree

7 files changed

+288
-275
lines changed

7 files changed

+288
-275
lines changed

.github/workflows/tag.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Tag
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Release version (e.g. v0.1.0)'
8+
required: true
9+
message:
10+
description: 'Tag message'
11+
required: true
12+
13+
jobs:
14+
create-tag:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
20+
21+
- name: Create Tag
22+
uses: negz/create-tag@39bae1e0932567a58c20dea5a1a0d18358503320 # v1
23+
with:
24+
version: ${{ github.event.inputs.version }}
25+
message: ${{ github.event.inputs.message }}
26+
token: ${{ secrets.GITHUB_TOKEN }}

.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,3 +204,4 @@ issues:
204204

205205
# Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
206206
max-same-issues: 0
207+

fn.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/crossplane/crossplane-runtime/pkg/errors"
1414
"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
1515
"github.com/crossplane/crossplane-runtime/pkg/logging"
16-
fnv1beta1 "github.com/crossplane/function-sdk-go/proto/v1beta1"
16+
fnv1 "github.com/crossplane/function-sdk-go/proto/v1"
1717
"github.com/crossplane/function-sdk-go/request"
1818
"github.com/crossplane/function-sdk-go/resource"
1919
"github.com/crossplane/function-sdk-go/response"
@@ -28,13 +28,13 @@ const (
2828

2929
// Function returns whatever response you ask it to.
3030
type Function struct {
31-
fnv1beta1.UnimplementedFunctionRunnerServiceServer
31+
fnv1.UnimplementedFunctionRunnerServiceServer
3232

3333
log logging.Logger
3434
}
3535

3636
// RunFunction runs the Function.
37-
func (f *Function) RunFunction(_ context.Context, req *fnv1beta1.RunFunctionRequest) (*fnv1beta1.RunFunctionResponse, error) {
37+
func (f *Function) RunFunction(_ context.Context, req *fnv1.RunFunctionRequest) (*fnv1.RunFunctionResponse, error) {
3838
f.log.Info("Running function", "tag", req.GetMeta().GetTag())
3939

4040
rsp := response.To(req, response.DefaultTTL)
@@ -116,16 +116,16 @@ func (f *Function) RunFunction(_ context.Context, req *fnv1beta1.RunFunctionRequ
116116

117117
// Build requirements takes input and outputs an array of external resoruce requirements to request
118118
// from Crossplane's external resource API.
119-
func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1beta1.Requirements, error) { //nolint:gocyclo // Adding non-nil validations increases function complexity.
120-
extraResources := make(map[string]*fnv1beta1.ResourceSelector, len(in.Spec.ExtraResources))
119+
func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1.Requirements, error) { //nolint:gocyclo // Adding non-nil validations increases function complexity.
120+
extraResources := make(map[string]*fnv1.ResourceSelector, len(in.Spec.ExtraResources))
121121
for _, extraResource := range in.Spec.ExtraResources {
122122
extraResName := extraResource.Into
123123
switch extraResource.Type {
124124
case v1beta1.ResourceSourceTypeReference, "":
125-
extraResources[extraResName] = &fnv1beta1.ResourceSelector{
125+
extraResources[extraResName] = &fnv1.ResourceSelector{
126126
ApiVersion: extraResource.APIVersion,
127127
Kind: extraResource.Kind,
128-
Match: &fnv1beta1.ResourceSelector_MatchName{
128+
Match: &fnv1.ResourceSelector_MatchName{
129129
MatchName: extraResource.Ref.Name,
130130
},
131131
}
@@ -155,16 +155,16 @@ func buildRequirements(in *v1beta1.Input, xr *resource.Composite) (*fnv1beta1.Re
155155
if len(matchLabels) == 0 {
156156
continue
157157
}
158-
extraResources[extraResName] = &fnv1beta1.ResourceSelector{
158+
extraResources[extraResName] = &fnv1.ResourceSelector{
159159
ApiVersion: extraResource.APIVersion,
160160
Kind: extraResource.Kind,
161-
Match: &fnv1beta1.ResourceSelector_MatchLabels{
162-
MatchLabels: &fnv1beta1.MatchLabels{Labels: matchLabels},
161+
Match: &fnv1.ResourceSelector_MatchLabels{
162+
MatchLabels: &fnv1.MatchLabels{Labels: matchLabels},
163163
},
164164
}
165165
}
166166
}
167-
return &fnv1beta1.Requirements{ExtraResources: extraResources}, nil
167+
return &fnv1.Requirements{ExtraResources: extraResources}, nil
168168
}
169169

170170
// Verify Min/Max and sort extra resources by field path within a single kind.

0 commit comments

Comments
 (0)