Skip to content

Commit 3f26b07

Browse files
authored
Merge pull request #293048 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c1c90d3 + aa74001 commit 3f26b07

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

articles/azure-app-configuration/quickstart-feature-flag-spring-boot.md

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,28 @@ To create a new Spring Boot project:
8585
## Connect to an App Configuration store
8686

8787

88-
1. Navigate to the `resources` directory of your app and open `bootstrap.properties`. If the file does not exist, create it. Add the following line to the file.
88+
1. Navigate to the `resources` directory of your app and open the `bootstrap.properties` or `bootstrap.yaml` file. If the file does not exist, create it. Add the following line to the file.
8989

9090
### [Microsoft Entra ID (recommended)](#tab/entra-id)
9191
You use the `DefaultAzureCredential` to authenticate to your App Configuration store. Follow the [instructions](./concept-enable-rbac.md#authentication-with-token-credentials) to assign your credential the **App Configuration Data Reader** role. Be sure to allow sufficient time for the permission to propagate before running your application. Create a new file named *AppConfigCredential.java* and add the following lines:
9292

93-
```properties
93+
If you are using a properties file, use the following code:
94+
```properties
9495
spring.cloud.azure.appconfiguration.stores[0].endpoint= ${APP_CONFIGURATION_ENDPOINT}
9596
spring.cloud.azure.appconfiguration.stores[0].feature-flags.enabled=true
9697
```
98+
99+
If you are using a yaml file, use the following code:
100+
```yaml
101+
spring:
102+
cloud:
103+
azure:
104+
appconfiguration:
105+
stores[0]:
106+
feature-flags:
107+
enabled: 'true'
108+
connection-string: ${APP_CONFIGURATION_CONNECTION_STRING}
109+
```
97110

98111
Additionally, you need to add the following code to your project, unless you want to use Managed Identity:
99112

@@ -122,10 +135,23 @@ To create a new Spring Boot project:
122135
```
123136

124137
### [Connection string](#tab/connection-string)
125-
```properties
138+
If you are using a properties file, use the following code:
139+
```properties
126140
spring.cloud.azure.appconfiguration.stores[0].endpoint= ${APP_CONFIGURATION_CONNECTION_STRING}
127141
spring.cloud.azure.appconfiguration.stores[0].feature-flags.enabled=true
128142
```
143+
144+
If you are using a yaml file, use the following code:
145+
```yaml
146+
spring:
147+
cloud:
148+
azure:
149+
appconfiguration:
150+
stores[0]:
151+
feature-flags:
152+
enabled: 'true'
153+
connection-string: ${APP_CONFIGURATION_CONNECTION_STRING}
154+
```
129155
---
130156

131157
1. Set an environment variable.

articles/cost-management-billing/manage/subscription-transfer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Dev/Test products aren't shown in the following table. Transfers for Dev/Test pr
106106
| CSP (MCA managed by partner) | CSP (MCA managed by partner) | • For details, see [Transfer a customer's Azure subscriptions and/or Reservations (under an Azure plan) to a different CSP](/partner-center/transfer-azure-subscriptions-under-azure-plan). |
107107
| MOSP (pay-as-you-go) | MOSP (pay-as-you-go) | • If you're changing the billing owner of the subscription, see [Transfer billing ownership of an Azure subscription to another account](billing-subscription-transfer.md).<br><br> • Reservations don't automatically transfer so you must open a [billing support ticket](https://azure.microsoft.com/support/create-ticket/) to transfer them. |
108108
| MOSP (pay-as-you-go) | MCA-online | • For details, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md).<br><br> • Self-service reservation transfers are supported. |
109-
| MOSP (pay-as-you-go) | EA | • If you're transferring the admin account to the EA enrollment, see [Transfer a subscription to an EA](mosp-ea-transfer.md#transfer-the-subscription-to-the-ea).<br><br> • If you're transferring subscriptions to the EA enrollment, you must create a [billing support ticket](https://azure.microsoft.com/support/create-ticket/). |
109+
| MOSP (pay-as-you-go) | EA | • If you're transferring the admin account to the EA enrollment, see [Transfer a subscription to an EA](mosp-ea-transfer.md#transfer-the-subscription-to-the-ea).<br><br> • If you're transferring subscriptions to the EA enrollment or if reservations don't automatically transfer, you must create a [billing support ticket](https://azure.microsoft.com/support/create-ticket/). |
110110
| MOSP (pay-as-you-go) | MCA-E | • For details, see [Transfer Azure subscription billing ownership for a Microsoft Customer Agreement](mca-request-billing-ownership.md).<br><br> • Self-service reservation transfers are supported. |
111111

112112
## Perform resource transfers

0 commit comments

Comments
 (0)