Skip to content

Commit 306087b

Browse files
v-regandownerv-regandowner
authored
Merge pull request #215989 from alexbuckgit/alexbuckgit/docutune-autopr-20221026-151405-3605960
[BULK] Fix code block formatting issues (part 3)
2 parents 657be6b + 71e7c79 commit 306087b

File tree

7 files changed

+77
-72
lines changed

7 files changed

+77
-72
lines changed

‎articles/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-cosmos-db.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,18 @@ To complete these steps, you need an SSH client. If you are using Windows, you c
125125
> In the previous request, the value of the "resource" parameter must be an exact match for what is expected by Azure AD. When using the Azure Resource Manager resource ID, you must include the trailing slash on the URI.
126126
> In the following response, the access_token element as been shortened for brevity.
127127

128-
```bash
129-
{"access_token":"eyJ0eXAiOi...",
130-
"expires_in":"3599",
131-
"expires_on":"1518503375",
132-
"not_before":"1518499475",
133-
"resource":"https://management.azure.com/",
134-
"token_type":"Bearer",
135-
"client_id":"1ef89848-e14b-465f-8780-bf541d325cd5"}
136-
```
137-
128+
```json
129+
{
130+
"access_token":"eyJ0eXAiOi...",
131+
"expires_in":"3599",
132+
"expires_on":"1518503375",
133+
"not_before":"1518499475",
134+
"resource":"https://management.azure.com/",
135+
"token_type":"Bearer",
136+
"client_id":"1ef89848-e14b-465f-8780-bf541d325cd5"
137+
}
138+
```
139+
138140
### Get access keys from Azure Resource Manager to make Azure Cosmos DB calls
139141

140142
Now use CURL to call Resource Manager using the access token retrieved in the previous section to retrieve the Azure Cosmos DB account access key. Once we have the access key, we can query Azure Cosmos DB. Be sure to replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<COSMOS DB ACCOUNT NAME>` parameter values with your own values. Replace the `<ACCESS TOKEN>` value with the access token you retrieved earlier. If you want to retrieve read/write keys, use key operation type `listKeys`. If you want to retrieve read-only keys, use the key operation type `readonlykeys`:

‎articles/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-storage-access-key.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,18 @@ To complete these steps, you will need an SSH client. If you are using Windows,
8888
> In the previous request, the value of the "resource" parameter must be an exact match for what is expected by Azure AD. When using the Azure Resource Manager resource ID, you must include the trailing slash on the URI.
8989
> In the following response, the access_token element as been shortened for brevity.
9090

91-
```bash
92-
{"access_token":"eyJ0eXAiOiJ...",
93-
"refresh_token":"",
94-
"expires_in":"3599",
95-
"expires_on":"1504130527",
96-
"not_before":"1504126627",
97-
"resource":"https://management.azure.com",
98-
"token_type":"Bearer"}
99-
```
100-
91+
```json
92+
{
93+
"access_token": "eyJ0eXAiOiJ...",
94+
"refresh_token": "",
95+
"expires_in": "3599",
96+
"expires_on": "1504130527",
97+
"not_before": "1504126627",
98+
"resource": "https://management.azure.com",
99+
"token_type": "Bearer"
100+
}
101+
```
102+
101103
## Get storage account access keys from Azure Resource Manager to make storage calls
102104

103105
Now use CURL to call Resource Manager using the access token we retrieved in the previous section, to retrieve the storage access key. Once we have the storage access key, we can call storage upload/download operations. Be sure to replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<STORAGE ACCOUNT NAME>` parameter values with your own values. Replace the `<ACCESS TOKEN>` value with the access token you retrieved earlier:
@@ -192,4 +194,4 @@ Response:
192194
In this tutorial, you learned how to use a Linux VM system-assigned managed identity to access Azure Storage using an access key. To learn more about Azure Storage access keys see:
193195
194196
> [!div class="nextstepaction"]
195-
>[Manage your storage access keys](../../storage/common/storage-account-create.md)
197+
>[Manage your storage access keys](../../storage/common/storage-account-create.md)

‎articles/active-directory/managed-identities-azure-resources/tutorial-linux-vm-access-storage-sas.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,17 @@ Now that you have your SSH client continue to the steps below:
9999
> In the previous request, the value of the "resource" parameter must be an exact match for what is expected by Azure AD. When using the Azure Resource Manager resource ID, you must include the trailing slash on the URI.
100100
> In the following response, the access_token element has been shortened for brevity.
101101

