Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AzureStack Scale set Resource #15

Merged
merged 27 commits into from
Sep 13, 2018
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8d0df37
Add scale set resource to azurestack provider
thetonymaster Jul 27, 2018
d6e627a
Add support for scale set
thetonymaster Jul 27, 2018
c05aca6
Remove unsupported fields
thetonymaster Jul 30, 2018
338a427
Add documentation
thetonymaster Jul 30, 2018
3dd0cea
Merge branch 'master' into scale-set
katbyte Jul 31, 2018
0f8e33e
Merge branch 'master' into scale-set
katbyte Jul 31, 2018
78276c9
Changed AzureRM references to AzureStack
thetonymaster Aug 1, 2018
d81af0a
Merge branch 'scale-set' of github.com:thetonymaster/terraform-provid…
thetonymaster Aug 1, 2018
893b5fb
Add scale set resource to website sidebar template
thetonymaster Aug 1, 2018
b556185
Merge branch 'master' into scale-set
marinsalinas Aug 21, 2018
fe7b44d
Skip unsupported test
marinsalinas Aug 22, 2018
133ceee
Add import test step on virtual machine scale set resource
marinsalinas Aug 29, 2018
535c87e
Merge branch 'master' into scale-set
katbyte Sep 6, 2018
b9bde00
Add new helpers from AzureRM
thetonymaster Sep 6, 2018
c9850af
Add Autorest dependency and update azure-sdk-for-go
thetonymaster Sep 6, 2018
6187c29
Refactor and add validations
thetonymaster Sep 6, 2018
f1ddad3
Add azurestack instead of azurerm helpers
thetonymaster Sep 6, 2018
9a17466
Fix some issues with documentation for scale set
thetonymaster Sep 6, 2018
cca6574
Add comments for not defined enums
thetonymaster Sep 7, 2018
0b5f6f6
Remove suppress and validate helpers and change reference to vendor
thetonymaster Sep 7, 2018
6810355
Remove unused files from azure package
thetonymaster Sep 7, 2018
8f02d6b
For some reason gofmt complained about this file
thetonymaster Sep 7, 2018
88044d5
Merge remote-tracking branch 'origin/master' into scale-set
katbyte Sep 8, 2018
cb9ff32
Fixed minor typo
katbyte Sep 8, 2018
af37227
Merge branch 'master' into scale-set
katbyte Sep 9, 2018
491f24f
merge master into scale-set
katbyte Sep 13, 2018
4f87932
Fix small merge mistake
katbyte Sep 13, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions azurestack/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type ArmClient struct {
resourcesClient resources.Client

vmClient compute.VirtualMachinesClient
vmScaleSetClient compute.VirtualMachineScaleSetsClient
storageServiceClient storage.AccountsClient

vnetClient network.VirtualNetworksClient
Expand Down Expand Up @@ -197,6 +198,10 @@ func (c *ArmClient) registerComputeClients(endpoint, subscriptionId string, auth
c.configureClient(&extensionsClient.Client, auth)
c.vmExtensionClient = extensionsClient

scaleSetsClient := compute.NewVirtualMachineScaleSetsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&scaleSetsClient.Client, auth)
c.vmScaleSetClient = scaleSetsClient

virtualMachinesClient := compute.NewVirtualMachinesClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&virtualMachinesClient.Client, auth)
c.vmClient = virtualMachinesClient
Expand Down
6 changes: 6 additions & 0 deletions azurestack/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ func Provider() terraform.ResourceProvider {
"azurestack_virtual_network": resourceArmVirtualNetwork(),
"azurestack_virtual_machine": resourceArmVirtualMachine(),
"azurestack_virtual_machine_extension": resourceArmVirtualMachineExtensions(),
"azurestack_virtual_machine_scale_set": resourceArmVirtualMachineScaleSet(),
},
}

Expand Down Expand Up @@ -280,3 +281,8 @@ func isBase64Encoded(data string) bool {
_, err := base64.StdEncoding.DecodeString(data)
return err == nil
}

func userDataDiffSuppressFunc(k, old, new string, d *schema.ResourceData) bool {
oldValue := userDataStateFunc(old)
return oldValue == new
}
Loading