Skip to content

Commit a8556e1

Browse files
authored
provider.url should not require API path (#47)
1 parent bd7533d commit a8556e1

File tree

6 files changed

+12
-15
lines changed

6 files changed

+12
-15
lines changed

.changes/v1.0.0/47-improvements.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
* The `url` field in `provider` configuration does not require specifying API endpoint '/api/
2+
[GH-47]

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
1010
github.com/hashicorp/go-version v1.7.0
1111
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.0
12-
github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.34
12+
github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.35
1313
k8s.io/apimachinery v0.32.1
1414
k8s.io/client-go v0.32.1
1515
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
194194
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
195195
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
196196
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
197-
github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.34 h1:3kpqbSEB5EpGYCDRlt97/Ij5TsmFBANICdMOH/G9bcY=
198-
github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.34/go.mod h1:f/DvucDnptuPwnE01gmcnr3dS9AcQpv4KguP686IREs=
197+
github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.35 h1:Ozxzz0SCL17P7G0mTvW2N+mJC/HRdZxH5r8Qlx6n6MQ=
198+
github.com/vmware/go-vcloud-director/v3 v3.0.0-alpha.35/go.mod h1:f/DvucDnptuPwnE01gmcnr3dS9AcQpv4KguP686IREs=
199199
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
200200
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
201201
github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=

vcfa/sample_vcfa_test_config-cci.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"tmVersion": "10.7.0",
88
"tmApiVersion": "40.0",
99
"token": "",
10-
"url": "https://10.13.21.20/tm/api",
10+
"url": "https://10.13.21.20",
1111
"sysOrg": "System",
1212
"allowInsecure": true,
1313
"tfAcceptanceTests": true,
@@ -24,6 +24,6 @@
2424
"region": "terraform-demo",
2525
"vpc": "terraform-demo-Default-VPC",
2626
"storagePolicy": "vSAN Default Storage Policy",
27-
"supervisorZone": "vcfa-gen-wl-vc08-cl1-zone1"
27+
"supervisorZone": "terraform-demo"
2828
}
2929
}

vcfa/sample_vcfa_test_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"//": "Access token to be used instead of username/password",
1212
"token": "",
1313

14-
"url": "https://10.13.21.20/tm/api",
14+
"url": "https://myhostname.nonexistent",
1515
"sysOrg": "System",
1616
"//": "allowInsecure will skip the check on self-signed certificates",
1717
"allowInsecure": true,

website/docs/index.html.markdown

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,15 @@ The following arguments are used to configure the VMware Cloud Foundation Automa
139139
if set to `true`, will suppress a warning to the user about the service account token file containing *sensitive information*.
140140
Can also be set with `VCFA_ALLOW_SA_TOKEN_FILE`.
141141

142-
- `org` - (Required) This is the Tenant Manager Org on which to run API
142+
- `org` - (Required) This is the VCFA Org on which to run API
143143
operations. Can also be specified with the `VCFA_ORG` environment
144144
variable.
145145
`org` may be set to "System" when connection as Sys Admin is desired
146146
(set `user` to "administrator" in this case).
147147
Note: `org` value is case sensitive.
148-
149-
- `sysorg` - (Optional) - Organization for user authentication. Can also be
150-
specified with the `VCFA_SYS_ORG` environment variable. Set `sysorg` to "System" and
151-
`user` to "administrator" to free up `org` argument for setting a default organization
152-
for resources to use.
153-
154-
- `url` - (Required) This is the URL for the Tenant Manager API endpoint. e.g.
155-
https://server.domain.com/tm/api. Can also be specified with the `VCFA_URL` environment variable.
148+
149+
- `url` - (Required) This is the URL for the VCFA endpoint hostname e.g.
150+
https://server.domain.com. Can also be specified with the `VCFA_URL` environment variable.
156151

157152
- `allow_unverified_ssl` - (Optional) Boolean that can be set to true to
158153
disable SSL certificate verification. This should be used with care as it

0 commit comments

Comments
 (0)