c8382f1654
Using basic types as values in the `ImageConfig` structure makes it impossible to distinguish if the empty value for the type was set intentionally or if it is just the value the variable was initialized to. This is very bad especially for `bool` type. While working on unifying `vhd` and `azure-rhui` image types I found out, that some newly added variables in the `ImageConfig` structure were forgotten in the `InheritFrom()` method. This makes it impossible to inherit their values from a parent configuration. This is however required for the unification of `vhd` and `azure-rhui` image types. As described above, it would be impossible to decide whether a `bool` value should be inherited from the parent configuration or not. The only solution is to use a pointer to the type. For consistency, use pointer for all basic types. Adjust distro implementations accordingly.
217 lines
6.5 KiB
Go
217 lines
6.5 KiB
Go
package distro
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/common"
|
|
"github.com/osbuild/osbuild-composer/internal/osbuild"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestImageConfigInheritFrom(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
distroConfig *ImageConfig
|
|
imageConfig *ImageConfig
|
|
expectedConfig *ImageConfig
|
|
}{
|
|
{
|
|
name: "inheritance with overridden values",
|
|
distroConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("America/New_York"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Timeservers: []string{"127.0.0.1"},
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
Sysconfig: []*osbuild.SysconfigStageOptions{
|
|
{
|
|
Kernel: &osbuild.SysconfigKernelOptions{
|
|
UpdateDefault: true,
|
|
DefaultKernel: "kernel",
|
|
},
|
|
Network: &osbuild.SysconfigNetworkOptions{
|
|
Networking: true,
|
|
NoZeroConf: true,
|
|
},
|
|
NetworkScripts: &osbuild.NetworkScriptsOptions{
|
|
IfcfgFiles: map[string]osbuild.IfcfgFile{
|
|
"eth0": {
|
|
Device: "eth0",
|
|
Bootproto: osbuild.IfcfgBootprotoDHCP,
|
|
OnBoot: common.BoolToPtr(true),
|
|
Type: osbuild.IfcfgTypeEthernet,
|
|
UserCtl: common.BoolToPtr(true),
|
|
PeerDNS: common.BoolToPtr(true),
|
|
IPv6Init: common.BoolToPtr(false),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
imageConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("UTC"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Servers: []osbuild.ChronyConfigServer{
|
|
{
|
|
Hostname: "169.254.169.123",
|
|
Prefer: common.BoolToPtr(true),
|
|
Iburst: common.BoolToPtr(true),
|
|
Minpoll: common.IntToPtr(4),
|
|
Maxpoll: common.IntToPtr(4),
|
|
},
|
|
},
|
|
LeapsecTz: common.StringToPtr(""),
|
|
},
|
|
},
|
|
expectedConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("UTC"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Servers: []osbuild.ChronyConfigServer{
|
|
{
|
|
Hostname: "169.254.169.123",
|
|
Prefer: common.BoolToPtr(true),
|
|
Iburst: common.BoolToPtr(true),
|
|
Minpoll: common.IntToPtr(4),
|
|
Maxpoll: common.IntToPtr(4),
|
|
},
|
|
},
|
|
LeapsecTz: common.StringToPtr(""),
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
Sysconfig: []*osbuild.SysconfigStageOptions{
|
|
{
|
|
Kernel: &osbuild.SysconfigKernelOptions{
|
|
UpdateDefault: true,
|
|
DefaultKernel: "kernel",
|
|
},
|
|
Network: &osbuild.SysconfigNetworkOptions{
|
|
Networking: true,
|
|
NoZeroConf: true,
|
|
},
|
|
NetworkScripts: &osbuild.NetworkScriptsOptions{
|
|
IfcfgFiles: map[string]osbuild.IfcfgFile{
|
|
"eth0": {
|
|
Device: "eth0",
|
|
Bootproto: osbuild.IfcfgBootprotoDHCP,
|
|
OnBoot: common.BoolToPtr(true),
|
|
Type: osbuild.IfcfgTypeEthernet,
|
|
UserCtl: common.BoolToPtr(true),
|
|
PeerDNS: common.BoolToPtr(true),
|
|
IPv6Init: common.BoolToPtr(false),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "empty image type configuration",
|
|
distroConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("America/New_York"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Timeservers: []string{"127.0.0.1"},
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
},
|
|
imageConfig: &ImageConfig{},
|
|
expectedConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("America/New_York"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Timeservers: []string{"127.0.0.1"},
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
},
|
|
},
|
|
{
|
|
name: "empty distro configuration",
|
|
distroConfig: &ImageConfig{},
|
|
imageConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("America/New_York"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Timeservers: []string{"127.0.0.1"},
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
},
|
|
expectedConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("America/New_York"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Timeservers: []string{"127.0.0.1"},
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
},
|
|
},
|
|
{
|
|
name: "empty distro configuration",
|
|
distroConfig: nil,
|
|
imageConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("America/New_York"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Timeservers: []string{"127.0.0.1"},
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
},
|
|
expectedConfig: &ImageConfig{
|
|
Timezone: common.StringToPtr("America/New_York"),
|
|
TimeSynchronization: &osbuild.ChronyStageOptions{
|
|
Timeservers: []string{"127.0.0.1"},
|
|
},
|
|
Locale: common.StringToPtr("en_US.UTF-8"),
|
|
Keyboard: &osbuild.KeymapStageOptions{
|
|
Keymap: "us",
|
|
},
|
|
EnabledServices: []string{"sshd"},
|
|
DisabledServices: []string{"named"},
|
|
DefaultTarget: common.StringToPtr("multi-user.target"),
|
|
},
|
|
},
|
|
}
|
|
for idx, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assert.Equalf(t, tt.expectedConfig, tt.imageConfig.InheritFrom(tt.distroConfig), "test case %q failed (idx %d)", tt.name, idx)
|
|
})
|
|
}
|
|
}
|