Skip to content

Commit

Permalink
Adds managed attribute to azurestack_availability_set
Browse files Browse the repository at this point in the history
* Commented out, but new profile supports it
* Updated docs
* Closes #100
  • Loading branch information
jbmcfar authored and petems committed Aug 21, 2019
1 parent c5ece24 commit 7177b2d
Show file tree
Hide file tree
Showing 159 changed files with 3,246 additions and 5,444 deletions.
40 changes: 18 additions & 22 deletions azurestack/resource_arm_availability_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package azurestack

import (
"fmt"
"log"

"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
"log"
"strings"
)

func resourceArmAvailabilitySet() *schema.Resource {
Expand Down Expand Up @@ -47,13 +47,12 @@ func resourceArmAvailabilitySet() *schema.Resource {
ValidateFunc: validation.IntBetween(1, 3),
},

// Not supported for 2017-03-09 profile
// "managed": {
// Type: schema.TypeBool,
// Optional: true,
// Default: false,
// ForceNew: true,
// },
"managed": {
Type: schema.TypeBool,
Optional: true,
Default: false,
ForceNew: true,
},

"tags": tagsSchema(),
},
Expand All @@ -72,8 +71,7 @@ func resourceArmAvailabilitySetCreate(d *schema.ResourceData, meta interface{})
updateDomainCount := d.Get("platform_update_domain_count").(int)
faultDomainCount := d.Get("platform_fault_domain_count").(int)

// Not supported for 2017-03-09 profile
// managed := d.Get("managed").(bool)
managed := d.Get("managed").(bool)

tags := d.Get("tags").(map[string]interface{})

Expand All @@ -87,13 +85,12 @@ func resourceArmAvailabilitySetCreate(d *schema.ResourceData, meta interface{})
Tags: *expandTags(tags),
}

// Not supported for 2017-03-09 profile
// if managed == true {
// n := "Aligned"
// availSet.Sku = &compute.Sku{
// Name: &n,
// }
// }
if managed == true {
n := "Aligned"
availSet.Sku = &compute.Sku{
Name: &n,
}
}

resp, err := client.CreateOrUpdate(ctx, resGroup, name, availSet)
if err != nil {
Expand Down Expand Up @@ -134,10 +131,9 @@ func resourceArmAvailabilitySetRead(d *schema.ResourceData, meta interface{}) er
d.Set("platform_update_domain_count", availSet.PlatformUpdateDomainCount)
d.Set("platform_fault_domain_count", availSet.PlatformFaultDomainCount)

// Not supported for 2017-03-09 profile
// if resp.Sku != nil && resp.Sku.Name != nil {
// d.Set("managed", strings.EqualFold(*resp.Sku.Name, "Aligned"))
// }
if resp.Sku != nil && resp.Sku.Name != nil {
d.Set("managed", strings.EqualFold(*resp.Sku.Name, "Aligned"))
}

flattenAndSetTags(d, &resp.Tags)

Expand Down
2 changes: 1 addition & 1 deletion azurestack/resource_arm_resource_group.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func resourceArmResourceGroupDelete(d *schema.ResourceData, meta interface{}) er
return fmt.Errorf("Error deleting Resource Group %q: %+v", name, err)
}

err = deleteFuture.WaitForCompletion(ctx, client.Client)
err = deleteFuture.WaitForCompletionRef(ctx, client.Client)
if err != nil {
if response.WasNotFound(deleteFuture.Response()) {
return nil
Expand Down
2 changes: 1 addition & 1 deletion azurestack/resource_arm_virtual_machine_scale_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ func resourceArmVirtualMachineScaleSetCreate(d *schema.ResourceData, meta interf
return err
}

if err = future.WaitForCompletion(ctx, client.Client); err != nil {
if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
return fmt.Errorf("Error Creating/Updating Virtual Machine Scale Set %s (resource group %s) ID: %+v", name, resGroup, err)
}

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ go 1.12
require (
contrib.go.opencensus.io/exporter/ocagent v0.5.0 // indirect
github.com/Azure/azure-sdk-for-go v30.0.0+incompatible
github.com/Azure/go-autorest v11.7.0+incompatible
github.com/Azure/go-autorest v12.0.0+incompatible
github.com/davecgh/go-spew v1.1.1
github.com/dnaeon/go-vcr v1.0.1 // indirect
github.com/hashicorp/errwrap v1.0.0
github.com/hashicorp/go-azure-helpers v0.3.2
github.com/hashicorp/go-hclog v0.8.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
github.com/hashicorp/terraform v0.12.6
github.com/hashicorp/terraform v0.12.0
github.com/terraform-providers/terraform-provider-azurerm v1.15.0
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
)
54 changes: 17 additions & 37 deletions go.sum

Large diffs are not rendered by default.

23 changes: 2 additions & 21 deletions vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 2 additions & 29 deletions vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 4 additions & 8 deletions vendor/github.com/aws/aws-sdk-go/aws/client/logger.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7177b2d

Please sign in to comment.