Skip to content

Commit 764e95d

Browse files
bgriddalurubgriddaluru
committed
Merge branch 'main' into upgradeAssessment
2 parents 6fdddc3 + c301191 commit 764e95d

454 files changed

Lines changed: 41344 additions & 4471 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/arm-leases/securitycontext/Microsoft.SecurityContext/SecurityContext/lease.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
lease:
2+
resource-provider: Microsoft.SecurityContext
3+
startdate: "2026-06-30"
4+
duration: P180D
5+
reviewer: "@vikeshi26"

‎.github/workflows/src/summarize-checks/labelling.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,7 @@ const rulesPri0dataPlane = [
838838
anyRequiredLabels: ["APIStewardshipBoard-SignedOff"],
839839
troubleshootingGuide:
840840
`Your PR requires an API stewardship board review as it introduces a new API version (label: <code>new-api-version</code>). ` +
841-
`Schedule the review by following ` +
842-
`${href("aka.ms/azsdk/onboarding/restapischedule", "https://aka.ms/azsdk/onboarding/restapischedule")}.`,
841+
`Send an email to ${href("azureapirbcore@microsoft.com", "mailto:azureapirbcore@microsoft.com")} with your PR link for offline review.`,
843842
},
844843
];
845844

‎package-lock.json‎

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@azure-tools/typespec-autorest": "0.69.1",
1010
"@azure-tools/typespec-azure-core": "0.69.0",
1111
"@azure-tools/typespec-azure-portal-core": "0.69.0",
12-
"@azure-tools/typespec-azure-resource-manager": "0.69.1",
12+
"@azure-tools/typespec-azure-resource-manager": "0.69.2",
1313
"@azure-tools/typespec-azure-rulesets": "0.69.1",
1414
"@azure-tools/typespec-client-generator-cli": "0.33.1",
1515
"@azure-tools/typespec-client-generator-core": "0.69.0",

‎specification/azurearcdata/AzureArcData.Management/tspconfig.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ options:
2929
flavor: "azure"
3030
experimental-extensible-enums: true
3131
package-details:
32-
name: "@azure/arm-azurearcdata"
32+
name: "@azure/arm-arcdata"
3333
"@azure-tools/typespec-go":
3434
service-dir: "sdk/resourcemanager/azurearcdata"
3535
emitter-output-dir: "{output-dir}/{service-dir}/armazurearcdata"

‎specification/billingtrust/resource-manager/Microsoft.BillingTrust/BillingTrust/client.tsp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,9 @@ using Microsoft.BillingTrust;
55
using Azure.ClientGenerator.Core;
66

77
@@clientName(ProvisioningState, "BillingTrustProvisioningState", "csharp");
8+
@@clientName(Microsoft.BillingTrust, "BillingTrustMgmtClient", "python");
9+
@@clientName(
10+
GenerateUploadTokenResponse,
11+
"GenerateUploadTokenResult",
12+
"csharp"
13+
);

