Integration test helpers rewrite #103
Conversation
sgettys
commented
Jun 9, 2022
sgettys
commented
- Update the integration tests to use the published agent image that includes the k8s plugin
- Updated to 1.0-alpha.20
- Consolidated integration test helpers using dynamic client. The reason for this is due to different concrete types that's used for the agent action status versus the porter resources status. Looked into different ways to solve this and dynamic client seems to be cleanest option without adding unnecessary interfaces or multiple abstraction layers
…as k8s plugin included Signed-off-by: Steven Gettys <s.gettys@f5.com>
Signed-off-by: Steven Gettys <s.gettys@f5.com>
Signed-off-by: Steven Gettys <s.gettys@f5.com>
Signed-off-by: Steven Gettys <s.gettys@f5.com>
Signed-off-by: Steven Gettys <s.gettys@f5.com>
Codecov Report
@@ Coverage Diff @@
## main #103 +/- ##
=======================================
Coverage 78.07% 78.07%
=======================================
Files 12 12
Lines 976 976
=======================================
Hits 762 762
Misses 136 136
Partials 78 78
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
magefiles/magefile.go
Outdated
| @@ -636,18 +636,18 @@ func pwd() string { | |||
|
|
|||
| // Run porter using the local storage, not the in-cluster storage | |||
| func buildPorterCmd(args ...string) shx.PreparedCommand { | |||
| mg.SerialDeps(porter.UseBinForPorterHome, porter.EnsurePorter) | |||
| mg.SerialDeps(porter.UseBinForPorterHome) | |||
There was a problem hiding this comment.
This changes how often EnsurePorterAt is run. You can use an anonymous function (or just make a new private function called ensurePorterAt) to keep it as a mage target and retain the existing behavior.
| mg.SerialDeps(porter.UseBinForPorterHome) | |
| mg.SerialDeps(porter.UseBinForPorterHome, func(){porter.EnsurePorterAt(porterVersion)}) |
|
|
||
| patchInstallation := func(inst *porterv1.Installation) { | ||
| controllers.PatchObjectWithRetry(ctx, logr.Discard(), k8sClient, k8sClient.Patch, inst, func() client.Object { | ||
| return &porterv1.Installation{} | ||
| }) | ||
| // Wait for patch to apply, this can cause race conditions |
There was a problem hiding this comment.
I see a comment here but no corresponding code below. Does this comment apply to something I'm just missing or did you intend to add more waiting here?
There was a problem hiding this comment.
Whoops this was before I figured out the race conditions in the waitForPorter, will remove
tests/integration/credset_test.go
Outdated
| Expect(waitForPorter(ctx, inst, "waiting for porter-test-me to install")).Should(Succeed()) | ||
| validateInstallationConditions(inst) | ||
| Expect(waitForPorter(ctx, inst, 1, "waiting for porter-test-me to install")).Should(Succeed()) | ||
| validateResourceConditions(inst.Status.Conditions) |
There was a problem hiding this comment.
I think that you can take advantage of all of the resources implementing the porterResource interface. We can just start export it by renaming to PorterReource.
Then you can pass in an installation (not inst.Status.Conditions) and call GetStatus() which returns a struct with Conditions on it.
tests/integration/utils_test.go
Outdated
| actionKey := client.ObjectKey{Name: name, Namespace: namespace} | ||
| action := &porterv1.AgentAction{} | ||
| if err := k8sClient.Get(ctx, actionKey, action); err != nil { | ||
| Log(errors.Wrap(err, "could not retrieve the Installation's AgentAction to troubleshoot").Error()) |
There was a problem hiding this comment.
The error message here is specific to installation, should this say "Resource's AgentAction" instead?
tests/integration/utils_test.go
Outdated
| jobKey := client.ObjectKey{Name: action.Status.Job.Name, Namespace: action.Namespace} | ||
| job := &batchv1.Job{} | ||
| if err := k8sClient.Get(ctx, jobKey, job); err != nil { | ||
| Log(errors.Wrap(err, "could not retrieve the Installation's Job to troubleshoot").Error()) |
tests/integration/utils_test.go
Outdated
| actionKey := client.ObjectKey{Name: agentActionName, Namespace: namespace} | ||
| action := &porterv1.AgentAction{} | ||
| if err := k8sClient.Get(ctx, actionKey, action); err != nil { | ||
| Log(errors.Wrap(err, "could not retrieve the CredentialSet's AgentAction to troubleshoot").Error()) |
Signed-off-by: Steven Gettys <s.gettys@f5.com>
