Skip to content

Commit

Permalink
Merge pull request #45 from cobbler/fix/map-slice-inherit
Browse files Browse the repository at this point in the history 
Fix map/slice inherit
  • Loading branch information
@SchoolGuy
SchoolGuy authored Oct 16, 2024
2 parents 733cd2a + 3f386d5 commit 2bd3fd6
Show file tree
Hide file tree
Showing 9 changed files with 150 additions and 52 deletions.
5 changes: 4 additions & 1 deletion GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ default: build
build: fmtcheck
go install

release-test:
goreleaser release --snapshot --clean

test: fmtcheck
go test -i $(TEST) || exit 1
echo $(TEST) | \
Expand Down Expand Up @@ -63,5 +66,5 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
endif
@$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)

.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website website-test
.PHONY: build release-test test testacc vet fmt fmtcheck errcheck test-compile website website-test

20 changes: 8 additions & 12 deletions cobbler/resource_cobbler_distro.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,18 @@ func resourceDistro() *schema.Resource {
Description: "The architecture of the distro. Valid options are: i386, x86_64, ia64, ppc, ppc64, s390, arm.",
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Computed: true,
},
"breed": {
Description: "The \"breed\" of distribution. Valid options are: redhat, fedora, centos, scientific linux, suse, debian, and ubuntu. These choices may vary depending on the version of Cobbler in use.",
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"boot_files": {
Description: "Files copied into tftpboot beyond the kernel/initrd.",
Type: schema.TypeMap,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
ForceNew: true,
Computed: true,
ConflictsWith: []string{"boot_files_inherit"},
},
Expand All @@ -52,7 +49,6 @@ func resourceDistro() *schema.Resource {
Type: schema.TypeList,
Elem: &schema.Schema{Type: schema.TypeString},
Optional: true,
ForceNew: true,
Computed: true,
},
"boot_loaders_inherit": {
Expand Down Expand Up @@ -345,40 +341,40 @@ func buildDistro(d *schema.ResourceData, meta interface{}) (cobbler.Distro, erro
distro.Breed = d.Get("breed").(string)
distro.BootFiles = cobbler.Value[map[string]interface{}]{
Data: bootFiles,
IsInherited: d.Get("boot_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "boot_files"),
}
distro.BootLoaders = cobbler.Value[[]string]{
Data: bootLoaders,
IsInherited: d.Get("boot_loaders_inherit").(bool),
IsInherited: IsOptionInherited(d, "boot_loaders"),
}
distro.Comment = d.Get("comment").(string)
distro.FetchableFiles = cobbler.Value[map[string]interface{}]{
Data: fetchableFiles,
IsInherited: d.Get("fetchable_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "fetchable_files"),
}
distro.Kernel = d.Get("kernel").(string)
distro.KernelOptions = cobbler.Value[map[string]interface{}]{
Data: kernelOptions,
IsInherited: d.Get("kernel_options_inherit").(bool),
IsInherited: IsOptionInherited(d, "kernel_options"),
}
distro.KernelOptionsPost = cobbler.Value[map[string]interface{}]{
Data: kernelOptionsPost,
IsInherited: d.Get("kernel_options_post_inherit").(bool),
IsInherited: IsOptionInherited(d, "kernel_options_post"),
}
distro.Initrd = d.Get("initrd").(string)
distro.MgmtClasses = cobbler.Value[[]string]{
Data: mgmtClasses,
IsInherited: d.Get("mgmt_classes_inherit").(bool),
IsInherited: IsOptionInherited(d, "mgmt_classes"),
}
distro.Name = d.Get("name").(string)
distro.OSVersion = d.Get("os_version").(string)
distro.Owners = cobbler.Value[[]string]{
Data: owners,
IsInherited: d.Get("owners_inherit").(bool),
IsInherited: IsOptionInherited(d, "owners"),
}
distro.TemplateFiles = cobbler.Value[map[string]interface{}]{
Data: templateFiles,
IsInherited: d.Get("template_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "template_files"),
}

return distro, nil
Expand Down
35 changes: 35 additions & 0 deletions cobbler/resource_cobbler_distro_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,30 @@ func TestAccCobblerDistro_basic_inherit(t *testing.T) {
})
}

func TestAccCobblerDistro_basic_inheritConcrete(t *testing.T) {
var distro cobbler.Distro

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccCobblerPreCheck(t) },
ProviderFactories: testAccProviderFactories,
CheckDestroy: testAccCobblerCheckDistroDestroy,
Steps: []resource.TestStep{
{
Config: testAccCobblerDistroBasicInherit,
Check: resource.ComposeTestCheckFunc(
testAccCobblerCheckDistroExists("cobbler_distro.foo", &distro),
),
},
{
Config: testAccCobblerDistroBasicInheritConcrete,
Check: resource.ComposeTestCheckFunc(
testAccCobblerCheckDistroExists("cobbler_distro.foo", &distro),
),
},
},
})
}

func TestAccCobblerDistro_change(t *testing.T) {
var distro cobbler.Distro

Expand Down Expand Up @@ -125,6 +149,17 @@ var testAccCobblerDistroBasicInherit = `
boot_loaders_inherit = true
}`

var testAccCobblerDistroBasicInheritConcrete = `
resource "cobbler_distro" "foo" {
name = "foo"
breed = "ubuntu"
os_version = "focal"
arch = "x86_64"
kernel = "/srv/www/cobbler/distro_mirror/Ubuntu-20.04/install/vmlinuz"
initrd = "/srv/www/cobbler/distro_mirror/Ubuntu-20.04/install/initrd.gz"
boot_loaders = ["ipxe"]
}`

var testAccCobblerDistroChange1 = `
resource "cobbler_distro" "foo" {
name = "foo"
Expand Down
33 changes: 17 additions & 16 deletions cobbler/resource_cobbler_profile.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func resourceProfile() *schema.Resource {
Description: "DHCP tag.",
Type: schema.TypeString,
Optional: true,
Computed: true,
},
"distro": {
Description: "Parent distribution.",
Expand Down Expand Up @@ -579,80 +580,80 @@ func buildProfile(d *schema.ResourceData, meta interface{}) (cobbler.Profile, er
profile.Autoinstall = d.Get("autoinstall").(string)
profile.AutoinstallMeta = cobbler.Value[map[string]interface{}]{
Data: autoinstallMeta,
IsInherited: false,
IsInherited: IsOptionInherited(d, "autoinstall_meta"),
}
profile.BootFiles = cobbler.Value[map[string]interface{}]{
Data: bootFiles,
IsInherited: d.Get("boot_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "boot_files"),
}
profile.Comment = d.Get("comment").(string)
profile.DHCPTag = d.Get("dhcp_tag").(string)
profile.Distro = d.Get("distro").(string)
profile.EnableIPXE = cobbler.Value[bool]{
Data: d.Get("enable_ipxe").(bool),
IsInherited: d.Get("enable_ipxe_inherit").(bool),
IsInherited: IsOptionInherited(d, "enable_ipxe"),
}
profile.EnableMenu = cobbler.Value[bool]{
Data: d.Get("enable_menu").(bool),
IsInherited: d.Get("enable_menu_inherit").(bool),
IsInherited: IsOptionInherited(d, "enable_menu"),
}
profile.FetchableFiles = cobbler.Value[map[string]interface{}]{
Data: fetchableFiles,
IsInherited: d.Get("fetchable_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "fetchable_files"),
}
profile.KernelOptions = cobbler.Value[map[string]interface{}]{
Data: kernelOptions,
IsInherited: d.Get("kernel_options_inherit").(bool),
IsInherited: IsOptionInherited(d, "kernel_options"),
}
profile.KernelOptionsPost = cobbler.Value[map[string]interface{}]{
Data: kernelOptionsPost,
IsInherited: d.Get("kernel_options_post_inherit").(bool),
IsInherited: IsOptionInherited(d, "kernel_options_post"),
}
profile.MgmtClasses = cobbler.Value[[]string]{
Data: mgmtClasses,
IsInherited: d.Get("mgmt_classes_inherit").(bool),
IsInherited: IsOptionInherited(d, "mgmt_classes"),
}
profile.MgmtParameters = cobbler.Value[map[string]interface{}]{
Data: mgmtParameters,
IsInherited: d.Get("mgmt_parameters_inherit").(bool),
IsInherited: IsOptionInherited(d, "mgmt_parameters"),
}
profile.Name = d.Get("name").(string)
profile.NameServersSearch = cobbler.Value[[]string]{
Data: nameServersSearch,
IsInherited: d.Get("name_servers_search_inherit").(bool),
IsInherited: IsOptionInherited(d, "name_servers_search"),
}
profile.NameServers = cobbler.Value[[]string]{
Data: nameServers,
IsInherited: d.Get("name_servers_inherit").(bool),
IsInherited: IsOptionInherited(d, "name_servers"),
}
profile.NextServerv4 = d.Get("next_server_v4").(string)
profile.NextServerv6 = d.Get("next_server_v6").(string)
profile.Owners = cobbler.Value[[]string]{
Data: owners,
IsInherited: d.Get("owners_inherit").(bool),
IsInherited: IsOptionInherited(d, "owners"),
}
profile.Proxy = d.Get("proxy").(string)
profile.Repos = repos
profile.Server = d.Get("server").(string)
profile.TemplateFiles = cobbler.Value[map[string]interface{}]{
Data: templateFiles,
IsInherited: d.Get("template_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "template_files"),
}
profile.VirtAutoBoot = cobbler.Value[bool]{
Data: d.Get("virt_auto_boot").(bool),
IsInherited: d.Get("virt_auto_boot_inherit").(bool),
IsInherited: IsOptionInherited(d, "virt_auto_boot"),
}
profile.VirtBridge = d.Get("virt_bridge").(string)
profile.VirtCPUs = d.Get("virt_cpus").(int)
profile.VirtDiskDriver = d.Get("virt_disk_driver").(string)
profile.VirtFileSize = cobbler.Value[float64]{
Data: d.Get("virt_file_size").(float64),
IsInherited: d.Get("virt_file_size_inherit").(bool),
IsInherited: IsOptionInherited(d, "virt_file_size"),
}
profile.VirtPath = d.Get("virt_path").(string)
profile.VirtRAM = cobbler.Value[int]{
Data: d.Get("virt_ram").(int),
IsInherited: d.Get("virt_ram_inherit").(bool),
IsInherited: IsOptionInherited(d, "virt_ram"),
}
profile.VirtType = d.Get("virt_type").(string)

Expand Down
8 changes: 3 additions & 5 deletions cobbler/resource_cobbler_repo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,12 @@ func resourceRepo() *schema.Resource {
Description: "The architecture of the repo. Valid options are: i386, x86_64, ia64, ppc, ppc64, s390, arm.",
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Computed: true,
},
"breed": {
Description: "The \"breed\" of distribution. Valid options are: rsync, rhn, yum, apt, and wget. These choices may vary depending on the version of Cobbler in use.",
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"comment": {
Description: "Free form text description.",
Expand Down Expand Up @@ -291,19 +289,19 @@ func buildRepo(d *schema.ResourceData, meta interface{}) (cobbler.Repo, error) {
repo.Comment = d.Get("comment").(string)
repo.CreateRepoFlags = cobbler.Value[string]{
Data: d.Get("createrepo_flags").(string),
IsInherited: d.Get("createrepo_flags_inherit").(bool),
IsInherited: IsOptionInherited(d, "createrepo_flags"),
}
repo.KeepUpdated = d.Get("keep_updated").(bool)
repo.Mirror = d.Get("mirror").(string)
repo.MirrorLocally = d.Get("mirror_locally").(bool)
repo.Name = d.Get("name").(string)
repo.Owners = cobbler.Value[[]string]{
Data: owners,
IsInherited: d.Get("owners_inherit").(bool),
IsInherited: IsOptionInherited(d, "owners"),
}
repo.Proxy = cobbler.Value[string]{
Data: d.Get("proxy").(string),
IsInherited: d.Get("proxy_inherit").(bool),
IsInherited: IsOptionInherited(d, "proxy"),
}
repo.RpmList = rpmList

Expand Down
30 changes: 15 additions & 15 deletions cobbler/resource_cobbler_system.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -939,44 +939,44 @@ func buildSystem(d *schema.ResourceData) (cobbler.System, error) {
system.Autoinstall = d.Get("autoinstall").(string)
system.AutoinstallMeta = cobbler.Value[map[string]interface{}]{
Data: autoinstallMeta,
IsInherited: false,
IsInherited: IsOptionInherited(d, "autoinstall_meta"),
}
system.BootFiles = cobbler.Value[map[string]interface{}]{
Data: bootFiles,
IsInherited: d.Get("boot_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "boot_files"),
}
system.BootLoaders = cobbler.Value[[]string]{
Data: bootLoaders,
IsInherited: d.Get("boot_loaders_inherit").(bool),
IsInherited: IsOptionInherited(d, "boot_loaders"),
}
system.Comment = d.Get("comment").(string)
system.EnableIPXE = cobbler.Value[bool]{
Data: d.Get("enable_ipxe").(bool),
IsInherited: d.Get("enable_ipxe_inherit").(bool),
IsInherited: IsOptionInherited(d, "enable_ipxe"),
}
system.FetchableFiles = cobbler.Value[map[string]interface{}]{
Data: fetchableFiles,
IsInherited: d.Get("fetchable_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "fetchable_files"),
}
system.Gateway = d.Get("gateway").(string)
system.Hostname = d.Get("hostname").(string)
system.Image = d.Get("image").(string)
system.IPv6DefaultDevice = d.Get("ipv6_default_device").(string)
system.KernelOptions = cobbler.Value[map[string]interface{}]{
Data: kernelOptions,
IsInherited: d.Get("kernel_options_inherit").(bool),
IsInherited: IsOptionInherited(d, "kernel_options"),
}
system.KernelOptionsPost = cobbler.Value[map[string]interface{}]{
Data: kernelOptionsPost,
IsInherited: d.Get("kernel_options_post_inherit").(bool),
IsInherited: IsOptionInherited(d, "kernel_options_post"),
}
system.MgmtClasses = cobbler.Value[[]string]{
Data: mgmtClasses,
IsInherited: d.Get("mgmt_classes_inherit").(bool),
IsInherited: IsOptionInherited(d, "mgmt_classes"),
}
system.MgmtParameters = cobbler.Value[map[string]interface{}]{
Data: mgmtParameters,
IsInherited: d.Get("mgmt_parameters_inherit").(bool),
IsInherited: IsOptionInherited(d, "mgmt_parameters"),
}
system.Name = d.Get("name").(string)
system.NameServersSearch = nameServersSearch
Expand All @@ -986,7 +986,7 @@ func buildSystem(d *schema.ResourceData) (cobbler.System, error) {
system.NextServerv6 = d.Get("next_server_v6").(string)
system.Owners = cobbler.Value[[]string]{
Data: owners,
IsInherited: d.Get("owners_inherit").(bool),
IsInherited: IsOptionInherited(d, "owners"),
}
system.PowerAddress = d.Get("power_address").(string)
system.PowerID = d.Get("power_id").(string)
Expand All @@ -998,26 +998,26 @@ func buildSystem(d *schema.ResourceData) (cobbler.System, error) {
system.Status = d.Get("status").(string)
system.TemplateFiles = cobbler.Value[map[string]interface{}]{
Data: templateFiles,
IsInherited: d.Get("template_files_inherit").(bool),
IsInherited: IsOptionInherited(d, "template_files"),
}
system.VirtAutoBoot = cobbler.Value[bool]{
Data: d.Get("virt_auto_boot").(bool),
IsInherited: d.Get("virt_auto_boot_inherit").(bool),
IsInherited: IsOptionInherited(d, "virt_auto_boot"),
}
system.VirtFileSize = cobbler.Value[float64]{
Data: d.Get("virt_file_size").(float64),
IsInherited: d.Get("virt_file_size_inherit").(bool),
IsInherited: IsOptionInherited(d, "virt_file_size"),
}
system.VirtCPUs = cobbler.Value[int]{
Data: d.Get("virt_cpus").(int),
IsInherited: d.Get("virt_cpus_inherit").(bool),
IsInherited: IsOptionInherited(d, "virt_cpus"),
}
system.VirtType = d.Get("virt_type").(string)
system.VirtPath = d.Get("virt_path").(string)
system.VirtPXEBoot = d.Get("virt_pxe_boot").(bool)
system.VirtRAM = cobbler.Value[int]{
Data: d.Get("virt_ram").(int),
IsInherited: d.Get("virt_ram_inherit").(bool),
IsInherited: IsOptionInherited(d, "virt_ram"),
}
system.VirtDiskDriver = d.Get("virt_disk_driver").(string)

Expand Down
Loading

0 comments on commit 2bd3fd6

Please sign in to comment.