Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
lavisha1507 authored Jan 31, 2025
2 parents ba2b421 + d96c413 commit 456c749
Show file tree
Hide file tree
Showing 75 changed files with 9,386 additions and 15 deletions.
7 changes: 4 additions & 3 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1182,9 +1182,10 @@ configuration:
then:
- mentionUsers:
mentionees:
- RandalliLama
- schaabs
- jlichwa
- cheathamb36
- chen-karen
- lgonsoulin
- vickm
replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
assignMentionees: False
- if:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment within a subscription",
"summary": "[UNSUPPORTED] Get configuration assignment within a subscription. This API is not implemented yet.",
"operationId": "ConfigurationAssignmentsWithinSubscription_List",
"consumes": [],
"produces": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment within a subscription",
"summary": "[UNSUPPORTED] Get configuration assignment within a subscription. This API is not implemented yet.",
"operationId": "ConfigurationAssignmentsWithinSubscription_List",
"consumes": [],
"produces": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment within a subscription",
"summary": "[UNSUPPORTED] Get configuration assignment within a subscription. This API is not implemented yet.",
"operationId": "ConfigurationAssignmentsWithinSubscription_List",
"consumes": [],
"produces": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment within a subscription",
"summary": "[UNSUPPORTED] Get configuration assignment within a subscription. This API is not implemented yet.",
"operationId": "ConfigurationAssignmentsWithinSubscription_List",
"consumes": [],
"produces": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment within a subscription",
"summary": "[UNSUPPORTED] Get configuration assignment within a subscription. This API is not implemented yet.",
"operationId": "ConfigurationAssignmentsWithinSubscription_List",
"consumes": [],
"produces": [
Expand Down Expand Up @@ -1701,7 +1701,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment",
"summary": "[UNSUPPORTED] Get configuration assignment. This API is not implemented yet.",
"description": "Get configuration assignment for resource..",
"operationId": "ConfigurationAssignmentsForSubscriptions_Get",
"consumes": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1722,7 +1722,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment within a subscription",
"summary": "[UNSUPPORTED] Get configuration assignment within a subscription. This API is not implemented yet.",
"operationId": "ConfigurationAssignmentsWithinSubscription_List",
"consumes": [],
"produces": [
Expand Down Expand Up @@ -1765,8 +1765,8 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment",
"description": "Get configuration assignment for resource..",
"summary": "[UNSUPPORTED] Get configuration assignment. This API is not implemented yet.",
"description": "Get configuration assignment for resource.",
"operationId": "ConfigurationAssignmentsForSubscriptions_Get",
"consumes": [
"application/json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment within a subscription. This API is not implemented yet.",
"summary": "[UNSUPPORTED] Get configuration assignment within a subscription. This API is not implemented yet.",
"operationId": "ConfigurationAssignmentsWithinSubscription_List",
"consumes": [],
"produces": [
Expand Down Expand Up @@ -1516,8 +1516,8 @@
"tags": [
"ConfigurationAssignments"
],
"summary": "Get configuration assignment",
"description": "Get configuration assignment for resource..",
"summary": "[UNSUPPORTED] Get configuration assignment. This API is not implemented yet.",
"description": "Get configuration assignment for resource.",
"operationId": "ConfigurationAssignmentsForSubscriptions_Get",
"consumes": [
"application/json"
Expand Down
32 changes: 32 additions & 0 deletions specification/sovereign/Sovereign.Management/common.tsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import "@azure-tools/typespec-azure-core";
import "@azure-tools/typespec-azure-resource-manager";
import "@typespec/versioning";

using Azure.ResourceManager;
using Azure.Core;
using TypeSpec.Versioning;

namespace Microsoft.Sovereign;

@doc("The Microsoft Sovereign Provider version.")
enum Versions {
@useDependency(Azure.Core.Versions.v1_0_Preview_1)
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
@doc("Public preview version.")
Preview20250227: "2025-02-27-preview",
}

@added(Versions.Preview20250227)
@doc("The custom provisioning state.")
union provisioningState {
ResourceProvisioningState,

@doc("The state of the resource when creating")
Creating: "Creating",

@doc("The state of the resource when updating")
Updating: "Updating",

@doc("The state of the resource when deleting")
Deleting: "Deleting",
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"title": "LandingZoneAccountOperations_Create",
"operationId": "LandingZoneAccountOperations_Create",
"parameters": {
"api-version": "2025-02-27-preview",
"subscriptionId": "9B52DE5E-FE73-4C8B-8968-1E8F0097DDB8",
"resourceGroupName": "ExampleResourceGroup",
"landingZoneAccountName": "ExampleLZA",
"resource": {
"properties": {
"storageAccount": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/TestStorageAccount/providers/Microsoft.Storage/storageAccounts/teststcontainer"
},
"identity": {
"type": "SystemAssigned"
},
"tags": {
"tag1": "MCFS"
},
"location": "northeurope"
}
},
"responses": {
"200": {
"body": {
"properties": {
"provisioningState": "Succeeded",
"storageAccount": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Storage/storageAccounts/teststcontainer"
},
"identity": {
"principalId": "e7953ada-b215-4c82-9a4c-7b8dd6e09beb",
"tenantId": "8a7a0a60-587f-4774-af1f-4cbf9f1edb6b",
"type": "SystemAssigned"
},
"tags": {
"tag1": "MCFS"
},
"id": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Sovereign/landingZoneAccounts/ExampleLZA",
"name": "ExampleLZA",
"type": "microsoft.sovereign/landingzoneaccounts",
"location": "northeurope",
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2024-09-25T15:27:06.6937323Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-09-25T18:35:56.1267273Z"
}
}
},
"201": {
"headers": {
"Azure-AsyncOperation": "https://contoso.com/operationstatus"
},
"body": {
"properties": {
"provisioningState": "Succeeded",
"storageAccount": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Storage/storageAccounts/teststcontainer"
},
"identity": {
"principalId": "e7953ada-b215-4c82-9a4c-7b8dd6e09beb",
"tenantId": "8a7a0a60-587f-4774-af1f-4cbf9f1edb6b",
"type": "SystemAssigned"
},
"tags": {
"tag1": "MCFS"
},
"id": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Sovereign/landingZoneAccounts/ExampleLZA",
"name": "ExampleLZA",
"type": "microsoft.sovereign/landingzoneaccounts",
"location": "northeurope",
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2024-09-25T15:27:06.6937323Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-09-25T18:35:56.1267273Z"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"title": "LandingZoneAccountOperations_Delete",
"operationId": "LandingZoneAccountOperations_Delete",
"parameters": {
"api-version": "2025-02-27-preview",
"subscriptionId": "9B52DE5E-FE73-4C8B-8968-1E8F0097DDB8",
"resourceGroupName": "ExampleResourceGroup",
"landingZoneAccountName": "ExampleLZA"
},
"responses": {
"202": {
"headers": {
"location": "https://contoso.com/operationstatus"
}
},
"204": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"title": "LandingZoneAccountOperations_Get",
"operationId": "LandingZoneAccountOperations_Get",
"parameters": {
"api-version": "2025-02-27-preview",
"subscriptionId": "9B52DE5E-FE73-4C8B-8968-1E8F0097DDB8",
"resourceGroupName": "ExampleResourceGroup",
"landingZoneAccountName": "ExampleLZA"
},
"responses": {
"200": {
"body": {
"properties": {
"provisioningState": "Succeeded",
"storageAccount": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Storage/storageAccounts/teststcontainer"
},
"identity": {
"principalId": "e7953ada-b215-4c82-9a4c-7b8dd6e09beb",
"tenantId": "8a7a0a60-587f-4774-af1f-4cbf9f1edb6b",
"type": "SystemAssigned"
},
"tags": {
"tag1": "MCFS"
},
"id": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Sovereign/landingZoneAccounts/ExampleLZA",
"name": "ExampleLZA",
"type": "microsoft.sovereign/landingzoneaccounts",
"location": "northeurope",
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2024-09-25T15:27:06.6937323Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-09-25T18:35:56.1267273Z"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"title": "LandingZoneAccountOperations_ListByResourceGroup_MaximumSet_Gen - generated by [MaximumSet] rule",
"operationId": "LandingZoneAccountOperations_ListByResourceGroup",
"parameters": {
"api-version": "2025-02-27-preview",
"subscriptionId": "9B52DE5E-FE73-4C8B-8968-1E8F0097DDB8",
"resourceGroupName": "rgsovereign"
},
"responses": {
"200": {
"body": {
"value": [
{
"properties": {
"provisioningState": "Succeeded",
"storageAccount": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Storage/storageAccounts/teststcontainer"
},
"identity": {
"principalId": "e7953ada-b215-4c82-9a4c-7b8dd6e09beb",
"tenantId": "8a7a0a60-587f-4774-af1f-4cbf9f1edb6b",
"type": "SystemAssigned"
},
"tags": {
"tag1": "MCFS"
},
"id": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Sovereign/landingZoneAccounts/ExampleLZA",
"name": "ExampleLZA",
"type": "microsoft.sovereign/landingzoneaccounts",
"location": "northeurope",
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2024-09-25T15:27:06.6937323Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-09-25T18:35:56.1267273Z"
}
}
],
"nextLink": "https://microsoft.com/a"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"title": "LandingZoneAccountOperations_ListBySubscription",
"operationId": "LandingZoneAccountOperations_ListBySubscription",
"parameters": {
"api-version": "2025-02-27-preview",
"subscriptionId": "9B52DE5E-FE73-4C8B-8968-1E8F0097DDB8"
},
"responses": {
"200": {
"body": {
"value": [
{
"properties": {
"provisioningState": "Succeeded",
"storageAccount": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Storage/storageAccounts/teststcontainer"
},
"identity": {
"principalId": "e7953ada-b215-4c82-9a4c-7b8dd6e09beb",
"tenantId": "8a7a0a60-587f-4774-af1f-4cbf9f1edb6b",
"type": "SystemAssigned"
},
"tags": {
"tag1": "MCFS"
},
"id": "/subscriptions/22b62f96-c8d5-4131-97f8-f820a5a3c55f/resourceGroups/ExampleResourceGroup/providers/Microsoft.Sovereign/landingZoneAccounts/ExampleLZA",
"name": "ExampleLZA",
"type": "microsoft.sovereign/landingzoneaccounts",
"location": "northeurope",
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2024-09-25T15:27:06.6937323Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2024-09-25T18:35:56.1267273Z"
}
}
],
"nextLink": "https://microsoft.com/a"
}
}
}
}
Loading

0 comments on commit 456c749

Please sign in to comment.