Change Sudo field from pointer to value

The zero value (empty string) is not valid, so the field does not need
to be a pointer.

Author: dlipovetsky

api/v1alpha1/clusterconfig_types.go

@@ -378,9 +378,10 @@ type User struct {
 	// +optional
 	SSHAuthorizedKeys []string `json:"sshAuthorizedKeys,omitempty"`
 
-	// Sudo specifies a sudo role for the user
+	// Sudo specifies a sudo role for the user.
+	// An empty string is not marshalled, because it is not a valid value.
 	// +optional
-	Sudo *string `json:"sudo,omitempty"`
+	Sudo string `json:"sudo,omitempty"`
 }
 
 func (User) VariableSchema() clusterv1.VariableSchema {

api/v1alpha1/zz_generated.deepcopy.go

@@ -120,7 +120,6 @@ func generateBootstrapUser(userFromVariable v1alpha1.User) bootstrapv1.User {
 	bootstrapUser := bootstrapv1.User{
 		Name:              userFromVariable.Name,
 		SSHAuthorizedKeys: userFromVariable.SSHAuthorizedKeys,
-		Sudo:              userFromVariable.Sudo,
 	}
 
 	// LockPassword is not part of our API, because we can derive its value
@@ -140,5 +139,9 @@ func generateBootstrapUser(userFromVariable v1alpha1.User) bootstrapv1.User {
 		bootstrapUser.Passwd = ptr.To(userFromVariable.HashedPassword)
 	}
 
+	if userFromVariable.Sudo != "" {
+		bootstrapUser.Sudo = ptr.To(userFromVariable.Sudo)
+	}
+
 	return bootstrapUser
 }

pkg/handlers/generic/mutation/users/inject.go

@@ -63,6 +63,47 @@ func Test_generateBootstrapUser(t *testing.T) {
 				LockPassword: ptr.To(true),
 			},
 		},
+		{
+			name: "if user sets sudo, include it in the patch",
+			args: args{
+				userFromVariable: v1alpha1.User{
+					Name: "example",
+					Sudo: "example",
+				},
+			},
+			want: bootstrapv1.User{
+				Name:         "example",
+				Sudo:         ptr.To("example"),
+				LockPassword: ptr.To(true),
+			},
+		},
+		{
+			name: "if user does not set sudo, do not include in the patch",
+			args: args{
+				userFromVariable: v1alpha1.User{
+					Name: "example",
+				},
+			},
+			want: bootstrapv1.User{
+				Name:         "example",
+				Sudo:         nil,
+				LockPassword: ptr.To(true),
+			},
+		},
+		{
+			name: "if user sets empty sudo, do not include in the patch",
+			args: args{
+				userFromVariable: v1alpha1.User{
+					Name: "example",
+					Sudo: "",
+				},
+			},
+			want: bootstrapv1.User{
+				Name:         "example",
+				Sudo:         nil,
+				LockPassword: ptr.To(true),
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/handlers/generic/mutation/users/inject_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/onsi/gomega"
 	"k8s.io/apiserver/pkg/storage/names"
-	"k8s.io/utils/ptr"
 	runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
 
 	"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
@@ -25,7 +24,7 @@ var (
 			"key1",
 			"key2",
 		},
-		Sudo: ptr.To("ALL=(ALL) NOPASSWD:ALL"),
+		Sudo: "ALL=(ALL) NOPASSWD:ALL",
 	}
 	testUser2 = v1alpha1.User{
 		Name: "onlyname",

pkg/handlers/generic/mutation/users/tests/generate_patches.go

@@ -32,7 +32,7 @@ func TestVariableValidation(t *testing.T) {
 							"key1",
 							"key2",
 						},
-						Sudo: ptr.To("ALL=(ALL) NOPASSWD:ALL"),
+						Sudo: "ALL=(ALL) NOPASSWD:ALL",
 					},
 					{
 						Name: "onlyname",