diff --git a/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs b/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs index 31954d2c7f29..ba12e698ad25 100644 --- a/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs +++ b/common/ManagementTestShared/Redesign/ManagementRecordedTestBase.cs @@ -73,6 +73,13 @@ private void Initialize() private void IgnoreArmCoreDependencyVersions() { + // Ignore the api-version of tenant operations + UriRegexSanitizers.Add(new UriRegexSanitizer( + @"/tenants\?api-version=(?[a-z0-9-]+)", "**" + ) + { + GroupForReplace = "group" + }); // Ignore the api-version of subscription operations UriRegexSanitizers.Add(new UriRegexSanitizer( @"/subscriptions/[^/]+api-version=(?[a-z0-9-]+)", "**" @@ -80,7 +87,12 @@ private void IgnoreArmCoreDependencyVersions() { GroupForReplace = "group" }); - + UriRegexSanitizers.Add(new UriRegexSanitizer( + @"/subscriptions/([^/]+)/locations\?api-version=(?[a-z0-9-]+)", "**" + ) + { + GroupForReplace = "group" + }); // Ignore the api-version of resource group operations UriRegexSanitizers.Add(new UriRegexSanitizer( @"/resourcegroups/[^/]+api-version=(?[a-z0-9-]+)", "**" diff --git a/sdk/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation/assets.json b/sdk/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation/assets.json index 3dfa4ef22e57..1fe93edc41aa 100644 --- a/sdk/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation/assets.json +++ b/sdk/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation", - "Tag": "net/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation_2825624a1e" + "Tag": "net/appcomplianceautomation/Azure.ResourceManager.AppComplianceAutomation_4b13db35a6" } diff --git a/sdk/authorization/Azure.ResourceManager.Authorization/assets.json b/sdk/authorization/Azure.ResourceManager.Authorization/assets.json index 1aeaf058eaf2..15c28fe61e71 100644 --- a/sdk/authorization/Azure.ResourceManager.Authorization/assets.json +++ b/sdk/authorization/Azure.ResourceManager.Authorization/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/authorization/Azure.ResourceManager.Authorization", - "Tag": "net/authorization/Azure.ResourceManager.Authorization_e938c7e2da" + "Tag": "net/authorization/Azure.ResourceManager.Authorization_98160297ec" } diff --git a/sdk/automanage/Azure.ResourceManager.Automanage/assets.json b/sdk/automanage/Azure.ResourceManager.Automanage/assets.json index 388b91c42b39..c8c10c69a5a7 100644 --- a/sdk/automanage/Azure.ResourceManager.Automanage/assets.json +++ b/sdk/automanage/Azure.ResourceManager.Automanage/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/automanage/Azure.ResourceManager.Automanage", - "Tag": "net/automanage/Azure.ResourceManager.Automanage_24b321ac98" + "Tag": "net/automanage/Azure.ResourceManager.Automanage_4dd9d6764e" } diff --git a/sdk/billingbenefits/Azure.ResourceManager.BillingBenefits/assets.json b/sdk/billingbenefits/Azure.ResourceManager.BillingBenefits/assets.json index 15f14277fab8..58446556e2fa 100644 --- a/sdk/billingbenefits/Azure.ResourceManager.BillingBenefits/assets.json +++ b/sdk/billingbenefits/Azure.ResourceManager.BillingBenefits/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/billingbenefits/Azure.ResourceManager.BillingBenefits", - "Tag": "net/billingbenefits/Azure.ResourceManager.BillingBenefits_13c94bfa77" + "Tag": "net/billingbenefits/Azure.ResourceManager.BillingBenefits_dcce7efc28" } diff --git a/sdk/cdn/Azure.ResourceManager.Cdn/assets.json b/sdk/cdn/Azure.ResourceManager.Cdn/assets.json index 46b9d9e53b8a..4aaa01961b41 100644 --- a/sdk/cdn/Azure.ResourceManager.Cdn/assets.json +++ b/sdk/cdn/Azure.ResourceManager.Cdn/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/cdn/Azure.ResourceManager.Cdn", - "Tag": "net/cdn/Azure.ResourceManager.Cdn_2673f4231c" + "Tag": "net/cdn/Azure.ResourceManager.Cdn_967e15a113" } diff --git a/sdk/changeanalysis/Azure.ResourceManager.ChangeAnalysis/assets.json b/sdk/changeanalysis/Azure.ResourceManager.ChangeAnalysis/assets.json index 2526a868d406..c4f73703cd52 100644 --- a/sdk/changeanalysis/Azure.ResourceManager.ChangeAnalysis/assets.json +++ b/sdk/changeanalysis/Azure.ResourceManager.ChangeAnalysis/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/changeanalysis/Azure.ResourceManager.ChangeAnalysis", - "Tag": "net/changeanalysis/Azure.ResourceManager.ChangeAnalysis_3be6c5daa3" + "Tag": "net/changeanalysis/Azure.ResourceManager.ChangeAnalysis_1bfabd7ca3" } diff --git a/sdk/eventgrid/Azure.ResourceManager.EventGrid/assets.json b/sdk/eventgrid/Azure.ResourceManager.EventGrid/assets.json index 8f8e4138f4f4..5e47e9313d90 100644 --- a/sdk/eventgrid/Azure.ResourceManager.EventGrid/assets.json +++ b/sdk/eventgrid/Azure.ResourceManager.EventGrid/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/eventgrid/Azure.ResourceManager.EventGrid", - "Tag": "net/eventgrid/Azure.ResourceManager.EventGrid_a85cad4466" + "Tag": "net/eventgrid/Azure.ResourceManager.EventGrid_cd53dee1c4" } diff --git a/sdk/policyinsights/Azure.ResourceManager.PolicyInsights/assets.json b/sdk/policyinsights/Azure.ResourceManager.PolicyInsights/assets.json index caa5d47344dd..d087487aeef6 100644 --- a/sdk/policyinsights/Azure.ResourceManager.PolicyInsights/assets.json +++ b/sdk/policyinsights/Azure.ResourceManager.PolicyInsights/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/policyinsights/Azure.ResourceManager.PolicyInsights", - "Tag": "net/policyinsights/Azure.ResourceManager.PolicyInsights_736b430e02" + "Tag": "net/policyinsights/Azure.ResourceManager.PolicyInsights_9e711c39cf" } diff --git a/sdk/postgresql/Azure.ResourceManager.PostgreSql/assets.json b/sdk/postgresql/Azure.ResourceManager.PostgreSql/assets.json index 94ad416900d4..d98f8ffbc03b 100644 --- a/sdk/postgresql/Azure.ResourceManager.PostgreSql/assets.json +++ b/sdk/postgresql/Azure.ResourceManager.PostgreSql/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/postgresql/Azure.ResourceManager.PostgreSql", - "Tag": "net/postgresql/Azure.ResourceManager.PostgreSql_78b282b4d6" + "Tag": "net/postgresql/Azure.ResourceManager.PostgreSql_fe6acfa75b" } diff --git a/sdk/reservations/Azure.ResourceManager.Reservations/assets.json b/sdk/reservations/Azure.ResourceManager.Reservations/assets.json index ab9e9b09b305..19e7323e35c2 100644 --- a/sdk/reservations/Azure.ResourceManager.Reservations/assets.json +++ b/sdk/reservations/Azure.ResourceManager.Reservations/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/reservations/Azure.ResourceManager.Reservations", - "Tag": "net/reservations/Azure.ResourceManager.Reservations_fa438ced02" + "Tag": "net/reservations/Azure.ResourceManager.Reservations_90308a0acc" } diff --git a/sdk/resourcegraph/Azure.ResourceManager.ResourceGraph/assets.json b/sdk/resourcegraph/Azure.ResourceManager.ResourceGraph/assets.json index 6e8ed2ba01f2..9d3bd032128a 100644 --- a/sdk/resourcegraph/Azure.ResourceManager.ResourceGraph/assets.json +++ b/sdk/resourcegraph/Azure.ResourceManager.ResourceGraph/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/resourcegraph/Azure.ResourceManager.ResourceGraph", - "Tag": "net/resourcegraph/Azure.ResourceManager.ResourceGraph_9a41f63efb" + "Tag": "net/resourcegraph/Azure.ResourceManager.ResourceGraph_a6ab52c4a7" } diff --git a/sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md b/sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md index fdbedd8d2e02..c4e771851b3b 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md +++ b/sdk/resourcemanager/Azure.ResourceManager/CHANGELOG.md @@ -1,15 +1,12 @@ # Release History -## 1.7.0-beta.1 (Unreleased) - -### Features Added - -### Breaking Changes - -### Bugs Fixed +## 1.7.0 (2023-07-13) ### Other Changes +- Bump api-version of `Subscription` to `2022-12-01` +- Bump api-version of `Tenant` to `2022-12-01` + ## 1.6.0 (2023-05-16) ### Features Added diff --git a/sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.netstandard2.0.cs b/sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.netstandard2.0.cs index 38a0c1f4331d..4b4cb591ff6b 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.netstandard2.0.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/api/Azure.ResourceManager.netstandard2.0.cs @@ -458,6 +458,7 @@ protected ResourceData(Azure.Core.ResourceIdentifier id, string name, Azure.Core public static partial class ResourceManagerModelFactory { public static Azure.ResourceManager.Resources.Models.ApiProfile ApiProfile(string profileVersion = null, string apiVersion = null) { throw null; } + public static Azure.ResourceManager.Resources.Models.AvailabilityZoneMappings AvailabilityZoneMappings(string logicalZone = null, string physicalZone = null) { throw null; } public static Azure.ResourceManager.Resources.Models.AzureRoleDefinition AzureRoleDefinition(string id = null, string name = null, bool? isServiceRole = default(bool?), System.Collections.Generic.IEnumerable permissions = null, System.Collections.Generic.IEnumerable scopes = null) { throw null; } public static Azure.ResourceManager.Resources.Models.DataManifestCustomResourceFunctionDefinition DataManifestCustomResourceFunctionDefinition(string name = null, Azure.Core.ResourceType? fullyQualifiedResourceType = default(Azure.Core.ResourceType?), System.Collections.Generic.IEnumerable defaultProperties = null, bool? allowCustomProperties = default(bool?)) { throw null; } public static Azure.ResourceManager.Resources.DataPolicyManifestData DataPolicyManifestData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, System.Collections.Generic.IEnumerable namespaces = null, string policyMode = null, bool? isBuiltInOnly = default(bool?), System.Collections.Generic.IEnumerable resourceTypeAliases = null, System.Collections.Generic.IEnumerable effects = null, System.Collections.Generic.IEnumerable fieldValues = null, System.Collections.Generic.IEnumerable standard = null, System.Collections.Generic.IEnumerable customDefinitions = null) { throw null; } @@ -465,7 +466,8 @@ public static partial class ResourceManagerModelFactory public static Azure.ResourceManager.ManagementGroups.Models.DescendantData DescendantData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, string displayName = null, Azure.Core.ResourceIdentifier parentId = null) { throw null; } public static Azure.ResourceManager.Resources.FeatureData FeatureData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, string featureState = null) { throw null; } public static Azure.ResourceManager.Resources.GenericResourceData GenericResourceData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, System.Collections.Generic.IDictionary tags = null, Azure.Core.AzureLocation location = default(Azure.Core.AzureLocation), Azure.ResourceManager.Resources.Models.ExtendedLocation extendedLocation = null, Azure.ResourceManager.Models.ArmPlan plan = null, System.BinaryData properties = null, string kind = null, string managedBy = null, Azure.ResourceManager.Resources.Models.ResourcesSku sku = null, Azure.ResourceManager.Models.ManagedServiceIdentity identity = null, System.DateTimeOffset? createdOn = default(System.DateTimeOffset?), System.DateTimeOffset? changedOn = default(System.DateTimeOffset?), string provisioningState = null) { throw null; } - public static Azure.ResourceManager.Resources.Models.LocationExpanded LocationExpanded(string id = null, string subscriptionId = null, string name = null, Azure.ResourceManager.Resources.Models.LocationType? locationType = default(Azure.ResourceManager.Resources.Models.LocationType?), string displayName = null, string regionalDisplayName = null, Azure.ResourceManager.Resources.Models.LocationMetadata metadata = null) { throw null; } + public static Azure.ResourceManager.Resources.Models.LocationExpanded LocationExpanded(string id, string subscriptionId, string name, Azure.ResourceManager.Resources.Models.LocationType? locationType, string displayName, string regionalDisplayName, Azure.ResourceManager.Resources.Models.LocationMetadata metadata) { throw null; } + public static Azure.ResourceManager.Resources.Models.LocationExpanded LocationExpanded(string id = null, string subscriptionId = null, string name = null, Azure.ResourceManager.Resources.Models.LocationType? locationType = default(Azure.ResourceManager.Resources.Models.LocationType?), string displayName = null, string regionalDisplayName = null, Azure.ResourceManager.Resources.Models.LocationMetadata metadata = null, System.Collections.Generic.IEnumerable availabilityZoneMappings = null) { throw null; } public static Azure.ResourceManager.Resources.Models.ManagedByTenant ManagedByTenant(System.Guid? tenantId = default(System.Guid?)) { throw null; } public static Azure.ResourceManager.ManagementGroups.Models.ManagementGroupChildInfo ManagementGroupChildInfo(Azure.ResourceManager.ManagementGroups.Models.ManagementGroupChildType? childType = default(Azure.ResourceManager.ManagementGroups.Models.ManagementGroupChildType?), string id = null, string name = null, string displayName = null, System.Collections.Generic.IEnumerable children = null) { throw null; } public static Azure.ResourceManager.ManagementGroups.ManagementGroupData ManagementGroupData(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, System.Guid? tenantId = default(System.Guid?), string displayName = null, Azure.ResourceManager.ManagementGroups.Models.ManagementGroupInfo details = null, System.Collections.Generic.IEnumerable children = null) { throw null; } @@ -1250,6 +1252,12 @@ internal ArmRestApi() { } public string Provider { get { throw null; } } public string Resource { get { throw null; } } } + public partial class AvailabilityZoneMappings + { + internal AvailabilityZoneMappings() { } + public string LogicalZone { get { throw null; } } + public string PhysicalZone { get { throw null; } } + } public partial class AzureRoleDefinition { internal AzureRoleDefinition() { } @@ -1323,6 +1331,7 @@ public ExtendedLocation() { } public partial class LocationExpanded { internal LocationExpanded() { } + public System.Collections.Generic.IReadOnlyList AvailabilityZoneMappings { get { throw null; } } public string DisplayName { get { throw null; } } public string Id { get { throw null; } } public Azure.ResourceManager.Resources.Models.LocationType? LocationType { get { throw null; } } diff --git a/sdk/resourcemanager/Azure.ResourceManager/assets.json b/sdk/resourcemanager/Azure.ResourceManager/assets.json index 240dc44f382b..09e11beb3d3c 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/assets.json +++ b/sdk/resourcemanager/Azure.ResourceManager/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/resourcemanager/Azure.ResourceManager", - "Tag": "net/resourcemanager/Azure.ResourceManager_badeb57759" + "Tag": "net/resourcemanager/Azure.ResourceManager_bdcd46cf6b" } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Azure.ResourceManager.csproj b/sdk/resourcemanager/Azure.ResourceManager/src/Azure.ResourceManager.csproj index add0c9ab87a1..f21d5b4daac1 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Azure.ResourceManager.csproj +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Azure.ResourceManager.csproj @@ -1,7 +1,7 @@ - 1.7.0-beta.1 + 1.7.0 1.6.0 Azure.ResourceManager diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/Models/LocationExpanded.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/Models/LocationExpanded.cs index 6f931f7add7c..e585737abe4a 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/Models/LocationExpanded.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/Models/LocationExpanded.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System.Collections.Generic; using Azure.Core; [assembly:CodeGenSuppressType("CreatedByType")] @@ -20,7 +21,7 @@ public static implicit operator AzureLocation(LocationExpanded location) return new AzureLocation(location.Name, location.DisplayName); } - /// Initializes a new instance of LocationExpanded. + /// Initializes a new instance of LocationExpanded. /// The fully qualified ID of the location. For example, /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. /// The subscription ID. /// The location name. @@ -28,7 +29,8 @@ public static implicit operator AzureLocation(LocationExpanded location) /// The display name of the location. /// The display name of the location and its region. /// Metadata of the location, such as lat/long, paired region, and others. - internal LocationExpanded(string id, string subscriptionId, string name, LocationType? locationType, string displayName, string regionalDisplayName, LocationMetadata metadata) + /// The availability zone mappings for this region. + internal LocationExpanded(string id, string subscriptionId, string name, LocationType? locationType, string displayName, string regionalDisplayName, LocationMetadata metadata, IReadOnlyList availabilityZoneMappings) { Id = id; ResourceIdentifier subId = new ResourceIdentifier(id); @@ -38,6 +40,7 @@ internal LocationExpanded(string id, string subscriptionId, string name, Locatio DisplayName = displayName; RegionalDisplayName = regionalDisplayName; Metadata = metadata; + AvailabilityZoneMappings = availabilityZoneMappings; } } } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/ResourceManagerModelFactory.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/ResourceManagerModelFactory.cs index 40e8f0304267..73d3cdd844c0 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/ResourceManagerModelFactory.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Custom/ResourceManagerModelFactory.cs @@ -24,5 +24,19 @@ public static WritableSubResource WritableSubResource(ResourceIdentifier id = nu { return new WritableSubResource(id); } + + /// Initializes a new instance of LocationExpanded. + /// The fully qualified ID of the location. For example, /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. + /// The subscription ID. + /// The location name. + /// The location type. + /// The display name of the location. + /// The display name of the location and its region. + /// Metadata of the location, such as lat/long, paired region, and others. + /// A new instance for mocking. + public static LocationExpanded LocationExpanded(string id, string subscriptionId, string name, LocationType? locationType, string displayName, string regionalDisplayName, LocationMetadata metadata) + { + return new LocationExpanded(id, subscriptionId, name, locationType, displayName, regionalDisplayName, metadata, null); + } } } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs new file mode 100644 index 000000000000..95475f461e67 --- /dev/null +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/AvailabilityZoneMappings.Serialization.cs @@ -0,0 +1,39 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System.Text.Json; +using Azure.Core; + +namespace Azure.ResourceManager.Resources.Models +{ + public partial class AvailabilityZoneMappings + { + internal static AvailabilityZoneMappings DeserializeAvailabilityZoneMappings(JsonElement element) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + Optional logicalZone = default; + Optional physicalZone = default; + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("logicalZone"u8)) + { + logicalZone = property.Value.GetString(); + continue; + } + if (property.NameEquals("physicalZone"u8)) + { + physicalZone = property.Value.GetString(); + continue; + } + } + return new AvailabilityZoneMappings(logicalZone.Value, physicalZone.Value); + } + } +} diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/AvailabilityZoneMappings.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/AvailabilityZoneMappings.cs new file mode 100644 index 000000000000..4456bbcfa15a --- /dev/null +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/AvailabilityZoneMappings.cs @@ -0,0 +1,32 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +namespace Azure.ResourceManager.Resources.Models +{ + /// Availability zone mappings for the region. + public partial class AvailabilityZoneMappings + { + /// Initializes a new instance of AvailabilityZoneMappings. + internal AvailabilityZoneMappings() + { + } + + /// Initializes a new instance of AvailabilityZoneMappings. + /// The logical zone id for the availability zone. + /// The fully qualified physical zone id of availability zone to which logical zone id is mapped to. + internal AvailabilityZoneMappings(string logicalZone, string physicalZone) + { + LogicalZone = logicalZone; + PhysicalZone = physicalZone; + } + + /// The logical zone id for the availability zone. + public string LogicalZone { get; } + /// The fully qualified physical zone id of availability zone to which logical zone id is mapped to. + public string PhysicalZone { get; } + } +} diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.Serialization.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.Serialization.cs index 581413bf89dd..41acf55b8b4f 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.Serialization.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.Serialization.cs @@ -5,6 +5,7 @@ #nullable disable +using System.Collections.Generic; using System.Text.Json; using Azure.Core; @@ -25,6 +26,7 @@ internal static LocationExpanded DeserializeLocationExpanded(JsonElement element Optional displayName = default; Optional regionalDisplayName = default; Optional metadata = default; + Optional> availabilityZoneMappings = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("id"u8)) @@ -70,8 +72,22 @@ internal static LocationExpanded DeserializeLocationExpanded(JsonElement element metadata = LocationMetadata.DeserializeLocationMetadata(property.Value); continue; } + if (property.NameEquals("availabilityZoneMappings"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(Models.AvailabilityZoneMappings.DeserializeAvailabilityZoneMappings(item)); + } + availabilityZoneMappings = array; + continue; + } } - return new LocationExpanded(id.Value, subscriptionId.Value, name.Value, Optional.ToNullable(type), displayName.Value, regionalDisplayName.Value, metadata.Value); + return new LocationExpanded(id.Value, subscriptionId.Value, name.Value, Optional.ToNullable(type), displayName.Value, regionalDisplayName.Value, metadata.Value, Optional.ToList(availabilityZoneMappings)); } } } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.cs index cecda0a62859..528515d9df21 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/LocationExpanded.cs @@ -5,6 +5,9 @@ #nullable disable +using System.Collections.Generic; +using Azure.Core; + namespace Azure.ResourceManager.Resources.Models { /// Location information. @@ -13,9 +16,10 @@ public partial class LocationExpanded /// Initializes a new instance of LocationExpanded. internal LocationExpanded() { + AvailabilityZoneMappings = new ChangeTrackingList(); } - /// The fully qualified ID of the location. For example, /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. + /// The fully qualified ID of the location. For example, /subscriptions/8d65815f-a5b6-402f-9298-045155da7d74/locations/westus. public string Id { get; } /// The subscription ID. public string SubscriptionId { get; } @@ -29,5 +33,7 @@ internal LocationExpanded() public string RegionalDisplayName { get; } /// Metadata of the location, such as lat/long, paired region, and others. public LocationMetadata Metadata { get; } + /// The availability zone mappings for this region. + public IReadOnlyList AvailabilityZoneMappings { get; } } } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/PairedRegion.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/PairedRegion.cs index 784328372928..d30388a21b56 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/PairedRegion.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/Models/PairedRegion.cs @@ -17,7 +17,7 @@ internal PairedRegion() /// Initializes a new instance of PairedRegion. /// The name of the paired region. - /// The fully qualified ID of the location. For example, /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. + /// The fully qualified ID of the location. For example, /subscriptions/8d65815f-a5b6-402f-9298-045155da7d74/locations/westus. /// The subscription ID. internal PairedRegion(string name, string id, string subscriptionId) { @@ -28,7 +28,7 @@ internal PairedRegion(string name, string id, string subscriptionId) /// The name of the paired region. public string Name { get; } - /// The fully qualified ID of the location. For example, /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. + /// The fully qualified ID of the location. For example, /subscriptions/8d65815f-a5b6-402f-9298-045155da7d74/locations/westus. public string Id { get; } /// The subscription ID. public string SubscriptionId { get; } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/ResourceManagerModelFactory.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/ResourceManagerModelFactory.cs index 2d9884d86e28..4ef7b0fc4595 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/ResourceManagerModelFactory.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/ResourceManagerModelFactory.cs @@ -451,22 +451,25 @@ public static ManagementLockData ManagementLockData(ResourceIdentifier id = null } /// Initializes a new instance of LocationExpanded. - /// The fully qualified ID of the location. For example, /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. + /// The fully qualified ID of the location. For example, /subscriptions/8d65815f-a5b6-402f-9298-045155da7d74/locations/westus. /// The subscription ID. /// The location name. /// The location type. /// The display name of the location. /// The display name of the location and its region. /// Metadata of the location, such as lat/long, paired region, and others. + /// The availability zone mappings for this region. /// A new instance for mocking. - public static LocationExpanded LocationExpanded(string id = null, string subscriptionId = null, string name = null, LocationType? locationType = null, string displayName = null, string regionalDisplayName = null, LocationMetadata metadata = null) + public static LocationExpanded LocationExpanded(string id = null, string subscriptionId = null, string name = null, LocationType? locationType = null, string displayName = null, string regionalDisplayName = null, LocationMetadata metadata = null, IEnumerable availabilityZoneMappings = null) { - return new LocationExpanded(id, subscriptionId, name, locationType, displayName, regionalDisplayName, metadata); + availabilityZoneMappings ??= new List(); + + return new LocationExpanded(id, subscriptionId, name, locationType, displayName, regionalDisplayName, metadata, availabilityZoneMappings?.ToList()); } /// Initializes a new instance of PairedRegion. /// The name of the paired region. - /// The fully qualified ID of the location. For example, /subscriptions/00000000-0000-0000-0000-000000000000/locations/westus. + /// The fully qualified ID of the location. For example, /subscriptions/8d65815f-a5b6-402f-9298-045155da7d74/locations/westus. /// The subscription ID. /// A new instance for mocking. public static PairedRegion PairedRegion(string name = null, string id = null, string subscriptionId = null) @@ -474,8 +477,17 @@ public static PairedRegion PairedRegion(string name = null, string id = null, st return new PairedRegion(name, id, subscriptionId); } + /// Initializes a new instance of AvailabilityZoneMappings. + /// The logical zone id for the availability zone. + /// The fully qualified physical zone id of availability zone to which logical zone id is mapped to. + /// A new instance for mocking. + public static AvailabilityZoneMappings AvailabilityZoneMappings(string logicalZone = null, string physicalZone = null) + { + return new AvailabilityZoneMappings(logicalZone, physicalZone); + } + /// Initializes a new instance of SubscriptionData. - /// The fully qualified ID for the subscription. For example, /subscriptions/00000000-0000-0000-0000-000000000000. + /// The fully qualified ID for the subscription. For example, /subscriptions/8d65815f-a5b6-402f-9298-045155da7d74. /// The subscription ID. /// The subscription display name. /// The subscription tenant ID. @@ -512,8 +524,8 @@ public static ManagedByTenant ManagedByTenant(Guid? tenantId = null) } /// Initializes a new instance of TenantData. - /// The fully qualified ID of the tenant. For example, /tenants/00000000-0000-0000-0000-000000000000. - /// The tenant ID. For example, 00000000-0000-0000-0000-000000000000. + /// The fully qualified ID of the tenant. For example, /tenants/8d65815f-a5b6-402f-9298-045155da7d74. + /// The tenant ID. For example, 8d65815f-a5b6-402f-9298-045155da7d74. /// Category of the tenant. /// Country/region name of the address for the tenant. /// Country/region abbreviation for the tenant. diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs index 3d590c09969f..4a0e51ad79af 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/SubscriptionsRestOperations.cs @@ -33,7 +33,7 @@ public SubscriptionsRestOperations(HttpPipeline pipeline, string applicationId, { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); - _apiVersion = apiVersion ?? "2021-01-01"; + _apiVersion = apiVersion ?? "2022-12-01"; _userAgent = new TelemetryDetails(GetType().Assembly, applicationId); } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/TenantsRestOperations.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/TenantsRestOperations.cs index 7673500ea3e6..62249ea94dc1 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/TenantsRestOperations.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/RestOperations/TenantsRestOperations.cs @@ -33,7 +33,7 @@ public TenantsRestOperations(HttpPipeline pipeline, string applicationId, Uri en { _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline)); _endpoint = endpoint ?? new Uri("https://management.azure.com"); - _apiVersion = apiVersion ?? "2021-01-01"; + _apiVersion = apiVersion ?? "2022-12-01"; _userAgent = new TelemetryDetails(GetType().Assembly, applicationId); } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/SubscriptionData.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/SubscriptionData.cs index d08f0143adbb..3cc4c9403c01 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/SubscriptionData.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/SubscriptionData.cs @@ -26,7 +26,7 @@ internal SubscriptionData() } /// Initializes a new instance of SubscriptionData. - /// The fully qualified ID for the subscription. For example, /subscriptions/00000000-0000-0000-0000-000000000000. + /// The fully qualified ID for the subscription. For example, /subscriptions/8d65815f-a5b6-402f-9298-045155da7d74. /// The subscription ID. /// The subscription display name. /// The subscription tenant ID. diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/TenantData.cs b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/TenantData.cs index 802091b3899d..29b6fbe9ef76 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/TenantData.cs +++ b/sdk/resourcemanager/Azure.ResourceManager/src/Resources/Generated/TenantData.cs @@ -25,8 +25,8 @@ internal TenantData() } /// Initializes a new instance of TenantData. - /// The fully qualified ID of the tenant. For example, /tenants/00000000-0000-0000-0000-000000000000. - /// The tenant ID. For example, 00000000-0000-0000-0000-000000000000. + /// The fully qualified ID of the tenant. For example, /tenants/8d65815f-a5b6-402f-9298-045155da7d74. + /// The tenant ID. For example, 8d65815f-a5b6-402f-9298-045155da7d74. /// Category of the tenant. /// Country/region name of the address for the tenant. /// Country/region abbreviation for the tenant. @@ -49,9 +49,9 @@ internal TenantData(string id, Guid? tenantId, TenantCategory? tenantCategory, s TenantBrandingLogoUri = tenantBrandingLogoUri; } - /// The fully qualified ID of the tenant. For example, /tenants/00000000-0000-0000-0000-000000000000. + /// The fully qualified ID of the tenant. For example, /tenants/8d65815f-a5b6-402f-9298-045155da7d74. public string Id { get; } - /// The tenant ID. For example, 00000000-0000-0000-0000-000000000000. + /// The tenant ID. For example, 8d65815f-a5b6-402f-9298-045155da7d74. public Guid? TenantId { get; } /// Category of the tenant. public TenantCategory? TenantCategory { get; } diff --git a/sdk/resourcemanager/Azure.ResourceManager/src/autorest.md b/sdk/resourcemanager/Azure.ResourceManager/src/autorest.md index f05686684481..27aecc90be87 100644 --- a/sdk/resourcemanager/Azure.ResourceManager/src/autorest.md +++ b/sdk/resourcemanager/Azure.ResourceManager/src/autorest.md @@ -17,16 +17,16 @@ modelerfour: # show-serialized-names: true batch: - - tag: package-common-type-2022-04 - - tag: package-resources-2022-09 - - tag: package-management-2022-04 + - tag: package-common-type + - tag: package-resources + - tag: package-management ``` -### Tag: package-common-type-2022-04 +### Tag: package-common-type -These settings apply only when `--tag=package-common-type-2022-04` is specified on the command line. +These settings apply only when `--tag=package-common-type` is specified on the command line. -``` yaml $(tag) == 'package-common-type-2022-04' +``` yaml $(tag) == 'package-common-type' output-folder: $(this-folder)/Common/Generated namespace: Azure.ResourceManager input-file: @@ -161,24 +161,24 @@ directive: $["x-csharp-usage"] = "model,input,output"; ``` -### Tag: package-resources-2022-09 +### Tag: package-resources -These settings apply only when `--tag=package-resources-2022-09` is specified on the command line. +These settings apply only when `--tag=package-resources` is specified on the command line. -``` yaml $(tag) == 'package-resources-2022-09' +``` yaml $(tag) == 'package-resources' output-folder: $(this-folder)/Resources/Generated namespace: Azure.ResourceManager.Resources title: ResourceManagementClient input-file: - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Authorization/stable/2022-06-01/policyAssignments.json - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Resources/stable/2022-09-01/resources.json - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Authorization/stable/2021-06-01/policyDefinitions.json - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Authorization/stable/2021-06-01/policySetDefinitions.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Authorization/stable/2022-06-01/policyAssignments.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Resources/stable/2022-09-01/resources.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Authorization/stable/2021-06-01/policyDefinitions.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Authorization/stable/2021-06-01/policySetDefinitions.json # - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/91ac14531f0d05b3d6fcf4a817ea0defde59fe63/specification/resources/resource-manager/Microsoft.Authorization/preview/2020-07-01-preview/policyExemptions.json - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/dataPolicyManifests.json - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Authorization/stable/2016-09-01/locks.json - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Resources/stable/2021-01-01/subscriptions.json - - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/969fd0c2634fbcc1975d7abe3749330a5145a97c/specification/resources/resource-manager/Microsoft.Features/stable/2021-07-01/features.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Authorization/stable/2020-09-01/dataPolicyManifests.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Authorization/stable/2016-09-01/locks.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Resources/stable/2022-12-01/subscriptions.json + - https://raw.githubusercontent.com/Azure/azure-rest-api-specs/b74978708bb95475562412d4654c00fbcedd9f89/specification/resources/resource-manager/Microsoft.Features/stable/2021-07-01/features.json list-exception: - /{resourceId} request-path-to-resource-data: @@ -480,7 +480,7 @@ directive: "description": "Gets details about the default tenant.", "parameters": [ { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -682,11 +682,11 @@ directive: $["x-ms-format"] = "azure-location" ``` -### Tag: package-management-2022-04 +### Tag: package-management -These settings apply only when `--tag=package-management-2022-04` is specified on the command line. +These settings apply only when `--tag=package-management` is specified on the command line. -``` yaml $(tag) == 'package-management-2022-04' +``` yaml $(tag) == 'package-management' output-folder: $(this-folder)/ManagementGroup/Generated namespace: Azure.ResourceManager.ManagementGroups title: ManagementClient diff --git a/sdk/securitycenter/Azure.ResourceManager.SecurityCenter/assets.json b/sdk/securitycenter/Azure.ResourceManager.SecurityCenter/assets.json index 9df09d58f5d9..38c1cf4416f7 100644 --- a/sdk/securitycenter/Azure.ResourceManager.SecurityCenter/assets.json +++ b/sdk/securitycenter/Azure.ResourceManager.SecurityCenter/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/securitycenter/Azure.ResourceManager.SecurityCenter", - "Tag": "net/securitycenter/Azure.ResourceManager.SecurityCenter_fb494d166b" + "Tag": "net/securitycenter/Azure.ResourceManager.SecurityCenter_f3792d7894" } diff --git a/sdk/subscription/Azure.ResourceManager.Subscription/assets.json b/sdk/subscription/Azure.ResourceManager.Subscription/assets.json index 0f89df408793..5340cd057b66 100644 --- a/sdk/subscription/Azure.ResourceManager.Subscription/assets.json +++ b/sdk/subscription/Azure.ResourceManager.Subscription/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/subscription/Azure.ResourceManager.Subscription", - "Tag": "net/subscription/Azure.ResourceManager.Subscription_2a7fe0c4ae" + "Tag": "net/subscription/Azure.ResourceManager.Subscription_c65a794aa3" } diff --git a/sdk/support/Azure.ResourceManager.Support/assets.json b/sdk/support/Azure.ResourceManager.Support/assets.json index 2f27418d0986..d4ea38831e76 100644 --- a/sdk/support/Azure.ResourceManager.Support/assets.json +++ b/sdk/support/Azure.ResourceManager.Support/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/support/Azure.ResourceManager.Support", - "Tag": "net/support/Azure.ResourceManager.Support_9a15d401df" + "Tag": "net/support/Azure.ResourceManager.Support_49e7053660" }