‎specification/cloudhealth/CloudHealth.Management/examples/2026-01-01-preview/AuthenticationSettings_CreateOrUpdate.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"operationId": "AuthenticationSettings_CreateOrUpdate",
44
"parameters": {
55
"api-version": "2026-01-01-preview",
6-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
7-
"resourceGroupName": "myResourceGroup",
8-
"healthModelName": "myHealthModel",
9-
"authenticationSettingName": "myAuthSetting",
6+
"subscriptionId": "abcdef12-3456-7890-abcd-ef1234567890",
7+
"resourceGroupName": "online-store-rg",
8+
"healthModelName": "online-store",
9+
"authenticationSettingName": "default-auth",
1010
"resource": {
1111
"properties": {
1212
"managedIdentityName": "SystemAssigned",
13-
"displayName": "myDisplayName",
13+
"displayName": "Default managed identity",
1414
"authenticationKind": "ManagedIdentity"
1515
}
1616
}
@@ -21,19 +21,19 @@
2121
"properties": {
2222
"managedIdentityName": "SystemAssigned",
2323
"provisioningState": "Succeeded",
24-
"displayName": "myDisplayName",
24+
"displayName": "Default managed identity",
2525
"authenticationKind": "ManagedIdentity"
2626
},
27-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.CloudHealth/healthModels/myHealthModel/authenticationSettings/myAuthSetting",
28-
"name": "myAuthSetting",
29-
"type": "Microsoft.CloudHealth/healthModels/authenticationSettings",
27+
"id": "/subscriptions/abcdef12-3456-7890-abcd-ef1234567890/resourceGroups/online-store-rg/providers/Microsoft.CloudHealth/healthmodels/online-store/authenticationSettings/default-auth",
28+
"name": "default-auth",
29+
"type": "Microsoft.CloudHealth/healthmodels/authenticationSettings",
3030
"systemData": {
31-
"createdBy": "myCreatedBy",
31+
"createdBy": "admin@contoso.com",
3232
"createdByType": "User",
33-
"createdAt": "2023-09-18T14:04:09.327Z",
34-
"lastModifiedBy": "myLastModifiedBy",
33+
"createdAt": "2026-05-04T08:15:00.000Z",
34+
"lastModifiedBy": "admin@contoso.com",
3535
"lastModifiedByType": "User",
36-
"lastModifiedAt": "2023-09-18T14:04:09.328Z"
36+
"lastModifiedAt": "2026-05-04T09:30:00.000Z"
3737
}
3838
}
3939
},
@@ -42,19 +42,19 @@
4242
"properties": {
4343
"managedIdentityName": "SystemAssigned",
4444
"provisioningState": "Succeeded",
45-
"displayName": "myDisplayName",
45+
"displayName": "Default managed identity",
4646
"authenticationKind": "ManagedIdentity"
4747
},
48-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.CloudHealth/healthModels/myHealthModel/authenticationSettings/myAuthSetting",
49-
"name": "myAuthSetting",
50-
"type": "Microsoft.CloudHealth/healthModels/authenticationSettings",
48+
"id": "/subscriptions/abcdef12-3456-7890-abcd-ef1234567890/resourceGroups/online-store-rg/providers/Microsoft.CloudHealth/healthmodels/online-store/authenticationSettings/default-auth",
49+
"name": "default-auth",
50+
"type": "Microsoft.CloudHealth/healthmodels/authenticationSettings",
5151
"systemData": {
52-
"createdBy": "myCreatedBy",
52+
"createdBy": "admin@contoso.com",
5353
"createdByType": "User",
54-
"createdAt": "2023-09-18T14:04:09.327Z",
55-
"lastModifiedBy": "myLastModifiedBy",
54+
"createdAt": "2026-05-04T08:15:00.000Z",
55+
"lastModifiedBy": "admin@contoso.com",
5656
"lastModifiedByType": "User",
57-
"lastModifiedAt": "2023-09-18T14:04:09.328Z"
57+
"lastModifiedAt": "2026-05-04T09:30:00.000Z"
5858
}
5959
}
6060
}

