Merge pull request #25830 from hashicorp/kt/secret-metadata-host
backend/azurerm: support loading environments from a metadata host
This commit is contained in:
commit
bd5ff98ca7
|
@ -62,6 +62,7 @@ func buildArmClient(config BackendConfig) (*ArmClient, error) {
|
||||||
SubscriptionID: config.SubscriptionID,
|
SubscriptionID: config.SubscriptionID,
|
||||||
TenantID: config.TenantID,
|
TenantID: config.TenantID,
|
||||||
CustomResourceManagerEndpoint: config.CustomResourceManagerEndpoint,
|
CustomResourceManagerEndpoint: config.CustomResourceManagerEndpoint,
|
||||||
|
MetadataURL: config.MetadataHost,
|
||||||
Environment: config.Environment,
|
Environment: config.Environment,
|
||||||
ClientSecretDocsLink: "https://www.terraform.io/docs/providers/azurerm/guides/service_principal_client_secret.html",
|
ClientSecretDocsLink: "https://www.terraform.io/docs/providers/azurerm/guides/service_principal_client_secret.html",
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,13 @@ func New() backend.Backend {
|
||||||
Description: "The blob key.",
|
Description: "The blob key.",
|
||||||
},
|
},
|
||||||
|
|
||||||
|
"metadata_host": {
|
||||||
|
Type: schema.TypeString,
|
||||||
|
Required: true,
|
||||||
|
DefaultFunc: schema.EnvDefaultFunc("ARM_METADATA_HOST", ""),
|
||||||
|
Description: "The Metadata URL which will be used to obtain the Cloud Environment.",
|
||||||
|
},
|
||||||
|
|
||||||
"environment": {
|
"environment": {
|
||||||
Type: schema.TypeString,
|
Type: schema.TypeString,
|
||||||
Optional: true,
|
Optional: true,
|
||||||
|
@ -186,6 +193,7 @@ type BackendConfig struct {
|
||||||
ClientCertificatePath string
|
ClientCertificatePath string
|
||||||
ClientSecret string
|
ClientSecret string
|
||||||
CustomResourceManagerEndpoint string
|
CustomResourceManagerEndpoint string
|
||||||
|
MetadataHost string
|
||||||
Environment string
|
Environment string
|
||||||
MsiEndpoint string
|
MsiEndpoint string
|
||||||
ResourceGroupName string
|
ResourceGroupName string
|
||||||
|
@ -220,6 +228,7 @@ func (b *Backend) configure(ctx context.Context) error {
|
||||||
ClientCertificatePath: data.Get("client_certificate_path").(string),
|
ClientCertificatePath: data.Get("client_certificate_path").(string),
|
||||||
ClientSecret: clientSecret,
|
ClientSecret: clientSecret,
|
||||||
CustomResourceManagerEndpoint: data.Get("endpoint").(string),
|
CustomResourceManagerEndpoint: data.Get("endpoint").(string),
|
||||||
|
MetadataHost: data.Get("metadata_host").(string),
|
||||||
Environment: data.Get("environment").(string),
|
Environment: data.Get("environment").(string),
|
||||||
MsiEndpoint: data.Get("msi_endpoint").(string),
|
MsiEndpoint: data.Get("msi_endpoint").(string),
|
||||||
ResourceGroupName: data.Get("resource_group_name").(string),
|
ResourceGroupName: data.Get("resource_group_name").(string),
|
||||||
|
|
Loading…
Reference in New Issue