Skip to content

Commit 8aee706

Browse files
committed
updated namespace and directory to SnapshotReference
1 parent b24f20c commit 8aee706

File tree

8 files changed

+14
-16
lines changed

8 files changed

+14
-16
lines changed

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/AzureAppConfigurationProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
using Azure;
55
using Azure.Data.AppConfiguration;
6-
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReferences;
6+
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference;
77
using Microsoft.Extensions.Configuration.AzureAppConfiguration.Extensions;
88
using Microsoft.Extensions.Configuration.AzureAppConfiguration.Models;
99
using Microsoft.Extensions.Diagnostics.HealthChecks;
@@ -884,7 +884,7 @@ await CallWithRequestTracing(async () =>
884884
_requestTracingOptions.UpdateSnapshotReferenceTracing(setting.ContentType);
885885
}
886886

887-
var snapshotReference = SnapshotReferenceParser.Parse(setting);
887+
SnapshotReference snapshotReference = SnapshotReferenceParser.Parse(setting);
888888

889889
Dictionary<string, ConfigurationSetting> resolvedSettings = await LoadSnapshotData(snapshotReference.SnapshotName, client, cancellationToken).ConfigureAwait(false);
890890

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/Constants/ErrorMessages.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT license.
33
//
4+
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference;
5+
46
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration
57
{
68
internal class ErrorMessages
@@ -11,7 +13,7 @@ internal class ErrorMessages
1113
public const string FeatureFlagInvalidFormat = "Invalid json format for feature flag. Key: '{0}'.";
1214
public const string InvalidKeyVaultReference = "Invalid Key Vault reference.";
1315
public const string SnapshotReferenceInvalidFormat = "Invalid snapshot reference format for key '{0}' (label: '{1}').";
14-
public const string SnapshotReferenceInvalidJsonProperty = "Invalid snapshot reference format for key '{0}' (label: '{1}'). The 'snapshot_name' property must be a string value, but found {2}.";
16+
public const string SnapshotReferenceInvalidJsonProperty = "Invalid snapshot reference format for key '{0}' (label: '{1}'). The '" + JsonFields.SnapshotName + "' property must be a string value, but found {2}.";
1517
public const string SnapshotReferenceNull = "Invalid snapshot reference format. The 'snapshot_name' property must not be null.";
1618
public const string SnapshotInvalidComposition = "{0} for the selected snapshot with name '{1}' must be 'key', found '{2}'.";
1719
}

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/RequestTracingOptions.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
using Microsoft.Extensions.Configuration.AzureAppConfiguration.Extensions;
55
using Microsoft.Extensions.Configuration.AzureAppConfiguration.FeatureManagement;
6-
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReferences;
6+
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference;
77
using System.Net.Mime;
88
using System.Text;
99

@@ -131,10 +131,8 @@ public void UpdateAiConfigurationTracing(string contentTypeString)
131131
/// <param name="contentTypeString">The content type to analyze.</param>
132132
public void UpdateSnapshotReferenceTracing(string contentTypeString)
133133
{
134-
if (SnapshotReferenceConstants.ContentType == contentTypeString)
135-
{
136-
UsesSnapshotReference = true;
137-
}
134+
UsesSnapshotReference = true;
135+
138136
}
139137

140138
/// <summary>

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/SnapshotReferences/SnapshotReference.cs renamed to src/Microsoft.Extensions.Configuration.AzureAppConfiguration/SnapshotReference/SnapshotReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT license.
33
//
44

5-
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReferences
5+
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference
66
{
77
internal class SnapshotReference
88
{

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/SnapshotReferences/SnapshotReferenceConstants.cs renamed to src/Microsoft.Extensions.Configuration.AzureAppConfiguration/SnapshotReference/SnapshotReferenceConstants.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT license.
33
//
4-
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReferences
4+
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference
55
{
66
internal class SnapshotReferenceConstants
77
{
88
public const string ContentType = "application/json; profile=\"https://azconfig.io/mime-profiles/snapshot-ref\"; charset=utf-8";
9-
10-
public const string SnapshotReferenceJsonPropertyName = "snapshot_name";
119
}
1210
}

src/Microsoft.Extensions.Configuration.AzureAppConfiguration/SnapshotReferences/SnapshotReferenceParser.cs renamed to src/Microsoft.Extensions.Configuration.AzureAppConfiguration/SnapshotReference/SnapshotReferenceParser.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System;
66
using System.Text.Json;
77

8-
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReferences
8+
namespace Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference
99
{
1010
/// <summary>
1111
/// Provides parsing functionality for snapshot reference configuration settings.
@@ -46,7 +46,7 @@ public static SnapshotReference Parse(ConfigurationSetting setting)
4646
continue;
4747
}
4848

49-
if (reader.GetString() == SnapshotReferenceConstants.SnapshotReferenceJsonPropertyName)
49+
if (reader.GetString() == JsonFields.SnapshotName)
5050
{
5151
if (reader.Read() && reader.TokenType == JsonTokenType.String)
5252
{

tests/Tests.AzureAppConfiguration/Integration/IntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using Microsoft.Extensions.Configuration;
1616
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
1717
using Microsoft.Extensions.Configuration.AzureAppConfiguration.AzureKeyVault;
18-
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReferences;
18+
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference;
1919
using Microsoft.Extensions.Configuration.AzureAppConfiguration.FeatureManagement;
2020
using Microsoft.FeatureManagement;
2121
using System;

tests/Tests.AzureAppConfiguration/Unit/SnapshotReferenceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Azure.Data.AppConfiguration;
77
using Microsoft.Extensions.Configuration;
88
using Microsoft.Extensions.Configuration.AzureAppConfiguration;
9-
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReferences;
9+
using Microsoft.Extensions.Configuration.AzureAppConfiguration.SnapshotReference;
1010
using Moq;
1111
using System;
1212
using System.Collections.Generic;

0 commit comments

Comments
 (0)