CLOUDP-83733: more tests on clusters (create only) #185
Conversation
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
antonlisovenko
changed the title
antonlisovenko
commented
Mar 26, 2021
| func (r *AtlasClusterReconciler) ensureClusterState(ctx *workflow.Context, project *mdbv1.AtlasProject, cluster *mdbv1.AtlasCluster) (c *mongodbatlas.Cluster, _ workflow.Result) { | ||
| c, resp, err := ctx.Client.Clusters.Get(context.Background(), project.Status.ID, cluster.Spec.Name) | ||
| func (r *AtlasClusterReconciler) ensureClusterState(ctx *workflow.Context, project *mdbv1.AtlasProject, cluster *mdbv1.AtlasCluster) (atlasCluster *mongodbatlas.Cluster, _ workflow.Result) { | ||
| atlasCluster, resp, err := ctx.Client.Clusters.Get(context.Background(), project.Status.ID, cluster.Spec.Name) |
Contributor
Author
There was a problem hiding this comment.
did some renamings of variables as it was a bit hard to follow which cluster is from Atlas and which - from the Operator later when we did merging magic
| func mergedCluster(cluster mongodbatlas.Cluster, spec mdbv1.AtlasClusterSpec) (result mongodbatlas.Cluster, err error) { | ||
| if err = compat.JSONCopy(&result, cluster); err != nil { | ||
| // MergedCluster will return the result of merging AtlasClusterSpec with Atlas Cluster | ||
| func MergedCluster(atlasCluster mongodbatlas.Cluster, spec mdbv1.AtlasClusterSpec) (result mongodbatlas.Cluster, err error) { |
Contributor
Author
There was a problem hiding this comment.
made public to use inside integration tests
| Expect(err).ToNot(HaveOccurred()) | ||
|
|
||
| createdAtlasCluster, err := createdCluster.Spec.Cluster() | ||
| mergedCluster, err := atlascluster.MergedCluster(*atlasCluster, createdCluster.Spec) |
Contributor
Author
There was a problem hiding this comment.
using the MergedCluster to compare clusters in total.
This could be error-prone in case if MergedCluster has bugs in it - that's why the unit tests above were extended
vasilevp
approved these changes
Mar 29, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR focuses on more complicated testing of the clusters. Due to the size only the creation is happening - the update will be addressed in the next PR (found some issues there).
The changes were reviewed and agreed on with Pavel p2p.
providerSettings.regionNametogether withreplicationSpecs. In this case Atlas accepts the update request but erazes the former field so the infinite reconciliation happens asClustersEqualmethod constantly returns false.MergedClusterandClustersEqualwork correctly