-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move predicates into package and add tests
Signed-off-by: Hidde Beydals <[email protected]>
- Loading branch information
Showing
8 changed files
with
253 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| Copyright 2022 The Flux 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 predicates | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/onsi/gomega" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
|
|
||
| "github.com/fluxcd/helm-controller/api/v2beta1" | ||
| ) | ||
|
|
||
| func TestChartTemplateChangePredicate_Create(t *testing.T) { | ||
| obj := &v2beta1.HelmRelease{Spec: v2beta1.HelmReleaseSpec{}} | ||
| suspended := &v2beta1.HelmRelease{Spec: v2beta1.HelmReleaseSpec{Suspend: true}} | ||
| not := &unstructured.Unstructured{} | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| obj client.Object | ||
| want bool | ||
| }{ | ||
| {name: "new", obj: obj, want: true}, | ||
| {name: "suspended", obj: suspended, want: false}, | ||
| {name: "not a HelmRelease", obj: not, want: false}, | ||
| {name: "nil", obj: nil, want: false}, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| g := gomega.NewWithT(t) | ||
|
|
||
| so := ChartTemplateChangePredicate{} | ||
| e := event.CreateEvent{ | ||
| Object: tt.obj, | ||
| } | ||
| g.Expect(so.Create(e)).To(gomega.Equal(tt.want)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestChartTemplateChangePredicate_Update(t *testing.T) { | ||
| templateA := &v2beta1.HelmRelease{Spec: v2beta1.HelmReleaseSpec{ | ||
| Chart: v2beta1.HelmChartTemplate{ | ||
| Spec: v2beta1.HelmChartTemplateSpec{ | ||
| Chart: "chart-name-a", | ||
| SourceRef: v2beta1.CrossNamespaceObjectReference{ | ||
| Name: "repository", | ||
| Kind: "HelmRepository", | ||
| }, | ||
| }, | ||
| }, | ||
| }} | ||
| templateB := &v2beta1.HelmRelease{Spec: v2beta1.HelmReleaseSpec{ | ||
| Chart: v2beta1.HelmChartTemplate{ | ||
| Spec: v2beta1.HelmChartTemplateSpec{ | ||
| Chart: "chart-name-b", | ||
| SourceRef: v2beta1.CrossNamespaceObjectReference{ | ||
| Name: "repository", | ||
| Kind: "HelmRepository", | ||
| }, | ||
| }, | ||
| }, | ||
| }} | ||
| empty := &v2beta1.HelmRelease{} | ||
| suspended := &v2beta1.HelmRelease{Spec: v2beta1.HelmReleaseSpec{Suspend: true}} | ||
| not := &unstructured.Unstructured{} | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| old client.Object | ||
| new client.Object | ||
| want bool | ||
| }{ | ||
| {name: "same template", old: templateA, new: templateA, want: false}, | ||
| {name: "diff template", old: templateA, new: templateB, want: true}, | ||
| {name: "new with template", old: empty, new: templateA, want: true}, | ||
| {name: "old with template", old: templateA, new: empty, want: true}, | ||
| {name: "new suspended", old: templateA, new: suspended, want: false}, | ||
| {name: "old suspended new template", old: suspended, new: templateA, want: true}, | ||
| {name: "old not a HelmRelease", old: not, new: templateA, want: false}, | ||
| {name: "new not a HelmRelease", old: templateA, new: not, want: false}, | ||
| {name: "old nil", old: nil, new: templateA, want: false}, | ||
| {name: "new nil", old: templateA, new: nil, want: false}, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| g := gomega.NewWithT(t) | ||
|
|
||
| so := ChartTemplateChangePredicate{} | ||
| e := event.UpdateEvent{ | ||
| ObjectOld: tt.old, | ||
| ObjectNew: tt.new, | ||
| } | ||
| g.Expect(so.Update(e)).To(gomega.Equal(tt.want)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestChartTemplateChangePredicate_Delete(t *testing.T) { | ||
| obj := &v2beta1.HelmRelease{Spec: v2beta1.HelmReleaseSpec{}} | ||
| suspended := &v2beta1.HelmRelease{Spec: v2beta1.HelmReleaseSpec{Suspend: true}} | ||
| not := &unstructured.Unstructured{} | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| obj client.Object | ||
| want bool | ||
| }{ | ||
| {name: "object", obj: obj, want: true}, | ||
| {name: "suspended", obj: suspended, want: false}, | ||
| {name: "not a HelmRelease", obj: not, want: false}, | ||
| {name: "nil", obj: nil, want: false}, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| g := gomega.NewWithT(t) | ||
|
|
||
| so := ChartTemplateChangePredicate{} | ||
| e := event.DeleteEvent{ | ||
| Object: tt.obj, | ||
| } | ||
| g.Expect(so.Delete(e)).To(gomega.Equal(tt.want)) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| Copyright 2022 The Flux 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 predicates | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/onsi/gomega" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
|
|
||
| sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" | ||
| ) | ||
|
|
||
| func TestSourceRevisionChangePredicate_Update(t *testing.T) { | ||
| sourceA := &sourceMock{revision: "revision-a"} | ||
| sourceB := &sourceMock{revision: "revision-b"} | ||
| emptySource := &sourceMock{} | ||
| notASource := &unstructured.Unstructured{} | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| old client.Object | ||
| new client.Object | ||
| want bool | ||
| }{ | ||
| {name: "same artifact revision", old: sourceA, new: sourceA, want: false}, | ||
| {name: "diff artifact revision", old: sourceA, new: sourceB, want: true}, | ||
| {name: "new with artifact", old: emptySource, new: sourceA, want: true}, | ||
| {name: "old with artifact", old: sourceA, new: emptySource, want: false}, | ||
| {name: "old not a source", old: notASource, new: sourceA, want: false}, | ||
| {name: "new not a source", old: sourceA, new: notASource, want: false}, | ||
| {name: "old nil", old: nil, new: sourceA, want: false}, | ||
| {name: "new nil", old: sourceA, new: nil, want: false}, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| g := gomega.NewWithT(t) | ||
|
|
||
| so := SourceRevisionChangePredicate{} | ||
| e := event.UpdateEvent{ | ||
| ObjectOld: tt.old, | ||
| ObjectNew: tt.new, | ||
| } | ||
| g.Expect(so.Update(e)).To(gomega.Equal(tt.want)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| type sourceMock struct { | ||
| unstructured.Unstructured | ||
| revision string | ||
| } | ||
|
|
||
| func (m sourceMock) GetRequeueAfter() time.Duration { | ||
| return time.Second * 0 | ||
| } | ||
|
|
||
| func (m *sourceMock) GetArtifact() *sourcev1.Artifact { | ||
| if m.revision != "" { | ||
| return &sourcev1.Artifact{ | ||
| Revision: m.revision, | ||
| } | ||
| } | ||
| return nil | ||
| } |