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
4 changes: 2 additions & 2 deletions hack/update-codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ KNATIVE_CODEGEN_PKG=${KNATIVE_CODEGEN_PKG:-$(cd ${REPO_ROOT_DIR}; ls -d -1 ./ven
# instead of the $GOPATH directly. For normal projects this can be dropped.
${CODEGEN_PKG}/generate-groups.sh "deepcopy,client,informer,lister" \
knative.dev/eventing/pkg/client knative.dev/eventing/pkg/apis \
"eventing:v1alpha1 sources:v1alpha1 messaging:v1alpha1" \
"eventing:v1alpha1 sources:v1alpha1 messaging:v1alpha1 flows:v1alpha1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

# Only deepcopy the Duck types, as they are not real resources.
Expand All @@ -42,7 +42,7 @@ ${CODEGEN_PKG}/generate-groups.sh "deepcopy" \
# Knative Injection
${KNATIVE_CODEGEN_PKG}/hack/generate-knative.sh "injection" \
knative.dev/eventing/pkg/client knative.dev/eventing/pkg/apis \
"eventing:v1alpha1 sources:v1alpha1 messaging:v1alpha1" \
"eventing:v1alpha1 sources:v1alpha1 messaging:v1alpha1 flows:v1alpha1" \
--go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt

# Make sure our dependencies are up-to-date
Expand Down
21 changes: 21 additions & 0 deletions pkg/apis/flows/register.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
Copyright 2019 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package flows

const (
GroupName = "flows.knative.dev"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just see that this PR is just types.

)
20 changes: 20 additions & 0 deletions pkg/apis/flows/v1alpha1/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
Copyright 2019 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// Package v1alpha1 is the v1alpha1 version of the API.
// +k8s:deepcopy-gen=package
// +groupName=flows.knative.dev
package v1alpha1
37 changes: 37 additions & 0 deletions pkg/apis/flows/v1alpha1/parallel_defaults.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
Copyright 2019 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1

import (
"context"

eventingduckv1alpha1 "knative.dev/eventing/pkg/apis/duck/v1alpha1"
)

func (s *Parallel) SetDefaults(ctx context.Context) {
if s != nil && s.Spec.ChannelTemplate == nil {
// The singleton may not have been set, if so ignore it and validation will reject the
// Channel.
if cd := eventingduckv1alpha1.ChannelDefaulterSingleton; cd != nil {
channelTemplate := cd.GetDefault(s.Namespace)
s.Spec.ChannelTemplate = channelTemplate
}
}
s.Spec.SetDefaults(ctx)
}

func (ss *ParallelSpec) SetDefaults(ctx context.Context) {}
97 changes: 97 additions & 0 deletions pkg/apis/flows/v1alpha1/parallel_defaults_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
Copyright 2019 The Knative Authors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha1

import (
"context"
"testing"

v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/google/go-cmp/cmp"
eventingduckv1alpha1 "knative.dev/eventing/pkg/apis/duck/v1alpha1"
)

func TestParallelSetDefaults(t *testing.T) {
testCases := map[string]struct {
nilChannelDefaulter bool
channelTemplate *eventingduckv1alpha1.ChannelTemplateSpec
initial Parallel
expected Parallel
}{
"nil ChannelDefaulter": {
nilChannelDefaulter: true,
expected: Parallel{},
},
"unset ChannelDefaulter": {
expected: Parallel{},
},
"set ChannelDefaulter": {
channelTemplate: defaultChannelTemplate,
expected: Parallel{
Spec: ParallelSpec{
ChannelTemplate: defaultChannelTemplate,
},
},
},
"template already specified": {
channelTemplate: defaultChannelTemplate,
initial: Parallel{
Spec: ParallelSpec{
ChannelTemplate: &eventingduckv1alpha1.ChannelTemplateSpec{
TypeMeta: v1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
Kind: "OtherChannel",
},
},
},
},
expected: Parallel{
Spec: ParallelSpec{
ChannelTemplate: &eventingduckv1alpha1.ChannelTemplateSpec{
TypeMeta: v1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
Kind: "OtherChannel",
},
},
},
},
},
}
for n, tc := range testCases {
t.Run(n, func(t *testing.T) {
if !tc.nilChannelDefaulter {
eventingduckv1alpha1.ChannelDefaulterSingleton = &parallelChannelDefaulter{
channelTemplate: tc.channelTemplate,
}
defer func() { eventingduckv1alpha1.ChannelDefaulterSingleton = nil }()
}
tc.initial.SetDefaults(context.TODO())
if diff := cmp.Diff(tc.expected, tc.initial); diff != "" {
t.Fatalf("Unexpected defaults (-want, +got): %s", diff)
}
})
}
}

type parallelChannelDefaulter struct {
channelTemplate *eventingduckv1alpha1.ChannelTemplateSpec
}

func (cd *parallelChannelDefaulter) GetDefault(_ string) *eventingduckv1alpha1.ChannelTemplateSpec {
return cd.channelTemplate
}
Loading