public/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-proxmox.git synced 2024-07-03 08:02:39 +00:00
Code Issues Projects Releases Wiki Activity

cleanup indentation

Browse Source
This commit is contained in:
Andreas Gruhler 2019-07-06 11:10:51 +02:00
parent 8dd170e7ae
commit c61e47e9c7
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
proxmox/resource_lxc.go
View File

@ -24,7 +24,7 @@ func resourceLxc() *schema.Resource {
"arch": { "arch": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Default: "amd64", Default: "amd64",
}, },
"bwlimit": { "bwlimit": {
Type: schema.TypeInt, Type: schema.TypeInt,
@ -33,12 +33,12 @@ func resourceLxc() *schema.Resource {
"cmode": { "cmode": {
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Default: "tty", Default: "tty",
}, },
"console": { "console": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Default: true, Default: true,
}, },
"cores": { "cores": {
Type: schema.TypeInt, Type: schema.TypeInt,
@ -47,12 +47,12 @@ func resourceLxc() *schema.Resource {
"cpulimit": { "cpulimit": {
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
Default: 0, Default: 0,
}, },
"cpuunits": { "cpuunits": {
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
Default: 1024, Default: 1024,
}, },
"description": { "description": {
Type: schema.TypeString, Type: schema.TypeString,
@ -105,7 +105,7 @@ func resourceLxc() *schema.Resource {
"memory": { "memory": {
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
Default: 512, Default: 512,
}, },
"mountpoint": { "mountpoint": {
Type: schema.TypeSet, Type: schema.TypeSet,
@ -222,7 +222,7 @@ func resourceLxc() *schema.Resource {
"onboot": { "onboot": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Default: false, Default: false,
}, },
"ostype": { "ostype": {
Type: schema.TypeString, Type: schema.TypeString,
@ -239,7 +239,7 @@ func resourceLxc() *schema.Resource {
"protection": { "protection": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Default: false, Default: false,
}, },
"restore": { "restore": {
Type: schema.TypeBool, Type: schema.TypeBool,
@ -260,7 +260,7 @@ func resourceLxc() *schema.Resource {
"start": { "start": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Default: false, Default: false,
}, },
"startup": { "startup": {
Type: schema.TypeString, Type: schema.TypeString,
@ -274,7 +274,7 @@ func resourceLxc() *schema.Resource {
"swap": { "swap": {
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
Default: 512, Default: 512,
}, },
"template": { "template": {
Type: schema.TypeBool, Type: schema.TypeBool,
@ -283,7 +283,7 @@ func resourceLxc() *schema.Resource {
"tty": { "tty": {
Type: schema.TypeInt, Type: schema.TypeInt,
Optional: true, Optional: true,
Default: 2, Default: 2,
}, },
"unique": { "unique": {
Type: schema.TypeBool, Type: schema.TypeBool,
@ -292,14 +292,14 @@ func resourceLxc() *schema.Resource {
"unprivileged": { "unprivileged": {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
Default: false, Default: false,
}, },
"unused": { "unused": {
Type: schema.TypeList, Type: schema.TypeList,
Optional: true, Optional: true,
Elem: &schema.Schema{ Elem: &schema.Schema{
Type: schema.TypeString, Type: schema.TypeString,
}, },
}, },
"target_node": { "target_node": {
Type: schema.TypeString, Type: schema.TypeString,
@ -316,7 +316,7 @@ func resourceLxcCreate(d *schema.ResourceData, meta interface{}) error {
client := pconf.Client client := pconf.Client
vmName := d.Get("hostname").(string) vmName := d.Get("hostname").(string)
config := pxapi.NewConfigLxc() config := pxapi.NewConfigLxc()
config.Ostemplate = d.Get("ostemplate").(string) config.Ostemplate = d.Get("ostemplate").(string)
config.Arch = d.Get("arch").(string) config.Arch = d.Get("arch").(string)
config.BWLimit = d.Get("bwlimit").(int) config.BWLimit = d.Get("bwlimit").(int)
@ -326,33 +326,33 @@ func resourceLxcCreate(d *schema.ResourceData, meta interface{}) error {
config.CPULimit = d.Get("cpulimit").(int) config.CPULimit = d.Get("cpulimit").(int)
config.CPUUnits = d.Get("cpuunits").(int) config.CPUUnits = d.Get("cpuunits").(int)
config.Description = d.Get("description").(string) config.Description = d.Get("description").(string)
features := d.Get("features").(*schema.Set) features := d.Get("features").(*schema.Set)
featureSetList := features.List() featureSetList := features.List()
if len(featureSetList) > 0 { if len(featureSetList) > 0 {
// only apply the first feature set, // only apply the first feature set,
// because proxmox api only allows one feature set // because proxmox api only allows one feature set
config.Features = featureSetList[0].(map[string]interface{}) config.Features = featureSetList[0].(map[string]interface{})
} }
config.Force = d.Get("force").(bool) config.Force = d.Get("force").(bool)
config.Hookscript = d.Get("hookscript").(string) config.Hookscript = d.Get("hookscript").(string)
config.Hostname = vmName config.Hostname = vmName
config.IgnoreUnpackErrors = d.Get("ignore_unpack_errors").(bool) config.IgnoreUnpackErrors = d.Get("ignore_unpack_errors").(bool)
config.Lock = d.Get("lock").(string) config.Lock = d.Get("lock").(string)
config.Memory = d.Get("memory").(int) config.Memory = d.Get("memory").(int)
// proxmox api allows multiple mountpoint sets, // proxmox api allows multiple mountpoint sets,
// having a unique 'id' parameter foreach set // having a unique 'id' parameter foreach set
mountpoints := d.Get("mountpoint").(*schema.Set) mountpoints := d.Get("mountpoint").(*schema.Set)
lxcMountpoints := DevicesSetToMap(mountpoints) lxcMountpoints := DevicesSetToMap(mountpoints)
config.Mountpoints = lxcMountpoints config.Mountpoints = lxcMountpoints
config.Nameserver = d.Get("nameserver").(string) config.Nameserver = d.Get("nameserver").(string)
// proxmox api allows multiple network sets, // proxmox api allows multiple network sets,
// having a unique 'id' parameter foreach set // having a unique 'id' parameter foreach set
networks := d.Get("network").(*schema.Set) networks := d.Get("network").(*schema.Set)
lxcNetworks := DevicesSetToMap(networks) lxcNetworks := DevicesSetToMap(networks)
config.Networks = lxcNetworks config.Networks = lxcNetworks
config.OnBoot = d.Get("onboot").(bool) config.OnBoot = d.Get("onboot").(bool)
config.OsType = d.Get("ostype").(string) config.OsType = d.Get("ostype").(string)
config.Password = d.Get("password").(string) config.Password = d.Get("password").(string)
config.Pool = d.Get("pool").(string) config.Pool = d.Get("pool").(string)
config.Protection = d.Get("protection").(bool) config.Protection = d.Get("protection").(bool)
config.Restore = d.Get("restore").(bool) config.Restore = d.Get("restore").(bool)
@ -367,13 +367,13 @@ func resourceLxcCreate(d *schema.ResourceData, meta interface{}) error {
config.Tty = d.Get("tty").(int) config.Tty = d.Get("tty").(int)
config.Unique = d.Get("unique").(bool) config.Unique = d.Get("unique").(bool)
config.Unprivileged = d.Get("unprivileged").(bool) config.Unprivileged = d.Get("unprivileged").(bool)
// proxmox api allows to specify unused volumes // proxmox api allows to specify unused volumes
// even if it is recommended not to change them manually // even if it is recommended not to change them manually
unusedVolumes := d.Get("unused").([]interface{}) unusedVolumes := d.Get("unused").([]interface{})
var volumes []string var volumes []string
for _, v := range unusedVolumes { for _, v := range unusedVolumes {
volumes = append(volumes, v.(string)) volumes = append(volumes, v.(string))
} }
config.Unused = volumes config.Unused = volumes
targetNode := d.Get("target_node").(string) targetNode := d.Get("target_node").(string)
@ -393,7 +393,7 @@ func resourceLxcCreate(d *schema.ResourceData, meta interface{}) error {
return err return err
} }
// The existence of a non-blank ID is what tells Terraform that a resource was created // The existence of a non-blank ID is what tells Terraform that a resource was created
d.SetId(resourceId(targetNode, "lxc", vmr.VmId())) d.SetId(resourceId(targetNode, "lxc", vmr.VmId()))
return resourceLxcRead(d, meta) return resourceLxcRead(d, meta)
@ -416,7 +416,7 @@ func resourceLxcUpdate(d *schema.ResourceData, meta interface{}) error {
return err return err
} }
config := pxapi.NewConfigLxc() config := pxapi.NewConfigLxc()
config.Ostemplate = d.Get("ostemplate").(string) config.Ostemplate = d.Get("ostemplate").(string)
config.Arch = d.Get("arch").(string) config.Arch = d.Get("arch").(string)
config.BWLimit = d.Get("bwlimit").(int) config.BWLimit = d.Get("bwlimit").(int)
@ -426,33 +426,33 @@ func resourceLxcUpdate(d *schema.ResourceData, meta interface{}) error {
config.CPULimit = d.Get("cpulimit").(int) config.CPULimit = d.Get("cpulimit").(int)
config.CPUUnits = d.Get("cpuunits").(int) config.CPUUnits = d.Get("cpuunits").(int)
config.Description = d.Get("description").(string) config.Description = d.Get("description").(string)
features := d.Get("features").(*schema.Set) features := d.Get("features").(*schema.Set)
featureSetList := features.List() featureSetList := features.List()
if len(featureSetList) > 0 { if len(featureSetList) > 0 {
// only apply the first feature set, // only apply the first feature set,
// because proxmox api only allows one feature set // because proxmox api only allows one feature set
config.Features = featureSetList[0].(map[string]interface{}) config.Features = featureSetList[0].(map[string]interface{})
} }
config.Force = d.Get("force").(bool) config.Force = d.Get("force").(bool)
config.Hookscript = d.Get("hookscript").(string) config.Hookscript = d.Get("hookscript").(string)
config.Hostname = d.Get("hostname").(string) config.Hostname = d.Get("hostname").(string)
config.IgnoreUnpackErrors = d.Get("ignore_unpack_errors").(bool) config.IgnoreUnpackErrors = d.Get("ignore_unpack_errors").(bool)
config.Lock = d.Get("lock").(string) config.Lock = d.Get("lock").(string)
config.Memory = d.Get("memory").(int) config.Memory = d.Get("memory").(int)
// proxmox api allows multiple mountpoint sets, // proxmox api allows multiple mountpoint sets,
// having a unique 'id' parameter foreach set // having a unique 'id' parameter foreach set
mountpoints := d.Get("mountpoint").(*schema.Set) mountpoints := d.Get("mountpoint").(*schema.Set)
lxcMountpoints := DevicesSetToMap(mountpoints) lxcMountpoints := DevicesSetToMap(mountpoints)
config.Mountpoints = lxcMountpoints config.Mountpoints = lxcMountpoints
config.Nameserver = d.Get("nameserver").(string) config.Nameserver = d.Get("nameserver").(string)
// proxmox api allows multiple network sets, // proxmox api allows multiple network sets,
// having a unique 'id' parameter foreach set // having a unique 'id' parameter foreach set
networks := d.Get("network").(*schema.Set) networks := d.Get("network").(*schema.Set)
lxcNetworks := DevicesSetToMap(networks) lxcNetworks := DevicesSetToMap(networks)
config.Networks = lxcNetworks config.Networks = lxcNetworks
config.OnBoot = d.Get("onboot").(bool) config.OnBoot = d.Get("onboot").(bool)
config.OsType = d.Get("ostype").(string) config.OsType = d.Get("ostype").(string)
config.Password = d.Get("password").(string) config.Password = d.Get("password").(string)
config.Pool = d.Get("pool").(string) config.Pool = d.Get("pool").(string)
config.Protection = d.Get("protection").(bool) config.Protection = d.Get("protection").(bool)
config.Restore = d.Get("restore").(bool) config.Restore = d.Get("restore").(bool)
@ -467,13 +467,13 @@ func resourceLxcUpdate(d *schema.ResourceData, meta interface{}) error {
config.Tty = d.Get("tty").(int) config.Tty = d.Get("tty").(int)
config.Unique = d.Get("unique").(bool) config.Unique = d.Get("unique").(bool)
config.Unprivileged = d.Get("unprivileged").(bool) config.Unprivileged = d.Get("unprivileged").(bool)
// proxmox api allows to specify unused volumes // proxmox api allows to specify unused volumes
// even if it is recommended not to change them manually // even if it is recommended not to change them manually
unusedVolumes := d.Get("unused").([]interface{}) unusedVolumes := d.Get("unused").([]interface{})
var volumes []string var volumes []string
for _, v := range unusedVolumes { for _, v := range unusedVolumes {
volumes = append(volumes, v.(string)) volumes = append(volumes, v.(string))
} }
config.Unused = volumes config.Unused = volumes
err = config.UpdateConfig(vmr, client) err = config.UpdateConfig(vmr, client)
@ -519,7 +519,7 @@ func resourceLxcRead(d *schema.ResourceData, meta interface{}) error {
d.Set("description", config.Description) d.Set("description", config.Description)
defaultFeatures := d.Get("features").(*schema.Set) defaultFeatures := d.Get("features").(*schema.Set)
featuresWithDefaults := UpdateDeviceConfDefaults(config.Features, defaultFeatures) featuresWithDefaults := UpdateDeviceConfDefaults(config.Features, defaultFeatures)
d.Set("features", featuresWithDefaults) d.Set("features", featuresWithDefaults)
d.Set("force", config.Force) d.Set("force", config.Force)

2
proxmox/util.go
View File

@ -10,7 +10,7 @@ func UpdateDeviceConfDefaults(
activeDeviceConf pxapi.QemuDevice, activeDeviceConf pxapi.QemuDevice,
defaultDeviceConf *schema.Set, defaultDeviceConf *schema.Set,
) *schema.Set { ) *schema.Set {
defaultDeviceConfMap := defaultDeviceConf.List()[0].(map[string]interface{}) defaultDeviceConfMap := defaultDeviceConf.List()[0].(map[string]interface{})
for key, _ := range defaultDeviceConfMap { for key, _ := range defaultDeviceConfMap {
if deviceConfigValue, ok := activeDeviceConf[key]; ok { if deviceConfigValue, ok := activeDeviceConf[key]; ok {
defaultDeviceConfMap[key] = deviceConfigValue defaultDeviceConfMap[key] = deviceConfigValue