diff --git a/.chronus/changes/kazrael2119-patch-1-2026-5-15-8-32-26.md b/.chronus/changes/kazrael2119-patch-1-2026-5-15-8-32-26.md new file mode 100644 index 0000000000..5f16b328c8 --- /dev/null +++ b/.chronus/changes/kazrael2119-patch-1-2026-5-15-8-32-26.md @@ -0,0 +1,8 @@ +--- +# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking +changeKind: fix +packages: + - "@azure-tools/typespec-ts" +--- + +[typespec-ts] Rename AAD / Azure Active Directory references to Microsoft Entra branding diff --git a/packages/typespec-ts/src/rlc-common/metadata/build-readme-file.ts b/packages/typespec-ts/src/rlc-common/metadata/build-readme-file.ts index df59698d87..157518cd83 100644 --- a/packages/typespec-ts/src/rlc-common/metadata/build-readme-file.ts +++ b/packages/typespec-ts/src/rlc-common/metadata/build-readme-file.ts @@ -58,11 +58,11 @@ npm install {{ clientPackageName }} ### Create and authenticate a \`{{ clientClassName }}\` -To use an [Azure Active Directory (AAD) token credential](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token), +To use a [Microsoft Entra token credential](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token), provide an instance of the desired credential type obtained from the [@azure/identity](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) library. -To authenticate with AAD, you must first \`npm\` install [\`@azure/identity\`](https://www.npmjs.com/package/@azure/identity) {{#if dependencyLink}}and +To authenticate with Microsoft Entra ID, you must first \`npm\` install [\`@azure/identity\`](https://www.npmjs.com/package/@azure/identity) {{#if dependencyLink}}and [{{dependencyDescription }}]({{ dependencyLink }}){{/if}} After setup, you can choose which type of [credential](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/identity/identity#credentials) from \`@azure/identity\` to use. @@ -134,10 +134,10 @@ npm install {{ clientPackageName }} {{#if addCredentials}} ### Create and authenticate a \`{{ clientClassName}}\` -To create a client object to access the {{ serviceName }} API, you will need the \`endpoint\` of your {{ serviceName }} resource and a \`credential\`. The {{ clientDescriptiveName }} can use Azure Active Directory credentials to authenticate. +To create a client object to access the {{ serviceName }} API, you will need the \`endpoint\` of your {{ serviceName }} resource and a \`credential\`. The {{ clientDescriptiveName }} can use Microsoft Entra credentials to authenticate. You can find the endpoint for your {{ serviceName }} resource in the [Azure Portal][azure_portal]. -You can authenticate with Azure Active Directory using a credential from the [@azure/identity][azure_identity] library or [an existing AAD Token](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token). +You can authenticate with Microsoft Entra ID using a credential from the [@azure/identity][azure_identity] library or [an existing Microsoft Entra token](https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token). To use the [DefaultAzureCredential][defaultazurecredential] provider shown below, or other credential providers provided with the Azure SDK, please install the \`@azure/identity\` package: @@ -145,9 +145,9 @@ To use the [DefaultAzureCredential][defaultazurecredential] provider shown below npm install @azure/identity \`\`\` -You will also need to **register a new AAD application and grant access to {{ serviceName}}** by assigning the suitable role to your service principal (note: roles such as \`"Owner"\` will not grant the necessary permissions). +You will also need to **register a new Microsoft Entra application and grant access to {{ serviceName}}** by assigning the suitable role to your service principal (note: roles such as \`"Owner"\` will not grant the necessary permissions). -For more information about how to create an Azure AD Application check out [this guide](https://learn.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal). +For more information about how to create a Microsoft Entra application check out [this guide](https://learn.microsoft.com/entra/identity-platform/howto-create-service-principal-portal). {{#if azureArm}} Using Node.js and Node-like environments, you can use the \`DefaultAzureCredential\` class to authenticate the client. diff --git a/packages/typespec-ts/test/azure-integration/generated/azure/resource-manager/common-properties/src/index.d.ts b/packages/typespec-ts/test/azure-integration/generated/azure/resource-manager/common-properties/src/index.d.ts index 8d0f5b7ca5..c4af7880ac 100644 --- a/packages/typespec-ts/test/azure-integration/generated/azure/resource-manager/common-properties/src/index.d.ts +++ b/packages/typespec-ts/test/azure-integration/generated/azure/resource-manager/common-properties/src/index.d.ts @@ -20,6 +20,67 @@ export declare interface ApiErrorOutput { message?: string; } +export declare interface ArmResourceIdentifierResource extends TrackedResource { + properties?: ArmResourceIdentifierResourceProperties; +} + +export declare interface ArmResourceIdentifierResourceOutput extends TrackedResourceOutput { + properties?: ArmResourceIdentifierResourcePropertiesOutput; +} + +export declare interface ArmResourceIdentifierResourceProperties { + simpleArmId: string; + armIdWithType: string; + armIdWithTypeAndScope: string; + armIdWithAllScopes: string; +} + +export declare interface ArmResourceIdentifierResourcePropertiesOutput { + readonly provisioningState: ResourceProvisioningStateOutput; + simpleArmId: string; + armIdWithType: string; + armIdWithTypeAndScope: string; + armIdWithAllScopes: string; +} + +export declare interface ArmResourceIdentifiersCreateOrReplace200Response extends HttpResponse { + status: "200"; + body: ArmResourceIdentifierResourceOutput; +} + +export declare interface ArmResourceIdentifiersCreateOrReplace201Response extends HttpResponse { + status: "201"; + body: ArmResourceIdentifierResourceOutput; +} + +export declare interface ArmResourceIdentifiersCreateOrReplaceBodyParam { + body: ArmResourceIdentifierResource; +} + +export declare interface ArmResourceIdentifiersCreateOrReplaceDefaultResponse extends HttpResponse { + status: string; + body: ErrorResponseOutput; +} + +export declare type ArmResourceIdentifiersCreateOrReplaceParameters = ArmResourceIdentifiersCreateOrReplaceBodyParam & RequestParameters; + +export declare interface ArmResourceIdentifiersGet { + get(options?: ArmResourceIdentifiersGetParameters): StreamableMethod; + put(options: ArmResourceIdentifiersCreateOrReplaceParameters): StreamableMethod; +} + +export declare interface ArmResourceIdentifiersGet200Response extends HttpResponse { + status: "200"; + body: ArmResourceIdentifierResourceOutput; +} + +export declare interface ArmResourceIdentifiersGetDefaultResponse extends HttpResponse { + status: string; + body: ErrorResponseOutput; +} + +export declare type ArmResourceIdentifiersGetParameters = RequestParameters; + export declare type AzureArmModelsCommonTypesManagedIdentityClient = Client & { path: Routes; }; @@ -63,60 +124,56 @@ export declare type CreatedByType = string; export declare type CreatedByTypeOutput = string; -export declare interface CreateForUserDefinedError200Response extends HttpResponse { +export declare interface ErrorAdditionalInfoOutput { + readonly type?: string; + readonly info?: any; +} + +export declare interface ErrorDetailOutput { + readonly code?: string; + readonly message?: string; + readonly target?: string; + readonly details?: Array; + readonly additionalInfo?: Array; +} + +export declare interface ErrorModelCreateForUserDefinedError200Response extends HttpResponse { status: "200"; body: ConfidentialResourceOutput; } -export declare interface CreateForUserDefinedError201Response extends HttpResponse { +export declare interface ErrorModelCreateForUserDefinedError201Response extends HttpResponse { status: "201"; body: ConfidentialResourceOutput; } -export declare interface CreateForUserDefinedErrorBodyParam { +export declare interface ErrorModelCreateForUserDefinedErrorBodyParam { body: ConfidentialResource; } -export declare interface CreateForUserDefinedErrorDefaultResponse extends HttpResponse { +export declare interface ErrorModelCreateForUserDefinedErrorDefaultResponse extends HttpResponse { status: string; body: CloudErrorOutput; } -export declare type CreateForUserDefinedErrorParameters = CreateForUserDefinedErrorBodyParam & RequestParameters; - -export declare interface CreateWithSystemAssigned200Response extends HttpResponse { - status: "200"; - body: ManagedIdentityTrackedResourceOutput; -} +export declare type ErrorModelCreateForUserDefinedErrorParameters = ErrorModelCreateForUserDefinedErrorBodyParam & RequestParameters; -export declare interface CreateWithSystemAssigned201Response extends HttpResponse { - status: "201"; - body: ManagedIdentityTrackedResourceOutput; +export declare interface ErrorModelGetForPredefinedError { + get(options?: ErrorModelGetForPredefinedErrorParameters): StreamableMethod; + put(options: ErrorModelCreateForUserDefinedErrorParameters): StreamableMethod; } -export declare interface CreateWithSystemAssignedBodyParam { - body: ManagedIdentityTrackedResource; +export declare interface ErrorModelGetForPredefinedError200Response extends HttpResponse { + status: "200"; + body: ConfidentialResourceOutput; } -export declare interface CreateWithSystemAssignedDefaultResponse extends HttpResponse { +export declare interface ErrorModelGetForPredefinedErrorDefaultResponse extends HttpResponse { status: string; body: ErrorResponseOutput; } -export declare type CreateWithSystemAssignedParameters = CreateWithSystemAssignedBodyParam & RequestParameters; - -export declare interface ErrorAdditionalInfoOutput { - readonly type?: string; - readonly info?: any; -} - -export declare interface ErrorDetailOutput { - readonly code?: string; - readonly message?: string; - readonly target?: string; - readonly details?: Array; - readonly additionalInfo?: Array; -} +export declare type ErrorModelGetForPredefinedErrorParameters = RequestParameters; export declare interface ErrorResponseOutput { error?: ErrorDetailOutput; @@ -128,67 +185,75 @@ export declare interface ExtensionResource extends Resource { export declare interface ExtensionResourceOutput extends ResourceOutput { } -export declare interface Get { - get(options?: GetParameters): StreamableMethod; - put(options: CreateWithSystemAssignedParameters): StreamableMethod; - patch(options: UpdateWithUserAssignedAndSystemAssignedParameters): StreamableMethod; +export declare interface Identity { + type?: ResourceIdentityType; } -export declare interface Get200Response extends HttpResponse { - status: "200"; - body: ManagedIdentityTrackedResourceOutput; +export declare interface IdentityOutput { + readonly principalId?: string; + readonly tenantId?: string; + type?: ResourceIdentityTypeOutput; } -export declare interface GetDefaultResponse extends HttpResponse { - status: string; - body: ErrorResponseOutput; +export declare interface InnerErrorOutput { + exceptiontype?: string; + errordetail?: string; } -export declare interface GetForPredefinedError { - get(options?: GetForPredefinedErrorParameters): StreamableMethod; - put(options: CreateForUserDefinedErrorParameters): StreamableMethod; -} +export { isRestError } -export declare interface GetForPredefinedError200Response extends HttpResponse { - status: "200"; - body: ConfidentialResourceOutput; -} +export declare function isUnexpected(response: ManagedIdentityGet200Response | ManagedIdentityGetDefaultResponse): response is ManagedIdentityGetDefaultResponse; -export declare interface GetForPredefinedErrorDefaultResponse extends HttpResponse { - status: string; - body: ErrorResponseOutput; -} +export declare function isUnexpected(response: ManagedIdentityCreateWithSystemAssigned200Response | ManagedIdentityCreateWithSystemAssigned201Response | ManagedIdentityCreateWithSystemAssignedDefaultResponse): response is ManagedIdentityCreateWithSystemAssignedDefaultResponse; -export declare type GetForPredefinedErrorParameters = RequestParameters; +export declare function isUnexpected(response: ManagedIdentityUpdateWithUserAssignedAndSystemAssigned200Response | ManagedIdentityUpdateWithUserAssignedAndSystemAssignedDefaultResponse): response is ManagedIdentityUpdateWithUserAssignedAndSystemAssignedDefaultResponse; -export declare type GetParameters = RequestParameters; +export declare function isUnexpected(response: ErrorModelGetForPredefinedError200Response | ErrorModelGetForPredefinedErrorDefaultResponse): response is ErrorModelGetForPredefinedErrorDefaultResponse; -export declare interface Identity { - type?: ResourceIdentityType; +export declare function isUnexpected(response: ErrorModelCreateForUserDefinedError200Response | ErrorModelCreateForUserDefinedError201Response | ErrorModelCreateForUserDefinedErrorDefaultResponse): response is ErrorModelCreateForUserDefinedErrorDefaultResponse; + +export declare function isUnexpected(response: ArmResourceIdentifiersGet200Response | ArmResourceIdentifiersGetDefaultResponse): response is ArmResourceIdentifiersGetDefaultResponse; + +export declare function isUnexpected(response: ArmResourceIdentifiersCreateOrReplace200Response | ArmResourceIdentifiersCreateOrReplace201Response | ArmResourceIdentifiersCreateOrReplaceDefaultResponse): response is ArmResourceIdentifiersCreateOrReplaceDefaultResponse; + +export declare interface ManagedIdentityCreateWithSystemAssigned200Response extends HttpResponse { + status: "200"; + body: ManagedIdentityTrackedResourceOutput; } -export declare interface IdentityOutput { - readonly principalId?: string; - readonly tenantId?: string; - type?: ResourceIdentityTypeOutput; +export declare interface ManagedIdentityCreateWithSystemAssigned201Response extends HttpResponse { + status: "201"; + body: ManagedIdentityTrackedResourceOutput; } -export declare interface InnerErrorOutput { - exceptiontype?: string; - errordetail?: string; +export declare interface ManagedIdentityCreateWithSystemAssignedBodyParam { + body: ManagedIdentityTrackedResource; } -export { isRestError } +export declare interface ManagedIdentityCreateWithSystemAssignedDefaultResponse extends HttpResponse { + status: string; + body: ErrorResponseOutput; +} -export declare function isUnexpected(response: Get200Response | GetDefaultResponse): response is GetDefaultResponse; +export declare type ManagedIdentityCreateWithSystemAssignedParameters = ManagedIdentityCreateWithSystemAssignedBodyParam & RequestParameters; -export declare function isUnexpected(response: CreateWithSystemAssigned200Response | CreateWithSystemAssigned201Response | CreateWithSystemAssignedDefaultResponse): response is CreateWithSystemAssignedDefaultResponse; +export declare interface ManagedIdentityGet { + get(options?: ManagedIdentityGetParameters): StreamableMethod; + put(options: ManagedIdentityCreateWithSystemAssignedParameters): StreamableMethod; + patch(options: ManagedIdentityUpdateWithUserAssignedAndSystemAssignedParameters): StreamableMethod; +} -export declare function isUnexpected(response: UpdateWithUserAssignedAndSystemAssigned200Response | UpdateWithUserAssignedAndSystemAssignedDefaultResponse): response is UpdateWithUserAssignedAndSystemAssignedDefaultResponse; +export declare interface ManagedIdentityGet200Response extends HttpResponse { + status: "200"; + body: ManagedIdentityTrackedResourceOutput; +} -export declare function isUnexpected(response: GetForPredefinedError200Response | GetForPredefinedErrorDefaultResponse): response is GetForPredefinedErrorDefaultResponse; +export declare interface ManagedIdentityGetDefaultResponse extends HttpResponse { + status: string; + body: ErrorResponseOutput; +} -export declare function isUnexpected(response: CreateForUserDefinedError200Response | CreateForUserDefinedError201Response | CreateForUserDefinedErrorDefaultResponse): response is CreateForUserDefinedErrorDefaultResponse; +export declare type ManagedIdentityGetParameters = RequestParameters; export declare interface ManagedIdentityTrackedResource extends TrackedResource { properties?: ManagedIdentityTrackedResourceProperties; @@ -207,6 +272,22 @@ export declare interface ManagedIdentityTrackedResourcePropertiesOutput { readonly provisioningState: string; } +export declare interface ManagedIdentityUpdateWithUserAssignedAndSystemAssigned200Response extends HttpResponse { + status: "200"; + body: ManagedIdentityTrackedResourceOutput; +} + +export declare interface ManagedIdentityUpdateWithUserAssignedAndSystemAssignedBodyParam { + body: ManagedIdentityTrackedResource; +} + +export declare interface ManagedIdentityUpdateWithUserAssignedAndSystemAssignedDefaultResponse extends HttpResponse { + status: string; + body: ErrorResponseOutput; +} + +export declare type ManagedIdentityUpdateWithUserAssignedAndSystemAssignedParameters = ManagedIdentityUpdateWithUserAssignedAndSystemAssignedBodyParam & RequestParameters; + export declare interface ManagedServiceIdentity { type: ManagedServiceIdentityType; userAssignedIdentities?: Record; @@ -340,11 +421,16 @@ export declare interface ResourceOutput { readonly systemData?: SystemDataOutput; } +export declare type ResourceProvisioningState = string; + +export declare type ResourceProvisioningStateOutput = string; + export { RestError } export declare interface Routes { - (path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", subscriptionId: string, resourceGroupName: string, managedIdentityTrackedResourceName: string): Get; - (path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/confidentialResources/{confidentialResourceName}", subscriptionId: string, resourceGroupName: string, confidentialResourceName: string): GetForPredefinedError; + (path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/managedIdentityTrackedResources/{managedIdentityTrackedResourceName}", subscriptionId: string, resourceGroupName: string, managedIdentityTrackedResourceName: string): ManagedIdentityGet; + (path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/confidentialResources/{confidentialResourceName}", subscriptionId: string, resourceGroupName: string, confidentialResourceName: string): ErrorModelGetForPredefinedError; + (path: "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Azure.ResourceManager.CommonProperties/armResourceIdentifierResources/{armResourceIdentifierResourceName}", subscriptionId: string, resourceGroupName: string, armResourceIdentifierResourceName: string): ArmResourceIdentifiersGet; } export declare interface Sku { @@ -395,22 +481,6 @@ export declare interface TrackedResourceOutput extends ResourceOutput { location: string; } -export declare interface UpdateWithUserAssignedAndSystemAssigned200Response extends HttpResponse { - status: "200"; - body: ManagedIdentityTrackedResourceOutput; -} - -export declare interface UpdateWithUserAssignedAndSystemAssignedBodyParam { - body: ManagedIdentityTrackedResource; -} - -export declare interface UpdateWithUserAssignedAndSystemAssignedDefaultResponse extends HttpResponse { - status: string; - body: ErrorResponseOutput; -} - -export declare type UpdateWithUserAssignedAndSystemAssignedParameters = UpdateWithUserAssignedAndSystemAssignedBodyParam & RequestParameters; - export declare interface UserAssignedIdentity { } diff --git a/packages/typespec-ts/test/azure-modular-integration/azure-arm-managed-identity.test.ts b/packages/typespec-ts/test/azure-modular-integration/azure-arm-managed-identity.test.ts index 7ad7060ddd..76793c443d 100644 --- a/packages/typespec-ts/test/azure-modular-integration/azure-arm-managed-identity.test.ts +++ b/packages/typespec-ts/test/azure-modular-integration/azure-arm-managed-identity.test.ts @@ -71,7 +71,7 @@ describe("Azure Arm Resources Rest Client", () => { // managed identity tracked resource it("should get models commonTypes managedIdentityTrackedResources", async () => { - const result = await client.get(RESOURCE_GROUP_EXPECTED, "identity"); + const result = await client.managedIdentity.get(RESOURCE_GROUP_EXPECTED, "identity"); assert.strictEqual(result.id, validSystemAssignedManagedIdentityResource.id); assert.strictEqual(result.location, validSystemAssignedManagedIdentityResource.location); assert.strictEqual( @@ -91,10 +91,14 @@ describe("Azure Arm Resources Rest Client", () => { }); it("should put models commonTypes managedIdentityTrackedResources", async () => { - const result = await client.createWithSystemAssigned(RESOURCE_GROUP_EXPECTED, "identity", { - location: LOCATION_REGION_EXPECTED, - identity: createExpectedIdentity, - }); + const result = await client.managedIdentity.createWithSystemAssigned( + RESOURCE_GROUP_EXPECTED, + "identity", + { + location: LOCATION_REGION_EXPECTED, + identity: createExpectedIdentity, + }, + ); assert.strictEqual(result.id, validSystemAssignedManagedIdentityResource.id); assert.strictEqual(result.location, validSystemAssignedManagedIdentityResource.location); assert.strictEqual( @@ -114,7 +118,7 @@ describe("Azure Arm Resources Rest Client", () => { }); it("should patch models commonTypes managedIdentityTrackedResources", async () => { - const result = await client.updateWithUserAssignedAndSystemAssigned( + const result = await client.managedIdentity.updateWithUserAssignedAndSystemAssigned( RESOURCE_GROUP_EXPECTED, "identity", { @@ -142,7 +146,7 @@ describe("Azure Arm Resources Rest Client", () => { describe("Error Handling", () => { it("should handle predefined error for resource not found (404)", async () => { try { - await client.getForPredefinedError(RESOURCE_GROUP_EXPECTED, "confidential"); + await client.error.getForPredefinedError(RESOURCE_GROUP_EXPECTED, "confidential"); assert.fail("Should have thrown an error for resource not found"); } catch (error: any) { // Azure Modular clients use createRestError which creates errors with statusCode property @@ -158,7 +162,7 @@ describe("Azure Arm Resources Rest Client", () => { // skipping this test as https://github.com/Azure/autorest.typescript/issues/2965 it.skip("should handle user-defined error for bad request (400)", async () => { try { - await client.createForUserDefinedError(RESOURCE_GROUP_EXPECTED, "confidential", { + await client.error.createForUserDefinedError(RESOURCE_GROUP_EXPECTED, "confidential", { location: "eastus", properties: { username: "00", diff --git a/packages/typespec-ts/test/azure-modular-integration/generated/azure/resource-manager/common-properties/src/index.d.ts b/packages/typespec-ts/test/azure-modular-integration/generated/azure/resource-manager/common-properties/src/index.d.ts index 9f3a32d157..3a52503239 100644 --- a/packages/typespec-ts/test/azure-modular-integration/generated/azure/resource-manager/common-properties/src/index.d.ts +++ b/packages/typespec-ts/test/azure-modular-integration/generated/azure/resource-manager/common-properties/src/index.d.ts @@ -18,6 +18,29 @@ export declare interface ApiErrorBase { message?: string; } +export declare interface ArmResourceIdentifierResource extends TrackedResource { + properties?: ArmResourceIdentifierResourceProperties; +} + +export declare interface ArmResourceIdentifierResourceProperties { + readonly provisioningState: ResourceProvisioningState; + simpleArmId: string; + armIdWithType: string; + armIdWithTypeAndScope: string; + armIdWithAllScopes: string; +} + +export declare interface ArmResourceIdentifiersCreateOrReplaceOptionalParams extends OperationOptions { +} + +export declare interface ArmResourceIdentifiersGetOptionalParams extends OperationOptions { +} + +export declare interface ArmResourceIdentifiersOperations { + createOrReplace: (resourceGroupName: string, armResourceIdentifierResourceName: string, resource: ArmResourceIdentifierResource, options?: ArmResourceIdentifiersCreateOrReplaceOptionalParams) => Promise; + get: (resourceGroupName: string, armResourceIdentifierResourceName: string, options?: ArmResourceIdentifiersGetOptionalParams) => Promise; +} + export declare enum AzureClouds { AZURE_PUBLIC_CLOUD = "AZURE_PUBLIC_CLOUD", AZURE_CHINA_CLOUD = "AZURE_CHINA_CLOUD", @@ -34,11 +57,9 @@ export declare class CommonPropertiesClient { private _client; readonly pipeline: Pipeline; constructor(subscriptionId: string, options?: CommonPropertiesClientOptionalParams); - createForUserDefinedError(resourceGroupName: string, confidentialResourceName: string, resource: ConfidentialResource, options?: CreateForUserDefinedErrorOptionalParams): Promise; - getForPredefinedError(resourceGroupName: string, confidentialResourceName: string, options?: GetForPredefinedErrorOptionalParams): Promise; - updateWithUserAssignedAndSystemAssigned(resourceGroupName: string, managedIdentityTrackedResourceName: string, properties: ManagedIdentityTrackedResource, options?: UpdateWithUserAssignedAndSystemAssignedOptionalParams): Promise; - createWithSystemAssigned(resourceGroupName: string, managedIdentityTrackedResourceName: string, resource: ManagedIdentityTrackedResource, options?: CreateWithSystemAssignedOptionalParams): Promise; - get(resourceGroupName: string, managedIdentityTrackedResourceName: string, options?: GetOptionalParams): Promise; + readonly armResourceIdentifiers: ArmResourceIdentifiersOperations; + readonly error: ErrorOperations; + readonly managedIdentity: ManagedIdentityOperations; } export declare interface CommonPropertiesClientOptionalParams extends ClientOptions { @@ -57,17 +78,14 @@ export declare interface ConfidentialResourceProperties { export declare type CreatedByType = string; -export declare interface CreateForUserDefinedErrorOptionalParams extends OperationOptions { -} - -export declare interface CreateWithSystemAssignedOptionalParams extends OperationOptions { -} - export declare interface ErrorAdditionalInfo { readonly type?: string; readonly info?: any; } +export declare interface ErrorCreateForUserDefinedErrorOptionalParams extends OperationOptions { +} + export declare interface ErrorDetail { readonly code?: string; readonly message?: string; @@ -76,14 +94,16 @@ export declare interface ErrorDetail { readonly additionalInfo?: ErrorAdditionalInfo[]; } -export declare interface ErrorResponse { - error?: ErrorDetail; +export declare interface ErrorGetForPredefinedErrorOptionalParams extends OperationOptions { } -export declare interface GetForPredefinedErrorOptionalParams extends OperationOptions { +export declare interface ErrorOperations { + createForUserDefinedError: (resourceGroupName: string, confidentialResourceName: string, resource: ConfidentialResource, options?: ErrorCreateForUserDefinedErrorOptionalParams) => Promise; + getForPredefinedError: (resourceGroupName: string, confidentialResourceName: string, options?: ErrorGetForPredefinedErrorOptionalParams) => Promise; } -export declare interface GetOptionalParams extends OperationOptions { +export declare interface ErrorResponse { + error?: ErrorDetail; } export declare interface InnerError { @@ -107,10 +127,28 @@ export declare enum KnownManagedServiceIdentityType { SystemAssignedUserAssigned = "SystemAssigned,UserAssigned" } +export declare enum KnownResourceProvisioningState { + Succeeded = "Succeeded", + Failed = "Failed", + Canceled = "Canceled" +} + export declare enum KnownVersions { V20231201Preview = "2023-12-01-preview" } +export declare interface ManagedIdentityCreateWithSystemAssignedOptionalParams extends OperationOptions { +} + +export declare interface ManagedIdentityGetOptionalParams extends OperationOptions { +} + +export declare interface ManagedIdentityOperations { + updateWithUserAssignedAndSystemAssigned: (resourceGroupName: string, managedIdentityTrackedResourceName: string, properties: ManagedIdentityTrackedResource, options?: ManagedIdentityUpdateWithUserAssignedAndSystemAssignedOptionalParams) => Promise; + createWithSystemAssigned: (resourceGroupName: string, managedIdentityTrackedResourceName: string, resource: ManagedIdentityTrackedResource, options?: ManagedIdentityCreateWithSystemAssignedOptionalParams) => Promise; + get: (resourceGroupName: string, managedIdentityTrackedResourceName: string, options?: ManagedIdentityGetOptionalParams) => Promise; +} + export declare interface ManagedIdentityTrackedResource extends TrackedResource { properties?: ManagedIdentityTrackedResourceProperties; identity?: ManagedServiceIdentity; @@ -120,6 +158,9 @@ export declare interface ManagedIdentityTrackedResourceProperties { readonly provisioningState: string; } +export declare interface ManagedIdentityUpdateWithUserAssignedAndSystemAssignedOptionalParams extends OperationOptions { +} + export declare interface ManagedServiceIdentity { readonly principalId?: string; readonly tenantId?: string; @@ -136,6 +177,8 @@ export declare interface Resource { readonly systemData?: SystemData; } +export declare type ResourceProvisioningState = string; + export { RestError } export declare interface SystemData { @@ -152,9 +195,6 @@ export declare interface TrackedResource extends Resource { location: string; } -export declare interface UpdateWithUserAssignedAndSystemAssignedOptionalParams extends OperationOptions { -} - export declare interface UserAssignedIdentity { readonly principalId?: string; readonly clientId?: string;