102-
```bash
103-
{"access_token":"eyJ0eXAiOiJ...",
104-
"refresh_token":"",
105-
"expires_in":"3599",
106-
"expires_on":"1504130527",
107-
"not_before":"1504126627",
108-
"resource":"https://management.azure.com",
109-
"token_type":"Bearer"}
110-
```
102+
```json
103+
{
104+
"access_token":"eyJ0eXAiOiJ...",
105+
"refresh_token":"",
106+
"expires_in":"3599",
107+
"expires_on":"1504130527",
108+
"not_before":"1504126627",
109+
"resource":"https://management.azure.com",
110+
"token_type":"Bearer"
111+
}
112+
```
111113

112114
## Get a SAS credential from Azure Resource Manager to make storage calls
113115

@@ -227,4 +229,4 @@ Response:
227229
In this tutorial, you learned how to use a Linux VM system-assigned managed identity to access Azure Storage using a SAS credential. To learn more about Azure Storage SAS, see:
228230
229231
> [!div class="nextstepaction"]
230-
>[Using shared access signatures (SAS)](../../storage/common/storage-sas-overview.md)
232+
>[Using shared access signatures (SAS)](../../storage/common/storage-sas-overview.md)

‎articles/active-directory/saas-apps/ascentis-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8181

8282
In the **Sign-on URL** text box, type a URL using any one of the following pattern:
8383

84-
```https
84+
```https
8585
https://selfservice.ascentis.com/<clientname>/STS/signin.aspx?SAMLResponse=true
8686
https://selfservice2.ascentis.com/<clientname>/STS/signin.aspx?SAMLResponse=true
8787
```
@@ -146,4 +146,4 @@ When you click the Ascentis tile in the Access Panel, you should be automaticall
146146
147147
- [What is application access and single sign-on with Azure Active Directory?](../manage-apps/what-is-single-sign-on.md)
148148
149-
- [What is conditional access in Azure Active Directory?](../conditional-access/overview.md)
149+
- [What is conditional access in Azure Active Directory?](../conditional-access/overview.md)

‎articles/active-directory/saas-apps/fortigate-ssl-vpn-tutorial.md

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,12 @@ Follow these steps to enable Azure AD SSO in the Azure portal:
8787
d. In the **Logout URL** box, enter a URL in the pattern
8888
`https://<FortiGate IP or FQDN address>:<Custom SSL VPN port><FQDN>/remote/saml/logout`.
8989

90-
> [!NOTE]
91-
> These values are just patterns. You need to use the actual **Sign on URL**, **Identifier**, **Reply URL**, and **Logout URL** that is configured on the FortiGate.
90+
> [!NOTE]
91+
> These values are just patterns. You need to use the actual **Sign on URL**, **Identifier**, **Reply URL**, and **Logout URL** that is configured on the FortiGate.
9292
9393
1. The FortiGate SSL VPN application expects SAML assertions in a specific format, which requires you to add custom attribute mappings to the configuration. The following screenshot shows the list of default attributes.
9494

95-
![Screenshot of showing Attributes and Claims section.](./media/fortigate-ssl-vpn-tutorial/claims.png)
96-
95+
![Screenshot of showing Attributes and Claims section.](./media/fortigate-ssl-vpn-tutorial/claims.png)
9796

9897
1. The claims required by FortiGate SSL VPN are shown in the following table. The names of these claims must match the names used in the **Perform FortiGate command-line configuration** section of this tutorial. Names are case-sensitive.
9998

@@ -129,11 +128,11 @@ Follow these steps to enable Azure AD SSO in the Azure portal:
129128

130129
1. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, select the **Download** link next to **Certificate (Base64)** to download the certificate and save it on your computer:
131130

132-
![Screenshot that shows the certificate download link.](common/certificatebase64.png)
131+
![Screenshot that shows the certificate download link.](common/certificatebase64.png)
133132

134133
1. In the **Set up FortiGate SSL VPN** section, copy the appropriate URL or URLs, based on your requirements:
135134

136-
![Screenshot that shows the configuration URLs.](common/copy-configuration-urls.png)
135+
![Screenshot that shows the configuration URLs.](common/copy-configuration-urls.png)
137136

138137
#### Create an Azure AD test user
139138

@@ -198,8 +197,8 @@ To complete these steps, you'll need the values you recorded earlier:
198197

