Skip to content

Add in single check for OR dest policy parsing #13697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amnguye merged 3 commits into from
Jul 27, 2020
Merged

Add in single check for OR dest policy parsing #13697

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d157d9
Add in single check for OR dest policy parsing
amnguye Jul 23, 2020
6482a72
Merge branch 'master' into fix/storage/or-destblob-single
amnguye Jul 24, 2020
8f8491e
accident merge conflict, correct camelCase
amnguye Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions sdk/storage/Azure.Storage.Blobs/src/BlobExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,20 @@ internal static BlobProperties ToBlobProperties(this BlobPropertiesInternal prop
/// </returns>
internal static IList<ObjectReplicationPolicy> ParseObjectReplicationIds(this IDictionary<string, string> OrIds)
{
// If the dictionary contains a key with policy id, we are not required to do any parsing since
// the policy id should already be stored in the ObjectReplicationDestinationPolicyId.
if (OrIds.First().Key == "policy-id")
try
{
// If the dictionary contains a key with policy id, we are not required to do any parsing since
// the policy id should already be stored in the ObjectReplicationDestinationPolicyId.
KeyValuePair<string, string> destPolicy = OrIds.Single(id => (id.Key == "policy-id"));
return default;
}
List <ObjectReplicationPolicy> OrProperties = new List<ObjectReplicationPolicy>();
catch (Exception)
{
// If an exception is thrown by Single then we have confirmed that there's not a policy id already
// stored in the ObjectReplicationDestinationPolicyId and that we have the unparsed
// Object Replication headers from the source blob.
}
List<ObjectReplicationPolicy> OrProperties = new List<ObjectReplicationPolicy>();
foreach (KeyValuePair<string, string> status in OrIds)
{
string[] parsedIds = status.Key.Split('_');
Expand All @@ -188,7 +195,7 @@ internal static IList<ObjectReplicationPolicy> ParseObjectReplicationIds(this ID
OrProperties[policyIndex].Rules.Add(new ObjectReplicationRule()
{
RuleId = parsedIds[1],
ReplicationStatus = (ObjectReplicationStatus) Enum.Parse(typeof(ObjectReplicationStatus), status.Value, true)
ReplicationStatus = (ObjectReplicationStatus)Enum.Parse(typeof(ObjectReplicationStatus), status.Value, true)
});
}
else
Expand Down Expand Up @@ -228,17 +235,17 @@ internal static IList<ObjectReplicationPolicy> ParseObjectReplicationMetadata(th
List<ObjectReplicationPolicy> OrProperties = new List<ObjectReplicationPolicy>();
foreach (KeyValuePair<string, string> status in OrMetadata)
{
string[] ParsedIds = status.Key.Split('_');
if (ParsedIds[0].StartsWith("or-", System.StringComparison.InvariantCulture))
string[] parsedIds = status.Key.Split('_');
if (parsedIds[0].StartsWith("or-", System.StringComparison.InvariantCulture))
{
ParsedIds[0] = ParsedIds[0].Substring("or-".Length);
parsedIds[0] = parsedIds[0].Substring("or-".Length);
}
int policyIndex = OrProperties.FindIndex(policy => policy.PolicyId == ParsedIds[0]);
int policyIndex = OrProperties.FindIndex(policy => policy.PolicyId == parsedIds[0]);
if (policyIndex > -1)
{
OrProperties[policyIndex].Rules.Add(new ObjectReplicationRule()
{
RuleId = ParsedIds[1],
RuleId = parsedIds[1],
ReplicationStatus = (ObjectReplicationStatus)Enum.Parse(typeof(ObjectReplicationStatus), status.Value, true)
});
}
Expand All @@ -247,12 +254,12 @@ internal static IList<ObjectReplicationPolicy> ParseObjectReplicationMetadata(th
IList<ObjectReplicationRule> NewRuleStatus = new List<ObjectReplicationRule>();
NewRuleStatus.Add(new ObjectReplicationRule()
{
RuleId = ParsedIds[1],
RuleId = parsedIds[1],
ReplicationStatus = (ObjectReplicationStatus)Enum.Parse(typeof(ObjectReplicationStatus), status.Value, true)
});
OrProperties.Add(new ObjectReplicationPolicy()
{
PolicyId = ParsedIds[0],
PolicyId = parsedIds[0],
Rules = NewRuleStatus
});
}
Expand Down