move NewNBContractConfiguration to nbcontracthelper package

pkg/nbcontracthelper/helper.go

@@ -1,9 +1,41 @@
 package nbcontracthelper
 
-const (
-	defaultLinuxUser = "azureuser"
+import (
+	nbcontractv1 "github.com/Azure/agentbaker/pkg/proto/nbcontract/v1"
 )
 
-func GetDefaultLinuxAdminUsername() string {
-	return defaultLinuxUser
+// Check and initialize each field if it is nil
+func initializeIfNil[T any](field **T) {
+	if *field == nil {
+		*field = new(T)
+	}
+}
+
+// EnsureConfigsNonNil checks if the config is nil and initializes it if it is.
+func ensureConfigsNonNil(v *nbcontractv1.Configuration) *nbcontractv1.Configuration {
+	if v == nil {
+		v = &nbcontractv1.Configuration{}
+	}
+
+	initializeIfNil(&v.KubeBinaryConfig)
+	initializeIfNil(&v.ApiServerConfig)
+	initializeIfNil(&v.AuthConfig)
+	initializeIfNil(&v.ClusterConfig)
+	initializeIfNil(&v.NetworkConfig)
+	initializeIfNil(&v.GpuConfig)
+	initializeIfNil(&v.TlsBootstrappingConfig)
+	initializeIfNil(&v.KubeletConfig)
+	initializeIfNil(&v.RuncConfig)
+	initializeIfNil(&v.ContainerdConfig)
+	initializeIfNil(&v.TeleportConfig)
+	initializeIfNil(&v.CustomLinuxOsConfig)
+	initializeIfNil(&v.HttpProxyConfig)
+	initializeIfNil(&v.CustomCloudConfig)
+	initializeIfNil(&v.CustomSearchDomainConfig)
+
+	return v
+}
+
+func NewNBContractConfiguration(v *nbcontractv1.Configuration) *nbcontractv1.Configuration {
+	return ensureConfigsNonNil(v)
 }

pkg/parser/utilities_test.go → pkg/nbcontracthelper/helper_test.go

@@ -1,4 +1,4 @@
-package parser
+package nbcontracthelper
 
 import (
 	"reflect"
@@ -7,7 +7,7 @@ import (
 	nbcontractv1 "github.com/Azure/agentbaker/pkg/proto/nbcontract/v1"
 )
 
-func Test_ensureConfigsNonNil(t *testing.T) {
+func TestNewNBContractConfiguration(t *testing.T) {
 	type args struct {
 		v *nbcontractv1.Configuration
 	}
@@ -82,8 +82,8 @@ func Test_ensureConfigsNonNil(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := ensureConfigsNonNil(tt.args.v); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ensureConfigsNonNil() = %v, want %v", got, tt.want)
+			if got := NewNBContractConfiguration(tt.args.v); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("NewNBContractConfiguration() = %v, want %v", got, tt.want)
 			}
 		})
 	}

pkg/parser/utilities.go

@@ -24,39 +24,3 @@ func getBaseTemplate() *nbcontractv1.Configuration {
 func getFuncMap() template.FuncMap {
 	return template.FuncMap{}
 }
-
-// Check and initialize each field if it is nil
-func initializeIfNil[T any](field **T) {
-	if *field == nil {
-		*field = new(T)
-	}
-}
-
-// EnsureConfigsNonNil checks if the config is nil and initializes it if it is.
-func ensureConfigsNonNil(v *nbcontractv1.Configuration) *nbcontractv1.Configuration {
-	if v == nil {
-		v = &nbcontractv1.Configuration{}
-	}
-
-	initializeIfNil(&v.KubeBinaryConfig)
-	initializeIfNil(&v.ApiServerConfig)
-	initializeIfNil(&v.AuthConfig)
-	initializeIfNil(&v.ClusterConfig)
-	initializeIfNil(&v.NetworkConfig)
-	initializeIfNil(&v.GpuConfig)
-	initializeIfNil(&v.TlsBootstrappingConfig)
-	initializeIfNil(&v.KubeletConfig)
-	initializeIfNil(&v.RuncConfig)
-	initializeIfNil(&v.ContainerdConfig)
-	initializeIfNil(&v.TeleportConfig)
-	initializeIfNil(&v.CustomLinuxOsConfig)
-	initializeIfNil(&v.HttpProxyConfig)
-	initializeIfNil(&v.CustomCloudConfig)
-	initializeIfNil(&v.CustomSearchDomainConfig)
-
-	return v
-}
-
-func NewNBContractConfiguration(v *nbcontractv1.Configuration) *nbcontractv1.Configuration {
-	return ensureConfigsNonNil(v)
-}