Skip to content

Commit 342faf5

Browse files
Merge pull request #256 from hashicorp/docs/vmss
provider/azure: update vmss doc only supporting unique deployment mode
2 parents 38e67cb + 8e06159 commit 342faf5

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

.github/actions/acctest/action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
name: acctest
2-
2+
description: "Acctest runs acceptance tests for go-discover"
33
inputs:
44
provider-test-infra-dir:
5+
description: 'Specifies a directory for test infrastructure'
56
required: false
67
provider-go-test-dir:
8+
description: 'Specifies a directory for Go tests'
79
required: false
810
provider-go-test-tags:
11+
description: 'Test flags for go'
912
required: false
1013
default: ''
1114
provider-tf-apply:
15+
description: 'Applies terraform with auto-approve enabled'
1216
required: false
1317
default: terraform apply -auto-approve
1418
aws-region:

.github/workflows/acceptance.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
with:
8484
gotestsum_version: 1.9.0
8585

86-
- uses: "./.github/actions/acctest"
86+
- uses: './.github/actions/acctest'
8787
with:
8888
provider-test-infra-dir: aliyun
8989
provider-go-test-dir: aliyun
@@ -313,13 +313,13 @@ jobs:
313313
# - be placed after the fanout of a workflow so that everything fans back in
314314
# to this job.
315315
# - "need" any job that is part of the fan out / fan in
316-
# - implement the if logic because we have conditional jobs
317-
# (go-test-enteprise) that this job needs and this would potentially get
318-
# skipped if a previous job got skipped. So we use the if clause to make
316+
# - implement the if logic because we have conditional jobs
317+
# (go-test-enteprise) that this job needs and this would potentially get
318+
# skipped if a previous job got skipped. So we use the if clause to make
319319
# sure it does not get skipped.
320320

321321
acceptance-success:
322-
needs:
322+
needs:
323323
- lint
324324
- go-test
325325
- alicloud-provider

provider/azure/azure_discover.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ func (p *Provider) Help() string {
5656
When using tags the only permission needed is Microsoft.Network/networkInterfaces/*
5757
5858
When using Virtual Machine Scale Sets the only role action needed is Microsoft.Compute/virtualMachineScaleSets/*/read.
59+
The Azure provider only supports Virtual Machine Scale Sets deployed in [Uniform mode](https://learn.microsoft.com/en-us/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-orchestration-modes#scale-sets-with-uniform-orchestration).
60+
As of 2023 VMSS deploys using Flexible mode by default.
5961
6062
It is recommended you make a dedicated key used only for auto-joining.
6163
`
@@ -130,7 +132,6 @@ func (p *Provider) Addrs(args map[string]string, l *log.Logger) ([]string, error
130132
l.Printf("[ERROR] discover-azure: resource_group %s, vm_scale_set %s", resourceGroup, vmScaleSet)
131133
return nil, fmt.Errorf("discover-azure: unclear configuration. use (tag name and value) or (resouce_group and vm_scale_set)")
132134
}
133-
134135
}
135136

136137
func fetchAddrsWithTags(tagName string, tagValue string, vmnet network.InterfacesClient, l *log.Logger) ([]string, error) {
@@ -139,7 +140,6 @@ func fetchAddrsWithTags(tagName string, tagValue string, vmnet network.Interface
139140

140141
ctx := context.Background()
141142
netres, err := vmnet.ListAll(ctx)
142-
143143
if err != nil {
144144
return nil, fmt.Errorf("discover-azure: %s", err)
145145
}

0 commit comments

Comments
 (0)