Updates based on PR feedback

suse-edge · Nov 17, 2023 · 4b67e1b · 4b67e1b
1 parent 1adc164
commit 4b67e1b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/pkg/build/testdata/minimal-test-definition.yaml b/pkg/build/testdata/minimal-test-definition.yaml
diff --git a/pkg/build/testdata/users-test-definition.yaml b/pkg/build/testdata/users-test-definition.yaml
diff --git a/pkg/build/users_test.go b/pkg/build/users_test.go
@@ -13,10 +13,30 @@ import (
 
 func TestConfigureUsers(t *testing.T) {
 	// Setup
-	configData, err := os.ReadFile("./testdata/users-test-definition.yaml")
-	require.NoError(t, err)
-	imageConfig, err := config.Parse(configData)
-	require.NoError(t, err)
+	imageConfig := &config.ImageConfig{
+		OperatingSystem: config.OperatingSystem{
+			Users: []config.OperatingSystemUser{
+				{
+					Username: "alpha",
+					Password: "alpha123",
+					SSHKey:   "alphakey",
+				},
+				{
+					Username: "beta",
+					Password: "beta123",
+				},
+				{
+					Username: "gamma",
+					SSHKey:   "gammakey",
+				},
+				{
+					Username: "root",
+					Password: "root123",
+					SSHKey:   "rootkey",
+				},
+			},
+		},
+	}
 
 	context, err := NewContext("", "", true)
 	require.NoError(t, err)
@@ -76,19 +96,14 @@ func TestConfigureUsers(t *testing.T) {
 
 func TestConfigureUsers_NoUsers(t *testing.T) {
 	// Setup
-	configData, err := os.ReadFile("./testdata/minimal-test-definition.yaml")
-	require.NoError(t, err)
-	imageConfig, err := config.Parse(configData)
-	require.NoError(t, err)
-
 	context, err := NewContext("", "", true)
 	require.NoError(t, err)
 	defer func() {
 		assert.NoError(t, CleanUpBuildDir(context))
 	}()
 
 	builder := &Builder{
-		imageConfig: imageConfig,
+		imageConfig: &config.ImageConfig{},
 		context:     context,
 	}
 

diff --git a/pkg/config/image_test.go b/pkg/config/image_test.go
@@ -31,7 +31,7 @@ func TestParse(t *testing.T) {
 	assert.Equal(t, expectedKernelArgs, imageConfig.OperatingSystem.KernelArgs)
 
 	userConfigs := imageConfig.OperatingSystem.Users
-	assert.Len(t, userConfigs, 3)
+	require.Len(t, userConfigs, 3)
 	assert.Equal(t, "alpha", userConfigs[0].Username)
 	assert.Equal(t, "$6$bZfTI3Wj05fdxQcB$W1HJQTKw/MaGTCwK75ic9putEquJvYO7vMnDBVAfuAMFW58/79abky4mx9.8znK0UZwSKng9dVosnYQR1toH71", userConfigs[0].Password)
 	assert.Contains(t, userConfigs[0].SSHKey, "ssh-rsa AAAAB3")