Skip to content

Commit 3b288cc

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-old-review
2 parents 286dd5c + ef1c64e commit 3b288cc

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

articles/active-directory/saas-apps/aws-single-sign-on-tutorial.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ To configure the integration of AWS IAM Identity Center into Azure AD, you need
5050

5151
Alternatively, you can also use the [Enterprise App Configuration Wizard](https://portal.office.com/AdminPortal/home?Q=Docs#/azureadappintegration). In this wizard, you can add an application to your tenant, add users/groups to the app, assign roles, as well as walk through the SSO configuration as well. [Learn more about Microsoft 365 wizards.](/microsoft-365/admin/misc/azure-ad-setup-guides)
5252

53-
Alternatively, you can also use the [Enterprise App Configuration Wizard](https://portal.office.com/AdminPortal/home?Q=Docs#/azureadappintegration). In this wizard, you can add an application to your tenant, add users/groups to the app, assign roles, as well as walk through the SSO configuration as well. You can learn more about O365 wizards [here](/microsoft-365/admin/misc/azure-ad-setup-guides?view=o365-worldwide&preserve-view=true).
54-
5553
## Configure and test Azure AD SSO for AWS IAM Identity Center
5654

5755
Configure and test Azure AD SSO with AWS IAM Identity Center using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in AWS IAM Identity Center.

articles/role-based-access-control/role-definitions-list.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: amycolannino
77
ms.service: role-based-access-control
88
ms.topic: how-to
99
ms.workload: identity
10-
ms.date: 03/20/2023
10+
ms.date: 03/28/2023
1111
ms.author: rolyon
1212
ms.custom: devx-track-azurepowershell, devx-track-azurecli
1313
ms.devlang: azurecli
@@ -455,7 +455,6 @@ To list role definitions, use the [Role Definitions - List](/rest/api/authorizat
455455
> [!div class="mx-tableFixed"]
456456
> | Filter | Description |
457457
> | --- | --- |
458-
> | `$filter=atScopeAndBelow()` | Lists role definitions for the specified scope and any subscopes. |
459458
> | `$filter=type+eq+'{type}'` | Lists role definitions of the specified type. Type of role can be `CustomRole` or `BuiltInRole`. |
460459
461460
The following example lists all custom roles in a tenant:

articles/virtual-machines/shared-image-galleries.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ When you use a gallery to store images, multiple resource types are created:
3535

3636
## Image definitions
3737

38-
Image definitions are a logical grouping for versions of an image. The image definition holds information about why the image was created, what OS it is for, and other information about using the image. An image definition is like a plan for all of the details around creating a specific image. You don't deploy a VM from an image definition, but from the image versions created from the definition.
38+
Image definitions are a logical grouping for versions of an image. The image definition holds information about why the image was created and also contains Image metadata such as, what OS it is for, features it supports and other information about using the image. An image definition is like a plan for all of the details around creating a specific image. You don't deploy a VM from an image definition, but from the image versions created from the definition.
3939

4040
There are three parameters for each image definition that are used in combination - **Publisher**, **Offer** and **SKU**. These are used to find a specific image definition. You can have image versions that share one or two, but not all three values. For example, here are three image definitions and their values:
4141

@@ -65,6 +65,23 @@ The following are other parameters that can be set on your image definition so t
6565
- Disallowed disk types - you can provide information about the storage needs for your VM. For example, if the image isn't suited for standard HDD disks, you add them to the disallow list.
6666
- Purchase plan information for Marketplace images - `-PurchasePlanPublisher`, `-PurchasePlanName`, and `-PurchasePlanProduct`. For more information about purchase plan information, see [Find images in the Azure Marketplace](./windows/cli-ps-findimage.md) and [Supply Azure Marketplace purchase plan information when creating images](marketplace-images.md).
6767

68+
Image definition contains metadata of the image to allow grouping of images that support same features, plan, os state., os type etc. Some of the features, securitytype can be defined
69+
70+
-Features
71+
- Accelerated Networking: Image supports Accelerated Networking
72+
73+
-Architecture
74+
- x64 or ARM64 [Architecture](https://learn.microsoft.com/cli/azure/sig/image-definition?&branch=main#az-sig-image-definition-create)
75+
76+
-SecurityType
77+
- TrustedLaunch - Image is capable of creating Trusted VMs
78+
- TrustedLaunchSupported - Image capable of creating either a Gen2 VM (or) Trusted Launch VM
79+
- [Confidential VM](https://learn.microsoft.com/azure/confidential-computing/create-confidential-vm-from-compute-gallery#confidential-vm-images) - Image capable of creating Confidential VMs
80+
- [ConfidentialVMSupported](https://learn.microsoft.com/azure/confidential-computing/create-confidential-vm-from-compute-gallery#confidential-vm-supported-images) - Image capable of creating either a Gen2 VM (or) Confidential VM
81+
- TrustedLaunchAndConfidentialVmSupported - Image capable of creating a Gen 2 VM (or) Trusted VM (or) Confidential VM
82+
83+
-Examples
84+
- CLI examples for adding [Image Definition features](https://learn.microsoft.com/cli/azure/sig/image-definition?&branch=main#az-sig-image-definition-create)
6885

6986
## Image versions
7087

0 commit comments

Comments
 (0)