Skip to content

Commit 7e2e338

Browse files
committed
add env vars and update docs
1 parent 1bc7d22 commit 7e2e338

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

internal/backend/remote-state/azure/backend.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func New() backend.Backend {
102102
Type: schema.TypeString,
103103
Optional: true,
104104
Description: "The Client ID to use when authenticating using Azure Active Directory.",
105-
DefaultFunc: schema.EnvDefaultFunc("ARM_CLIENT_ID", ""),
105+
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"ARM_CLIENT_ID_BACKEND", "ARM_CLIENT_ID"}, ""),
106106
},
107107

108108
"client_id_file_path": {
@@ -166,7 +166,7 @@ func New() backend.Backend {
166166
"ado_pipeline_service_connection_id": {
167167
Type: schema.TypeString,
168168
Optional: true,
169-
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"ARM_ADO_PIPELINE_SERVICE_CONNECTION_ID", "ARM_OIDC_AZURE_SERVICE_CONNECTION_ID"}, nil),
169+
DefaultFunc: schema.MultiEnvDefaultFunc([]string{"ARM_ADO_PIPELINE_SERVICE_CONNECTION_ID_BACKEND", "ARM_ADO_PIPELINE_SERVICE_CONNECTION_ID", "ARM_OIDC_AZURE_SERVICE_CONNECTION_ID", "AZURESUBSCRIPTION_SERVICE_CONNECTION_ID"}, nil),
170170
Description: "The Azure DevOps Pipeline Service Connection ID.",
171171
},
172172

website/docs/language/backend/azurerm.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ These optional configuration options apply when [looking up the data plane URI](
7070

7171
The recommended data plane role assignments required for this method are either one of:
7272

73-
- `Storage Blob Data Owner` on the storage account container (Recommended)
73+
- `Storage Blob Data Contributor` on the storage account container (Recommended)
7474
- `Storage Blob Data Contributor` on the storage account
7575

7676
The recommended management plane role assignments required for this method are:
@@ -339,7 +339,7 @@ These optional configuration options apply when [looking up the data plane URI](
339339

340340
The recommended data plane role assignments required for this method are either one of:
341341

342-
- `Storage Blob Data Owner` on the storage account container (Recommended)
342+
- `Storage Blob Data Contributor` on the storage account container (Recommended)
343343
- `Storage Blob Data Contributor` on the storage account
344344

345345
The recommended management plane role assignments required for this method are:
@@ -548,9 +548,9 @@ The following configuration options are supported:
548548

549549
* `use_oidc` - (Optional) Set to `true` to use OpenID Connect / Workload identity federation authentication for authentication to the storage account management and data plane. This can also be sourced from the `ARM_USE_OIDC` environment variable.
550550

551-
* `client_id` - (Optional) The Client ID of the Azure Active Directory Principal required for some authentication sub-types. This can also be sourced from the `ARM_CLIENT_ID` environment variable.
551+
* `client_id` - (Optional) The Client ID of the Azure Active Directory Principal required for some authentication sub-types. This can also be sourced from the `ARM_CLIENT_ID` or `ARM_CLIENT_ID_BACKEND` environment variable.
552552

553-
* `ado_pipeline_service_connection_id` - (Optional) The Azure DevOps Pipeline Service Connection ID required for Open ID Connect / Workload identity federation authentication with Azure DevOps. This can also be sourced from the `ARM_ADO_PIPELINE_SERVICE_CONNECTION_ID` or `ARM_OIDC_AZURE_SERVICE_CONNECTION_ID` environment variables. The provider will look for values in this order and use the first it finds configured.
553+
* `ado_pipeline_service_connection_id` - (Optional) The Azure DevOps Pipeline Service Connection ID required for Open ID Connect / Workload identity federation authentication with Azure DevOps. This can also be sourced from the `ARM_ADO_PIPELINE_SERVICE_CONNECTION_ID`, `ARM_OIDC_AZURE_SERVICE_CONNECTION_ID`, `AZURESUBSCRIPTION_SERVICE_CONNECTION_ID` or `ARM_ADO_PIPELINE_SERVICE_CONNECTION_ID_BACKEND` environment variables. The provider will look for values in this order and use the first it finds configured.
554554

555555
* `oidc_request_url` - (Optional) The URL for the Open ID Connect provider from which to request an ID token. This is only required for advanced scenarios or third party integrations. This can also be sourced from the `ARM_OIDC_REQUEST_URL`, `ACTIONS_ID_TOKEN_REQUEST_URL` or `SYSTEM_OIDCREQUESTURI` environment variables. The provider will look for values in this order and use the first it finds configured.
556556

0 commit comments

Comments
 (0)