ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provider/azurerm: Change `azurerm_virtual_machine` to use MaxItems 

There were lots of hacky checks in the ARM VM resource to check for a
length of 1 param block

MaxItems was introduced so this PR updates to use MaxItems
This commit is contained in:
stack72 2016-06-13 13:25:32 +02:00
parent 3e8d5eed06
commit e57ee0a067
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builtin/providers/azurerm/resource_arm_virtual_machine.go
View File

@ -43,6 +43,7 @@ func resourceArmVirtualMachine() *schema.Resource {
Type: schema.TypeSet, Type: schema.TypeSet,
Optional: true, Optional: true,
Computed: true, Computed: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": { "name": {
@ -88,6 +89,7 @@ func resourceArmVirtualMachine() *schema.Resource {
Type: schema.TypeSet, Type: schema.TypeSet,
Optional: true, Optional: true,
Computed: true, Computed: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"publisher": { "publisher": {
@ -118,6 +120,7 @@ func resourceArmVirtualMachine() *schema.Resource {
"storage_os_disk": { "storage_os_disk": {
Type: schema.TypeSet, Type: schema.TypeSet,
Required: true, Required: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"os_type": { "os_type": {
@ -199,6 +202,7 @@ func resourceArmVirtualMachine() *schema.Resource {
"os_profile": { "os_profile": {
Type: schema.TypeSet, Type: schema.TypeSet,
Required: true, Required: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"computer_name": { "computer_name": {
@ -230,6 +234,7 @@ func resourceArmVirtualMachine() *schema.Resource {
"os_profile_windows_config": { "os_profile_windows_config": {
Type: schema.TypeSet, Type: schema.TypeSet,
Optional: true, Optional: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"provision_vm_agent": { "provision_vm_agent": {
@ -288,6 +293,7 @@ func resourceArmVirtualMachine() *schema.Resource {
"os_profile_linux_config": { "os_profile_linux_config": {
Type: schema.TypeSet, Type: schema.TypeSet,
Optional: true, Optional: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"disable_password_authentication": { "disable_password_authentication": {
@ -772,10 +778,6 @@ func flattenAzureRmVirtualMachineOsDisk(disk *compute.OSDisk) []interface{} {
func expandAzureRmVirtualMachinePlan(d *schema.ResourceData) (*compute.Plan, error) { func expandAzureRmVirtualMachinePlan(d *schema.ResourceData) (*compute.Plan, error) {
planConfigs := d.Get("plan").(*schema.Set).List() planConfigs := d.Get("plan").(*schema.Set).List()
if len(planConfigs) != 1 {
return nil, fmt.Errorf("Cannot specify more than one plan.")
}
planConfig := planConfigs[0].(map[string]interface{}) planConfig := planConfigs[0].(map[string]interface{})
publisher := planConfig["publisher"].(string) publisher := planConfig["publisher"].(string)
@ -792,10 +794,6 @@ func expandAzureRmVirtualMachinePlan(d *schema.ResourceData) (*compute.Plan, err
func expandAzureRmVirtualMachineOsProfile(d *schema.ResourceData) (*compute.OSProfile, error) { func expandAzureRmVirtualMachineOsProfile(d *schema.ResourceData) (*compute.OSProfile, error) {
osProfiles := d.Get("os_profile").(*schema.Set).List() osProfiles := d.Get("os_profile").(*schema.Set).List()
if len(osProfiles) != 1 {
return nil, fmt.Errorf("[ERROR] Only 1 OS Profile Can be specified for an Azure RM Virtual Machine")
}
osProfile := osProfiles[0].(map[string]interface{}) osProfile := osProfiles[0].(map[string]interface{})
adminUsername := osProfile["admin_username"].(string) adminUsername := osProfile["admin_username"].(string)
@ -888,10 +886,6 @@ func expandAzureRmVirtualMachineOsProfileSecrets(d *schema.ResourceData) *[]comp
func expandAzureRmVirtualMachineOsProfileLinuxConfig(d *schema.ResourceData) (*compute.LinuxConfiguration, error) { func expandAzureRmVirtualMachineOsProfileLinuxConfig(d *schema.ResourceData) (*compute.LinuxConfiguration, error) {
osProfilesLinuxConfig := d.Get("os_profile_linux_config").(*schema.Set).List() osProfilesLinuxConfig := d.Get("os_profile_linux_config").(*schema.Set).List()
if len(osProfilesLinuxConfig) != 1 {
return nil, fmt.Errorf("[ERROR] Only 1 OS Profile Linux Config Can be specified for an Azure RM Virtual Machine")
}
linuxConfig := osProfilesLinuxConfig[0].(map[string]interface{}) linuxConfig := osProfilesLinuxConfig[0].(map[string]interface{})
disablePasswordAuth := linuxConfig["disable_password_authentication"].(bool) disablePasswordAuth := linuxConfig["disable_password_authentication"].(bool)
@ -928,10 +922,6 @@ func expandAzureRmVirtualMachineOsProfileLinuxConfig(d *schema.ResourceData) (*c
func expandAzureRmVirtualMachineOsProfileWindowsConfig(d *schema.ResourceData) (*compute.WindowsConfiguration, error) { func expandAzureRmVirtualMachineOsProfileWindowsConfig(d *schema.ResourceData) (*compute.WindowsConfiguration, error) {
osProfilesWindowsConfig := d.Get("os_profile_windows_config").(*schema.Set).List() osProfilesWindowsConfig := d.Get("os_profile_windows_config").(*schema.Set).List()
if len(osProfilesWindowsConfig) != 1 {
return nil, fmt.Errorf("[ERROR] Only 1 OS Profile Windows Config Can be specified for an Azure RM Virtual Machine")
}
osProfileConfig := osProfilesWindowsConfig[0].(map[string]interface{}) osProfileConfig := osProfilesWindowsConfig[0].(map[string]interface{})
config := &compute.WindowsConfiguration{} config := &compute.WindowsConfiguration{}
@ -1024,10 +1014,6 @@ func expandAzureRmVirtualMachineDataDisk(d *schema.ResourceData) ([]compute.Data
func expandAzureRmVirtualMachineImageReference(d *schema.ResourceData) (*compute.ImageReference, error) { func expandAzureRmVirtualMachineImageReference(d *schema.ResourceData) (*compute.ImageReference, error) {
storageImageRefs := d.Get("storage_image_reference").(*schema.Set).List() storageImageRefs := d.Get("storage_image_reference").(*schema.Set).List()
if len(storageImageRefs) != 1 {
return nil, fmt.Errorf("Cannot specify more than one storage_image_reference.")
}
storageImageRef := storageImageRefs[0].(map[string]interface{}) storageImageRef := storageImageRefs[0].(map[string]interface{})
publisher := storageImageRef["publisher"].(string) publisher := storageImageRef["publisher"].(string)
@ -1065,10 +1051,6 @@ func expandAzureRmVirtualMachineNetworkProfile(d *schema.ResourceData) compute.N
func expandAzureRmVirtualMachineOsDisk(d *schema.ResourceData) (*compute.OSDisk, error) { func expandAzureRmVirtualMachineOsDisk(d *schema.ResourceData) (*compute.OSDisk, error) {
disks := d.Get("storage_os_disk").(*schema.Set).List() disks := d.Get("storage_os_disk").(*schema.Set).List()
if len(disks) != 1 {
return nil, fmt.Errorf("[ERROR] Only 1 OS Disk Can be specified for an Azure RM Virtual Machine")
}
disk := disks[0].(map[string]interface{}) disk := disks[0].(map[string]interface{})
name := disk["name"].(string) name := disk["name"].(string)