‎specification/cloudhealth/CloudHealth.Management/examples/2026-01-01-preview/AuthenticationSettings_Delete.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"operationId": "AuthenticationSettings_Delete",
44
"parameters": {
55
"api-version": "2026-01-01-preview",
6-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
7-
"resourceGroupName": "my-resource-group",
8-
"healthModelName": "my-health-model",
9-
"authenticationSettingName": "my-auth-setting"
6+
"subscriptionId": "abcdef12-3456-7890-abcd-ef1234567890",
7+
"resourceGroupName": "online-store-rg",
8+
"healthModelName": "online-store",
9+
"authenticationSettingName": "default-auth"
1010
},
1111
"responses": {
1212
"202": {
1313
"headers": {
14-
"location": "https://contoso.com/operationstatus"
14+
"location": "https://management.azure.com/subscriptions/abcdef12-3456-7890-abcd-ef1234567890/providers/Microsoft.CloudHealth/locations/eastus/operations/d5bae4c3-6f70-8192-a3b4-c5d6e7f8091a?api-version=2026-01-01-preview"
1515
}
1616
},
1717
"204": {}

‎specification/cloudhealth/CloudHealth.Management/examples/2026-01-01-preview/AuthenticationSettings_Get.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
"operationId": "AuthenticationSettings_Get",
44
"parameters": {
55
"api-version": "2026-01-01-preview",
6-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
7-
"resourceGroupName": "my-resource-group",
8-
"healthModelName": "my-health-model",
9-
"authenticationSettingName": "my-auth-setting"
6+
"subscriptionId": "abcdef12-3456-7890-abcd-ef1234567890",
7+
"resourceGroupName": "online-store-rg",
8+
"healthModelName": "online-store",
9+
"authenticationSettingName": "default-auth"
1010
},
1111
"responses": {
1212
"200": {
1313
"body": {
1414
"properties": {
1515
"managedIdentityName": "SystemAssigned",
1616
"provisioningState": "Succeeded",
17-
"displayName": "my-display-name",
17+
"displayName": "Default managed identity",
1818
"authenticationKind": "ManagedIdentity"
1919
},
20-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-resource-group/providers/Microsoft.CloudHealth/healthmodels/my-health-model/authenticationSettings/my-auth-setting",
21-
"name": "my-name",
20+
"id": "/subscriptions/abcdef12-3456-7890-abcd-ef1234567890/resourceGroups/online-store-rg/providers/Microsoft.CloudHealth/healthmodels/online-store/authenticationSettings/default-auth",
21+
"name": "default-auth",
2222
"type": "Microsoft.CloudHealth/healthmodels/authenticationSettings",
2323
"systemData": {
24-
"createdBy": "my-username",
24+
"createdBy": "admin@contoso.com",
2525
"createdByType": "User",
26-
"createdAt": "2023-09-18T14:04:09.327Z",
27-
"lastModifiedBy": "my-username",
26+
"createdAt": "2026-05-04T08:15:00.000Z",
27+
"lastModifiedBy": "admin@contoso.com",
2828
"lastModifiedByType": "User",
29-
"lastModifiedAt": "2023-09-18T14:04:09.328Z"
29+
"lastModifiedAt": "2026-05-04T09:30:00.000Z"
3030
}
3131
}
3232
}

‎specification/cloudhealth/CloudHealth.Management/examples/2026-01-01-preview/AuthenticationSettings_ListByHealthModel.json‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"operationId": "AuthenticationSettings_ListByHealthModel",
44
"parameters": {
55
"api-version": "2026-01-01-preview",
6-
"subscriptionId": "00000000-0000-0000-0000-000000000000",
7-
"resourceGroupName": "my-resource-group",
8-
"healthModelName": "my-health-model"
6+
"subscriptionId": "abcdef12-3456-7890-abcd-ef1234567890",
7+
"resourceGroupName": "online-store-rg",
8+
"healthModelName": "online-store"
99
},
1010
"responses": {
1111
"200": {
@@ -15,23 +15,41 @@
1515
"properties": {
1616
"managedIdentityName": "SystemAssigned",
1717
"provisioningState": "Succeeded",
18-
"displayName": "my-display-name",
18+
"displayName": "Default managed identity",
1919
"authenticationKind": "ManagedIdentity"
2020
},
21-
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-resource-group/providers/Microsoft.CloudHealth/healthModels/my-health-model/authenticationSettings/my-name",
22-
"name": "my-name",
23-
"type": "Microsoft.CloudHealth/healthModels/authenticationSettings",
21+
"id": "/subscriptions/abcdef12-3456-7890-abcd-ef1234567890/resourceGroups/online-store-rg/providers/Microsoft.CloudHealth/healthmodels/online-store/authenticationSettings/default-auth",
22+
"name": "default-auth",
23+
"type": "Microsoft.CloudHealth/healthmodels/authenticationSettings",
2424
"systemData": {
25-
"createdBy": "my-user",
25+
"createdBy": "admin@contoso.com",
2626
"createdByType": "User",
27-
"createdAt": "2023-09-18T14:04:09.327Z",
28-
"lastModifiedBy": "my-user",
27+
"createdAt": "2026-05-04T08:15:00.000Z",
28+
"lastModifiedBy": "admin@contoso.com",
2929
"lastModifiedByType": "User",
30-
"lastModifiedAt": "2023-09-18T14:04:09.328Z"
30+
"lastModifiedAt": "2026-05-04T09:30:00.000Z"
31+
}
32+
},
33+
{
34+
"properties": {
35+
"managedIdentityName": "/subscriptions/abcdef12-3456-7890-abcd-ef1234567890/resourceGroups/online-store-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/online-store-identity",
36+
"provisioningState": "Succeeded",
37+
"displayName": "User-assigned managed identity",
38+
"authenticationKind": "ManagedIdentity"
39+
},
40+
"id": "/subscriptions/abcdef12-3456-7890-abcd-ef1234567890/resourceGroups/online-store-rg/providers/Microsoft.CloudHealth/healthmodels/online-store/authenticationSettings/user-assigned-auth",
41+
"name": "user-assigned-auth",
42+
"type": "Microsoft.CloudHealth/healthmodels/authenticationSettings",
43+
"systemData": {
44+
"createdBy": "admin@contoso.com",
45+
"createdByType": "User",
46+
"createdAt": "2026-05-04T08:15:00.000Z",
47+
"lastModifiedBy": "admin@contoso.com",
48+
"lastModifiedByType": "User",
49+
"lastModifiedAt": "2026-05-04T09:30:00.000Z"
3150
}
3251
}
33-
],
34-
"nextLink": "https://microsoft.com/ahgxpg"
52+
]
3553
}
3654
}
3755
}

0 commit comments

Comments
 (0)