5d760c48ad
The org.osbuild.chrony stage was extended to allow additional directives alongside time servers [1]. The old Timeservers string slice was kept for backwards compatibility. Removing support for it in osbuild-composer makes working with the stage's options simpler. Using the new struct slice Servers field and only specifying a Hostname for each element is equivalent to the old behaviour, so no functionality is lost. This simplifies the chrony stage since no validation is required anymore. It also simplifies the propagation of configuration options through the pipeline generation code which doesn't need to check for both types of stage options. [1] https://github.com/osbuild/osbuild/pull/692
217 lines
6.7 KiB
Go
217 lines
6.7 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{
|
|
Servers: []osbuild.ChronyConfigServer{{Hostname: "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{
|
|
Servers: []osbuild.ChronyConfigServer{{Hostname: "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{
|
|
Servers: []osbuild.ChronyConfigServer{{Hostname: "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{
|
|
Servers: []osbuild.ChronyConfigServer{{Hostname: "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{
|
|
Servers: []osbuild.ChronyConfigServer{{Hostname: "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{
|
|
Servers: []osbuild.ChronyConfigServer{{Hostname: "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{
|
|
Servers: []osbuild.ChronyConfigServer{{Hostname: "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)
|
|
})
|
|
}
|
|
}
|