feat: enable golden export for direct controller (no TF dependency) #2251
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
| @@ -302,7 +302,23 @@ func (a *Adapter) Update(ctx context.Context, u *unstructured.Unstructured) erro | |||
| } | |||
|
|
|||
| func (a *Adapter) Export(ctx context.Context) (*unstructured.Unstructured, error) { | |||
There was a problem hiding this comment.
Idea: (unrelated to this PR) we could have this return a runtime.Object, and then have the caller convert it to unstructured if needed. Would save a few lines in each Export method.
There was a problem hiding this comment.
Yes! This also makes the golden export more "correct". Right now, I have to re-write the name and namespace for golden export but this could miss other metadata like labels and annotations.
tests/e2e/export.go
Outdated
| "sigs.k8s.io/yaml" | ||
| ) | ||
|
|
||
| func directExport(u *unstructured.Unstructured, c client.Client) ([]byte, error) { |
There was a problem hiding this comment.
I thought we had this function somewhere, but .. no objection, lgtm
There was a problem hiding this comment.
we have similar code nested inside the dynamic test (but I think that will be removed eventually).
tests/e2e/export.go
Outdated
| "sigs.k8s.io/yaml" | ||
| ) | ||
|
|
||
| func directExport(u *unstructured.Unstructured, c client.Client) ([]byte, error) { | ||
| ctx := context.TODO() |
There was a problem hiding this comment.
Nit: probably easier to accept a ctx context.Context parameter on new methods (the caller can always pass context.TODO if needed)
There was a problem hiding this comment.
yea.. was trying to do that but want to make as little code change as possible.
There was a problem hiding this comment.
Ah, just found h.Ctx.
tests/e2e/export.go
Outdated
| return nil, err | ||
| } | ||
| if !found { | ||
| return nil, fmt.Errorf("GVK %s '%v' is not found", u.GroupVersionKind(), u.GetName()) |
There was a problem hiding this comment.
Nit: a message like "GCP resource for %v with name %q not found", gvk.Kind, u.GetName might be clearer. My thought is that it's not the GVK that wasn't found (in the registry), it's the underlying GCP object that wasn't found.
There was a problem hiding this comment.
Thanks! Yes, I like this message.
tests/e2e/export.go
Outdated
| unst.SetGroupVersionKind(gvk) | ||
| unst.SetName(u.GetName()) | ||
| if u.GetNamespace() != "" { | ||
| unst.SetName(u.GetName()) |
There was a problem hiding this comment.
I don't follow this logic... should it be SetNamespace?
There was a problem hiding this comment.
Fixed. (I turned on some vscode autocompletion. It seems to be too smart to control. I think I had a similar bug before)
|
A few nits but lgtm. (Tests aren't passing though) |
yuwenma
force-pushed
the
cbwp-export
branch
6 times, most recently
from
d739c26
to
227b9cd
Compare
Change description
Fixes #
Tests you have done
make ready-prto ensure this PR is ready for review.