-
Notifications
You must be signed in to change notification settings - Fork 130
refactor: move DependencyReference to apis/meta #1129
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Iam-Karan-Suresh
wants to merge
1
commit into
fluxcd:main
Choose a base branch
from
Iam-Karan-Suresh:refactor/extract-dependencyreference-meta
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,171 @@ | ||
| /* | ||
| Copyright 2025 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 meta_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
|
|
||
| "github.com/fluxcd/pkg/apis/meta" | ||
| ) | ||
|
|
||
| func TestMakeDependsOn(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| deps []string | ||
| want []meta.DependencyReference | ||
| }{ | ||
| { | ||
| name: "empty", | ||
| deps: []string{}, | ||
| want: []meta.DependencyReference{}, | ||
| }, | ||
| { | ||
| name: "single name only", | ||
| deps: []string{"redis"}, | ||
| want: []meta.DependencyReference{ | ||
| {Name: "redis"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "single with namespace", | ||
| deps: []string{"default/redis"}, | ||
| want: []meta.DependencyReference{ | ||
| {Namespace: "default", Name: "redis"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "single with CEL expression", | ||
| deps: []string{"redis@status.ready==true"}, | ||
| want: []meta.DependencyReference{ | ||
| {Name: "redis", ReadyExpr: "status.ready==true"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "single with namespace and CEL expression", | ||
| deps: []string{"default/redis@status.ready==true"}, | ||
| want: []meta.DependencyReference{ | ||
| {Namespace: "default", Name: "redis", ReadyExpr: "status.ready==true"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "multiple dependencies", | ||
| deps: []string{ | ||
| "redis", | ||
| "default/postgres@status.ready==true", | ||
| "infra/cert-manager", | ||
| }, | ||
| want: []meta.DependencyReference{ | ||
| {Name: "redis"}, | ||
| {Namespace: "default", Name: "postgres", ReadyExpr: "status.ready==true"}, | ||
| {Namespace: "infra", Name: "cert-manager"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "CEL expression with multiple operators", | ||
| deps: []string{"default/app@status.ready==true && status.observed==1"}, | ||
| want: []meta.DependencyReference{ | ||
| {Namespace: "default", Name: "app", ReadyExpr: "status.ready==true && status.observed==1"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "CEL expression with function calls", | ||
| deps: []string{"infra/ingress@has(status.loadBalancer.ingress)"}, | ||
| want: []meta.DependencyReference{ | ||
| {Namespace: "infra", Name: "ingress", ReadyExpr: "has(status.loadBalancer.ingress)"}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| got := meta.MakeDependsOn(tt.deps) | ||
| g.Expect(got).To(Equal(tt.want)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestDependencyReferenceString(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| ref meta.DependencyReference | ||
| want string | ||
| }{ | ||
| { | ||
| name: "name only", | ||
| ref: meta.DependencyReference{Name: "redis"}, | ||
| want: "redis", | ||
| }, | ||
| { | ||
| name: "namespace and name", | ||
| ref: meta.DependencyReference{Namespace: "default", Name: "redis"}, | ||
| want: "default/redis", | ||
| }, | ||
| { | ||
| name: "name and CEL expression", | ||
| ref: meta.DependencyReference{Name: "redis", ReadyExpr: "status.ready==true"}, | ||
| want: "redis@status.ready==true", | ||
| }, | ||
| { | ||
| name: "namespace, name, and CEL expression", | ||
| ref: meta.DependencyReference{Namespace: "default", Name: "redis", ReadyExpr: "status.ready==true"}, | ||
| want: "default/redis@status.ready==true", | ||
| }, | ||
| { | ||
| name: "name with complex CEL expression", | ||
| ref: meta.DependencyReference{Name: "app", ReadyExpr: "status.ready==true && status.observed==1"}, | ||
| want: "app@status.ready==true && status.observed==1", | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| got := tt.ref.String() | ||
| g.Expect(got).To(Equal(tt.want)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestDependencyReferenceRoundTrip(t *testing.T) { | ||
| g := NewWithT(t) | ||
|
|
||
| tests := []meta.DependencyReference{ | ||
| {Name: "redis"}, | ||
| {Namespace: "default", Name: "postgres"}, | ||
| {Name: "cache", ReadyExpr: "status.ready==true"}, | ||
| {Namespace: "infra", Name: "ingress", ReadyExpr: "has(status.loadBalancer.ingress)"}, | ||
| } | ||
|
|
||
| for _, original := range tests { | ||
| t.Run(original.String(), func(t *testing.T) { | ||
| // Serialize to string | ||
| str := original.String() | ||
|
|
||
| // Parse back from string | ||
| parsed := meta.MakeDependsOn([]string{str}) | ||
| g.Expect(parsed).To(HaveLen(1)) | ||
|
|
||
| // Should match original | ||
| g.Expect(parsed[0]).To(Equal(original)) | ||
| }) | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a breaking change, and
apis/metais GA (v1.x). I'm ok with it, though, so I'll defer to other maintainersThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stefanprodan This is the only item left open IMO