199198
| FortiGate SAML CLI setting | Equivalent Azure configuration |
200199
| ------------ | --------- |
201-
| SP entity ID (`entity-id`) | Identifier (Entity ID) |
202-
| SP Single Sign-On URL (`single-sign-on-url`) | Reply URL (Assertion Consumer Service URL) |
200+
| SP entity ID (`entity-id`) | Identifier (Entity ID) |
201+
| SP Single Sign-On URL (`single-sign-on-url`) | Reply URL (Assertion Consumer Service URL) |
203202
| SP Single Logout URL (`single-logout-url`) | Logout URL |
204203
| IdP Entity ID (`idp-entity-id`) | Azure AD Identifier |
205204
| IdP Single Sign-On URL (`idp-single-sign-on-url`) | Azure Login URL |
@@ -214,23 +213,22 @@ To complete these steps, you'll need the values you recorded earlier:
214213
1. Establish an SSH session to your FortiGate appliance, and sign in with a FortiGate Administrator account.
215214
1. Run these commands and substitute the `<values>` with the information that you collected previously:
216215

217-
```console
216+
```console
218217
config user saml
219-
edit azure
220-
set cert <FortiGate VPN Server Certificate Name>
221-
set entity-id < Identifier (Entity ID)Entity ID>
222-
set single-sign-on-url < Reply URL Reply URL>
223-
set single-logout-url <Logout URL>
224-
set idp-entity-id <Azure AD Identifier>
225-
set idp-single-sign-on-url <Azure Login URL>
226-
set idp-single-logout-url <Azure Logout URL>
227-
set idp-cert <Base64 SAML Certificate Name>
228-
set user-name username
229-
set group-name group
230-
next
218+
edit azure
219+
set cert <FortiGate VPN Server Certificate Name>
220+
set entity-id < Identifier (Entity ID)Entity ID>
221+
set single-sign-on-url < Reply URL Reply URL>
222+
set single-logout-url <Logout URL>
223+
set idp-entity-id <Azure AD Identifier>
224+
set idp-single-sign-on-url <Azure Login URL>
225+
set idp-single-logout-url <Azure Logout URL>
226+
set idp-cert <Base64 SAML Certificate Name>
227+
set user-name username
228+
set group-name group
229+
next
231230
end
232-
233-
```
231+
```
234232

235233
#### Configure FortiGate for group matching
236234

@@ -239,22 +237,23 @@ In this section, you'll configure FortiGate to recognize the Object ID of the se
239237
To complete these steps, you'll need the Object ID of the FortiGateAccess security group that you created earlier in this tutorial.
240238

241239
1. Establish an SSH session to your FortiGate appliance, and sign in with a FortiGate Administrator account.
240+
242241
1. Run these commands:
243242

244-
```console
243+
```console
245244
config user group
246-
edit FortiGateAccess
247-
set member azure
248-
config match
249-
edit 1
250-
set server-name azure
251-
set group-name <Object Id>
252-
next
253-
end
254-
next
245+
edit FortiGateAccess
246+
set member azure
247+
config match
248+
edit 1
249+
set server-name azure
250+
set group-name <Object Id>
251+
next
252+
end
253+
next
255254
end
256-
```
257-
255+
```
256+
258257
#### Create a FortiGate VPN Portals and Firewall Policy
259258

260259
In this section, you'll configure a FortiGate VPN Portals and Firewall Policy that grants access to the FortiGateAccess security group you created earlier in this tutorial.

‎articles/aks/azure-csi-blob-storage-static.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ The following example demonstrates how to mount a Blob storage container as a pe
129129
storage: 10Gi
130130
volumeName: pv-blob
131131
storageClassName: azureblob-nfs-premium
132-
```
132+
```
133133

134134
4. Run the following command to create the persistent volume claim using the `kubectl create` command referencing the YAML file created earlier:
135135

‎articles/api-management/how-to-configure-service-fabric-backend.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ Add the [`set-backend-service`](api-management-transformation-policies.md#SetBac
113113
1. On the **Design** tab, in the **Inbound processing** section, select the code editor (**</>**) icon.
114114
1. Position the cursor inside the **&lt;inbound&gt;** element
115115
1. Add the `set-service-backend` policy statement.
116-
* In `backend-id`, substitute the name of your Service Fabric backend.
116+
* In `backend-id`, substitute the name of your Service Fabric backend.
117117

118-
* The `sf-resolve-condition` is a condition for re-resolving a service location and resending a request. The number of retries was set when configuring the backend. For example:
118+
* The `sf-resolve-condition` is a condition for re-resolving a service location and resending a request. The number of retries was set when configuring the backend. For example:
119119

120120
```xml
121121
<set-backend-service backend-id="mysfbackend" sf-resolve-condition="@(context.LastError?.Reason == "BackendConnectionFailure")"/>
122-
```
122+
```
123123
1. Select **Save**.
124124

125125
:::image type="content" source="media/backends/set-backend-service.png" alt-text="Configure set-backend-service policy":::

0 commit comments

Comments
 (0)