Skip to content

Commit

Permalink
fix(knative): sort services
Browse files Browse the repository at this point in the history 
Close #1826
  • Loading branch information
@squakez
squakez committed Oct 11, 2023
1 parent 35978dc commit aed74fa
Show file tree
Hide file tree
Showing 2 changed files with 175 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/trait/knative.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
}

t.ChannelSources = items
sort.Strings(t.ChannelSources)
}
if len(t.ChannelSinks) == 0 {
items := make([]string, 0)
Expand All @@ -105,6 +106,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
}

t.ChannelSinks = items
sort.Strings(t.ChannelSinks)
}
if len(t.EndpointSources) == 0 {
items := make([]string, 0)
Expand All @@ -120,6 +122,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
}

t.EndpointSources = items
sort.Strings(t.EndpointSources)
}
if len(t.EndpointSinks) == 0 {
items := make([]string, 0)
Expand All @@ -135,6 +138,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
}

t.EndpointSinks = items
sort.Strings(t.EndpointSinks)
}
if len(t.EventSources) == 0 {
items := make([]string, 0)
Expand All @@ -150,6 +154,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
}

t.EventSources = items
sort.Strings(t.EventSources)
}
if len(t.EventSinks) == 0 {
items := make([]string, 0)
Expand All @@ -165,6 +170,7 @@ func (t *knativeTrait) Configure(e *Environment) (bool, error) {
}

t.EventSinks = items
sort.Strings(t.EventSinks)
}
if t.FilterSourceChannels == nil {
// Filtering is no longer used by default
Expand Down
169 changes: 169 additions & 0 deletions pkg/trait/knative_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,76 @@ func TestKnativePlatformHttpDependencies(t *testing.T) {
}
}

func TestKnativeConfigurationSorting(t *testing.T) {
// unsorted on purpose
sources := []v1.SourceSpec{
{
DataSpec: v1.DataSpec{
Name: "s1.groovy",
Content: `from('knative:channel/channel-source-2').log('${body}')`,
},
Language: v1.LanguageGroovy,
},
{
DataSpec: v1.DataSpec{
Name: "s2.groovy",
Content: `from('knative:channel/channel-source-4').log('${body}')`,
},
Language: v1.LanguageGroovy,
},
{
DataSpec: v1.DataSpec{
Name: "s3.groovy",
Content: `from('knative:channel/channel-source-1').log('${body}')`,
},
Language: v1.LanguageGroovy,
},
{
DataSpec: v1.DataSpec{
Name: "s4.groovy",
Content: `from('knative:channel/channel-source-3').log('${body}')`,
},
Language: v1.LanguageGroovy,
},
}

environment := NewFakeEnvironment(t, v1.SourceSpec{})
// disable traits which are not really needed in this test
enabled := false
environment.Integration.Spec.Traits.Container = &traitv1.ContainerTrait{
Trait: traitv1.Trait{
Enabled: &enabled,
},
}
environment.Integration.Spec.Traits.Mount = &traitv1.MountTrait{
Trait: traitv1.Trait{
Enabled: &enabled,
},
}
environment.Integration.Spec.Traits.JVM = &traitv1.JVMTrait{
Trait: traitv1.Trait{
Enabled: &enabled,
},
}
environment.Integration.Status.Phase = v1.IntegrationPhaseRunning
environment.Integration.Spec.Sources = sources

c, err := SortChannelFakeClient("ns")
assert.Nil(t, err)
tc := NewCatalog(c)
err = tc.Configure(&environment)
assert.Nil(t, err)
err = tc.apply(&environment)
assert.Nil(t, err)
camelEnv := knativeapi.NewCamelEnvironment()
err = camelEnv.Deserialize(envvar.Get(environment.EnvVars, "CAMEL_KNATIVE_CONFIGURATION").Value)
assert.Nil(t, err)
assert.Equal(t, "channel-source-1", camelEnv.Services[0].Name)
assert.Equal(t, "channel-source-2", camelEnv.Services[1].Name)
assert.Equal(t, "channel-source-3", camelEnv.Services[2].Name)
assert.Equal(t, "channel-source-4", camelEnv.Services[3].Name)
}

func NewFakeEnvironment(t *testing.T, source v1.SourceSpec) Environment {
t.Helper()

Expand Down Expand Up @@ -555,3 +625,102 @@ func NewFakeClient(namespace string) (client.Client, error) {
},
)
}

func SortChannelFakeClient(namespace string) (client.Client, error) {
channelSourceURL1, err := apis.ParseURL("http://channel-source-1.host/")
if err != nil {
return nil, err
}
channelSourceURL2, err := apis.ParseURL("http://channel-source-2.host/")
if err != nil {
return nil, err
}
channelSourceURL3, err := apis.ParseURL("http://channel-source-3.host/")
if err != nil {
return nil, err
}
channelSourceURL4, err := apis.ParseURL("http://channel-source-4.host/")
if err != nil {
return nil, err
}

return test.NewFakeClient(
// Channels unsorted on purpose
&messaging.Channel{
TypeMeta: metav1.TypeMeta{
Kind: "Channel",
APIVersion: messaging.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
Name: "channel-source-2",
},
Status: messaging.ChannelStatus{
ChannelableStatus: eventingduckv1.ChannelableStatus{
AddressStatus: duckv1.AddressStatus{
Address: &duckv1.Addressable{
URL: channelSourceURL2,
},
},
},
},
},
&messaging.Channel{
TypeMeta: metav1.TypeMeta{
Kind: "Channel",
APIVersion: messaging.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
Name: "channel-source-4",
},
Status: messaging.ChannelStatus{
ChannelableStatus: eventingduckv1.ChannelableStatus{
AddressStatus: duckv1.AddressStatus{
Address: &duckv1.Addressable{
URL: channelSourceURL4,
},
},
},
},
},
&messaging.Channel{
TypeMeta: metav1.TypeMeta{
Kind: "Channel",
APIVersion: messaging.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
Name: "channel-source-1",
},
Status: messaging.ChannelStatus{
ChannelableStatus: eventingduckv1.ChannelableStatus{
AddressStatus: duckv1.AddressStatus{
Address: &duckv1.Addressable{
URL: channelSourceURL1,
},
},
},
},
},
&messaging.Channel{
TypeMeta: metav1.TypeMeta{
Kind: "Channel",
APIVersion: messaging.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
Name: "channel-source-3",
},
Status: messaging.ChannelStatus{
ChannelableStatus: eventingduckv1.ChannelableStatus{
AddressStatus: duckv1.AddressStatus{
Address: &duckv1.Addressable{
URL: channelSourceURL3,
},
},
},
},
},
)
}

0 comments on commit aed74fa

Please sign in to comment.