remove own ptr-func from test

metal-stack · Dec 13, 2024 · 10b3e27 · 10b3e27
1 parent 6197406
commit 10b3e27
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/pkg/apis/csidriverlvm/v1alpha1/types_test.go b/pkg/apis/csidriverlvm/v1alpha1/types_test.go
@@ -5,14 +5,11 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/stretchr/testify/assert"
+	"k8s.io/utils/ptr"
 )
 
 var log = logr.New(logr.Discard().GetSink())
 
-func stringPtr(s string) *string {
-	return &s
-}
-
 func TestConfig(t *testing.T) {
 
 	tt := []struct {
@@ -32,71 +29,71 @@ func TestConfig(t *testing.T) {
 			desc: "test devicePattern nil config",
 			customData: &CsiDriverLvmConfig{
 				DevicePattern: nil,
-				HostWritePath: stringPtr("/etc/lvm"),
+				HostWritePath: ptr.To("/etc/lvm"),
 			},
 			valid: false,
 		},
 		{
 			desc: "test hostWritePath nil config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr("/dev/loop100"),
+				DevicePattern: ptr.To("/dev/loop100"),
 				HostWritePath: nil,
 			},
 			valid: false,
 		},
 		{
 			desc: "test empty config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr(""),
-				HostWritePath: stringPtr(""),
+				DevicePattern: ptr.To(""),
+				HostWritePath: ptr.To(""),
 			},
 			valid: false,
 		},
 		{
 			desc: "test empty devicePattern config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr(""),
-				HostWritePath: stringPtr("/etc/lvm"),
+				DevicePattern: ptr.To(""),
+				HostWritePath: ptr.To("/etc/lvm"),
 			},
 			valid: false,
 		},
 		{
 			desc: "test empty hostWritePath config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr("/dev/loop1"),
-				HostWritePath: stringPtr(""),
+				DevicePattern: ptr.To("/dev/loop1"),
+				HostWritePath: ptr.To(""),
 			},
 			valid: false,
 		},
 		{
 			desc: "test invalid devicePattern config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr("[a-"),
-				HostWritePath: stringPtr("/etc/lvm"),
+				DevicePattern: ptr.To("[a-"),
+				HostWritePath: ptr.To("/etc/lvm"),
 			},
 			valid: false,
 		},
 		{
 			desc: "test not absolute hostWritePath config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr("[a-z]"),
-				HostWritePath: stringPtr("./etc/lvm"),
+				DevicePattern: ptr.To("[a-z]"),
+				HostWritePath: ptr.To("./etc/lvm"),
 			},
 			valid: false,
 		},
 		{
 			desc: "test not absolute hostWritePath config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr("[a-z]"),
-				HostWritePath: stringPtr("etc/lvm"),
+				DevicePattern: ptr.To("[a-z]"),
+				HostWritePath: ptr.To("etc/lvm"),
 			},
 			valid: false,
 		},
 		{
 			desc: "test valid config",
 			customData: &CsiDriverLvmConfig{
-				DevicePattern: stringPtr("/dev/loop10[0,1]"),
-				HostWritePath: stringPtr("/etc/lvm"),
+				DevicePattern: ptr.To("/dev/loop10[0,1]"),
+				HostWritePath: ptr.To("/etc/lvm"),
 			},
 			valid: true,
 		},