Merge pull request #75 from crossplane-contrib/duologic/panic_without…

…_desired_resourceoptions test(mysql/user): fail with panic, resourceOptions are optional
crossplane-contrib · Mar 21, 2022 · 77cd294 · 77cd294
2 parents fb38f43 + 90cd56d
commit 77cd294
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 35 deletions.
diff --git a/pkg/controller/mysql/user/reconciler.go b/pkg/controller/mysql/user/reconciler.go
@@ -368,9 +368,11 @@ func (c *external) Delete(ctx context.Context, mg resource.Managed) error {
 }
 
 func upToDate(observed *v1alpha1.UserParameters, desired *v1alpha1.UserParameters) bool {
+	if desired.ResourceOptions == nil {
+		// Return true if there are no desired ResourceOptions
+		return true
+	}
 	if observed.ResourceOptions.MaxQueriesPerHour != desired.ResourceOptions.MaxQueriesPerHour {
-		fmt.Printf("%#v\n", observed.ResourceOptions.MaxQueriesPerHour)
-		fmt.Printf("%#v\n", desired.ResourceOptions.MaxQueriesPerHour)
 		return false
 	}
 	if observed.ResourceOptions.MaxUpdatesPerHour != desired.ResourceOptions.MaxUpdatesPerHour {

diff --git a/pkg/controller/mysql/user/reconciler_test.go b/pkg/controller/mysql/user/reconciler_test.go
@@ -226,14 +226,7 @@ func TestObserve(t *testing.T) {
 			args: args{
 				mg: &v1alpha1.User{
 					Spec: v1alpha1.UserSpec{
-						ForProvider: v1alpha1.UserParameters{
-							ResourceOptions: &v1alpha1.ResourceOptions{
-								MaxQueriesPerHour:     new(int),
-								MaxUpdatesPerHour:     new(int),
-								MaxConnectionsPerHour: new(int),
-								MaxUserConnections:    new(int),
-							},
-						},
+						ForProvider: v1alpha1.UserParameters{},
 					},
 				},
 			},
@@ -265,9 +258,7 @@ func TestObserve(t *testing.T) {
 			args: args{
 				mg: &v1alpha1.User{
 					Spec: v1alpha1.UserSpec{
-						ForProvider: v1alpha1.UserParameters{
-							ResourceOptions: &v1alpha1.ResourceOptions{},
-						},
+						ForProvider: v1alpha1.UserParameters{},
 					},
 				},
 			},
@@ -306,12 +297,6 @@ func TestObserve(t *testing.T) {
 								},
 								Key: "password",
 							},
-							ResourceOptions: &v1alpha1.ResourceOptions{
-								MaxQueriesPerHour:     new(int),
-								MaxUpdatesPerHour:     new(int),
-								MaxConnectionsPerHour: new(int),
-								MaxUserConnections:    new(int),
-							},
 						},
 						ResourceSpec: xpv1.ResourceSpec{
 							WriteConnectionSecretToReference: &xpv1.SecretReference{
@@ -411,14 +396,7 @@ func TestCreate(t *testing.T) {
 						},
 					},
 					Spec: v1alpha1.UserSpec{
-						ForProvider: v1alpha1.UserParameters{
-							ResourceOptions: &v1alpha1.ResourceOptions{
-								MaxQueriesPerHour:     new(int),
-								MaxUpdatesPerHour:     new(int),
-								MaxConnectionsPerHour: new(int),
-								MaxUserConnections:    new(int),
-							},
-						},
+						ForProvider: v1alpha1.UserParameters{},
 					},
 				},
 			},
@@ -860,14 +838,7 @@ func TestDelete(t *testing.T) {
 			args: args{
 				mg: &v1alpha1.User{
 					Spec: v1alpha1.UserSpec{
-						ForProvider: v1alpha1.UserParameters{
-							ResourceOptions: &v1alpha1.ResourceOptions{
-								MaxQueriesPerHour:     new(int),
-								MaxUpdatesPerHour:     new(int),
-								MaxConnectionsPerHour: new(int),
-								MaxUserConnections:    new(int),
-							},
-						},
+						ForProvider: v1alpha1.UserParameters{},
 					},
 				},
 			},