diff --git a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/Azure.ResourceManager.OperationalInsights.sln b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/Azure.ResourceManager.OperationalInsights.sln index 8e5365ee1dfa..f7d55594fc25 100644 --- a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/Azure.ResourceManager.OperationalInsights.sln +++ b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/Azure.ResourceManager.OperationalInsights.sln @@ -1,21 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30309.148 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34009.444 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{E27BCECA-CDE9-4080-BEB2-27656FC3E93F}") = "Azure.ResourceManager.OperationalInsights", "src\Azure.ResourceManager.OperationalInsights.csproj", "{9EDA5235-BF40-4AE8-91D6-088B84432F7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.OperationalInsights", "src\Azure.ResourceManager.OperationalInsights.csproj", "{9EDA5235-BF40-4AE8-91D6-088B84432F7D}" EndProject -Project("{E27BCECA-CDE9-4080-BEB2-27656FC3E93F}") = "Azure.ResourceManager.OperationalInsights.Tests", "tests\Azure.ResourceManager.OperationalInsights.Tests.csproj", "{0AD9B005-1722-4858-827C-A35CCD589E8C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.OperationalInsights.Tests", "tests\Azure.ResourceManager.OperationalInsights.Tests.csproj", "{0AD9B005-1722-4858-827C-A35CCD589E8C}" EndProject -Project("{E27BCECA-CDE9-4080-BEB2-27656FC3E93F}") = "Azure.ResourceManager.OperationalInsights.Samples", "samples\Azure.ResourceManager.OperationalInsights.Samples.csproj", "{B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.OperationalInsights.Samples", "samples\Azure.ResourceManager.OperationalInsights.Samples.csproj", "{B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}" EndProject Global - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {8E77B375-E5E0-4A70-9CEB-0AA95E4E4FD3} - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 @@ -49,5 +43,23 @@ Global {0AD9B005-1722-4858-827C-A35CCD589E8C}.Release|x64.Build.0 = Release|Any CPU {0AD9B005-1722-4858-827C-A35CCD589E8C}.Release|x86.ActiveCfg = Release|Any CPU {0AD9B005-1722-4858-827C-A35CCD589E8C}.Release|x86.Build.0 = Release|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Debug|x64.ActiveCfg = Debug|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Debug|x64.Build.0 = Debug|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Debug|x86.ActiveCfg = Debug|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Debug|x86.Build.0 = Debug|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Release|Any CPU.Build.0 = Release|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Release|x64.ActiveCfg = Release|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Release|x64.Build.0 = Release|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Release|x86.ActiveCfg = Release|Any CPU + {B7B7D769-CC80-418D-9B0A-3C96BFDA8C4C}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8E77B375-E5E0-4A70-9CEB-0AA95E4E4FD3} EndGlobalSection EndGlobal diff --git a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/api/Azure.ResourceManager.OperationalInsights.netstandard2.0.cs b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/api/Azure.ResourceManager.OperationalInsights.netstandard2.0.cs index ce1cc79744c1..2ef20ff5946e 100644 --- a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/api/Azure.ResourceManager.OperationalInsights.netstandard2.0.cs +++ b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/api/Azure.ResourceManager.OperationalInsights.netstandard2.0.cs @@ -601,7 +601,7 @@ public static partial class ArmOperationalInsightsModelFactory public static Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceCapping OperationalInsightsWorkspaceCapping(double? dailyQuotaInGB = default(double?), string quotaNextResetTime = null, Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsDataIngestionStatus? dataIngestionStatus = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsDataIngestionStatus?)) { throw null; } public static Azure.ResourceManager.OperationalInsights.OperationalInsightsWorkspaceData OperationalInsightsWorkspaceData(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.Models.ManagedServiceIdentity identity = null, Azure.ETag? etag = default(Azure.ETag?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceEntityStatus? provisioningState = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceEntityStatus?), System.Guid? customerId = default(System.Guid?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceSku sku = null, int? retentionInDays = default(int?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceCapping workspaceCapping = null, System.DateTimeOffset? createdOn = default(System.DateTimeOffset?), System.DateTimeOffset? modifiedOn = default(System.DateTimeOffset?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType? publicNetworkAccessForIngestion = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType? publicNetworkAccessForQuery = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType?), bool? forceCmkForQuery = default(bool?), System.Collections.Generic.IEnumerable privateLinkScopedResources = null, Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceFeatures features = null, Azure.Core.ResourceIdentifier defaultDataCollectionRuleResourceId = null) { throw null; } public static Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspacePatch OperationalInsightsWorkspacePatch(Azure.Core.ResourceIdentifier id = null, string name = null, Azure.Core.ResourceType resourceType = default(Azure.Core.ResourceType), Azure.ResourceManager.Models.SystemData systemData = null, Azure.ResourceManager.Models.ManagedServiceIdentity identity = null, System.Collections.Generic.IDictionary tags = null, Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceEntityStatus? provisioningState = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceEntityStatus?), System.Guid? customerId = default(System.Guid?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceSku sku = null, int? retentionInDays = default(int?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceCapping workspaceCapping = null, System.DateTimeOffset? createdOn = default(System.DateTimeOffset?), System.DateTimeOffset? modifiedOn = default(System.DateTimeOffset?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType? publicNetworkAccessForIngestion = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType?), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType? publicNetworkAccessForQuery = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsPublicNetworkAccessType?), bool? forceCmkForQuery = default(bool?), System.Collections.Generic.IEnumerable privateLinkScopedResources = null, Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceFeatures features = null, Azure.Core.ResourceIdentifier defaultDataCollectionRuleResourceId = null, Azure.ETag? etag = default(Azure.ETag?)) { throw null; } - public static Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspacePurgeResult OperationalInsightsWorkspacePurgeResult(System.Guid operationId = default(System.Guid)) { throw null; } + public static Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspacePurgeResult OperationalInsightsWorkspacePurgeResult(string operationStringId = null) { throw null; } public static Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspacePurgeStatusResult OperationalInsightsWorkspacePurgeStatusResult(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspacePurgeState status = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspacePurgeState)) { throw null; } public static Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceSharedKeys OperationalInsightsWorkspaceSharedKeys(string primarySharedKey = null, string secondarySharedKey = null) { throw null; } public static Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceSku OperationalInsightsWorkspaceSku(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceSkuName name = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceSkuName), Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceCapacityReservationLevel? capacityReservationLevel = default(Azure.ResourceManager.OperationalInsights.Models.OperationalInsightsWorkspaceCapacityReservationLevel?), System.DateTimeOffset? lastSkuUpdatedOn = default(System.DateTimeOffset?)) { throw null; } @@ -1246,7 +1246,10 @@ public OperationalInsightsWorkspacePurgeFilter() { } public partial class OperationalInsightsWorkspacePurgeResult { internal OperationalInsightsWorkspacePurgeResult() { } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + [System.ObsoleteAttribute("This property has been replaced by ResourceUriString", false)] public System.Guid OperationId { get { throw null; } } + public string OperationStringId { get { throw null; } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct OperationalInsightsWorkspacePurgeState : System.IEquatable diff --git a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Custom/Models/OperationalInsightsWorkspacePurgeResult.cs b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Custom/Models/OperationalInsightsWorkspacePurgeResult.cs new file mode 100644 index 000000000000..427450bfba08 --- /dev/null +++ b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Custom/Models/OperationalInsightsWorkspacePurgeResult.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +#nullable disable + +using System; +using System.ComponentModel; +using Azure.Core; + +namespace Azure.ResourceManager.OperationalInsights.Models +{ + public partial class OperationalInsightsWorkspacePurgeResult + { + /// ID of the operation. + [EditorBrowsable(EditorBrowsableState.Never)] + [Obsolete("This property has been replaced by ResourceUriString", false)] + public Guid OperationId { get;} + } +} diff --git a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/ArmOperationalInsightsModelFactory.cs b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/ArmOperationalInsightsModelFactory.cs index 6795f7eac923..c10a6eb86b50 100644 --- a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/ArmOperationalInsightsModelFactory.cs +++ b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/ArmOperationalInsightsModelFactory.cs @@ -268,11 +268,17 @@ public static OperationalInsightsSearchSchemaValue OperationalInsightsSearchSche } /// Initializes a new instance of OperationalInsightsWorkspacePurgeResult. - /// Id to use when querying for status for a particular purge operation. + /// Id to use when querying for status for a particular purge operation. + /// is null. /// A new instance for mocking. - public static OperationalInsightsWorkspacePurgeResult OperationalInsightsWorkspacePurgeResult(Guid operationId = default) + public static OperationalInsightsWorkspacePurgeResult OperationalInsightsWorkspacePurgeResult(string operationStringId = null) { - return new OperationalInsightsWorkspacePurgeResult(operationId); + if (operationStringId == null) + { + throw new ArgumentNullException(nameof(operationStringId)); + } + + return new OperationalInsightsWorkspacePurgeResult(operationStringId); } /// Initializes a new instance of OperationalInsightsWorkspacePurgeStatusResult. diff --git a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.Serialization.cs b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.Serialization.cs index 6bae0c07d57f..1ff2ec8595f3 100644 --- a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.Serialization.cs +++ b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.Serialization.cs @@ -5,7 +5,6 @@ #nullable disable -using System; using System.Text.Json; using Azure.Core; @@ -19,12 +18,12 @@ internal static OperationalInsightsWorkspacePurgeResult DeserializeOperationalIn { return null; } - Guid operationId = default; + string operationId = default; foreach (var property in element.EnumerateObject()) { if (property.NameEquals("operationId"u8)) { - operationId = property.Value.GetGuid(); + operationId = property.Value.GetString(); continue; } } diff --git a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.cs b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.cs index 228b8e25e01a..246801b72f54 100644 --- a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.cs +++ b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/Generated/Models/OperationalInsightsWorkspacePurgeResult.cs @@ -6,6 +6,7 @@ #nullable disable using System; +using Azure.Core; namespace Azure.ResourceManager.OperationalInsights.Models { @@ -13,13 +14,16 @@ namespace Azure.ResourceManager.OperationalInsights.Models public partial class OperationalInsightsWorkspacePurgeResult { /// Initializes a new instance of OperationalInsightsWorkspacePurgeResult. - /// Id to use when querying for status for a particular purge operation. - internal OperationalInsightsWorkspacePurgeResult(Guid operationId) + /// Id to use when querying for status for a particular purge operation. + /// is null. + internal OperationalInsightsWorkspacePurgeResult(string operationStringId) { - OperationId = operationId; + Argument.AssertNotNull(operationStringId, nameof(operationStringId)); + + OperationStringId = operationStringId; } /// Id to use when querying for status for a particular purge operation. - public Guid OperationId { get; } + public string OperationStringId { get; } } } diff --git a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/autorest.md b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/autorest.md index 2cbe7c745139..22bb6944da0a 100644 --- a/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/autorest.md +++ b/sdk/operationalinsights/Azure.ResourceManager.OperationalInsights/src/autorest.md @@ -13,6 +13,8 @@ clear-output-folder: true skip-csproj: true modelerfour: flatten-payloads: false +# mgmt-debug: +# show-serialized-names: true format-by-name-rules: 'tenantId': 'uuid' @@ -141,7 +143,7 @@ rename-mapping: ManagementGroup.properties.created: CreatedOn ManagementGroup.properties.dataReceived: DataReceivedOn StorageAccount.id: -|arm-id - WorkspacePurgeResponse.operationId: -|uuid + WorkspacePurgeResponse.operationId: OperationStringId WorkspacePurgeBody: OperationalInsightsWorkspacePurgeContent WorkspacePurgeBodyFilters: OperationalInsightsWorkspacePurgeFilter Capacity: OperationalInsightsClusterCapacity