b/352186158 Ignore order of label attributes (#24)

While attributes are usually in the order 'key, value', they can sometimes be reversed. Fix parsing logic to not rely on order.
GoogleCloudPlatform · Jul 10, 2024 · 23c88a3 · 23c88a3
1 parent 5045002
commit 23c88a3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/sources/Google.Solutions.LicenseTracker.Test/Data/Events/Config/TestSetLabelsEvent.cs b/sources/Google.Solutions.LicenseTracker.Test/Data/Events/Config/TestSetLabelsEvent.cs
@@ -52,8 +52,8 @@ public void WhenFirstOperationAndLabelsNotEmpty_ThenLabelsAreSet()
  'value': 'value-1'
  },
  {
- 'key': 'label-2',
- 'value': 'value-2'
+ 'value': 'value-2',
+ 'key': 'label-2'
  },
  {
  'key': 'label-2',

diff --git a/sources/Google.Solutions.LicenseTracker.Test/Data/Events/Config/TestUpdateInstanceEvent.cs b/sources/Google.Solutions.LicenseTracker.Test/Data/Events/Config/TestUpdateInstanceEvent.cs
@@ -93,8 +93,8 @@ public void WhenFirstOperation_ThenMachineTypeIsSet()
  },
  'labels': [
  {
- 'key': 'label-1',
- 'value': 'value-1'
+ 'value': 'value-1',
+ 'key': 'label-1'
  },
  {
  'key': 'label-2',

diff --git a/...ces/Google.Solutions.LicenseTracker.Test/Data/Events/Lifecycle/TestInsertInstanceEvent.cs b/...ces/Google.Solutions.LicenseTracker.Test/Data/Events/Lifecycle/TestInsertInstanceEvent.cs
@@ -266,8 +266,8 @@ public void WhenInstanceHasDuplicateLabels_ThenFieldsAreExtracted()
  },
  'labels': [
  {
- 'key': 'label-1',
- 'value': 'value-1'
+ 'value': 'value-1',
+ 'key': 'label-1'
  },
  {
  'key': 'label-1',

diff --git a/sources/Google.Solutions.LicenseTracker/Data/Events/Config/SetLabelsEvent.cs b/sources/Google.Solutions.LicenseTracker/Data/Events/Config/SetLabelsEvent.cs
@@ -44,8 +44,8 @@ public SetLabelsEvent(LogRecord logRecord) : base(logRecord)
  this.Labels = labels
  .OfType<JObject>()
  .Select(item => new {
- Key = (string?)item.PropertyValues().ElementAtOrDefault(0),
- Value = (string?)item.PropertyValues().ElementAtOrDefault(1)
+ Key = (string?)item.Value<string?>("key"),
+ Value = (string?)item.Value<string?>("value")
  })
  .Where(item => item.Key != null && item.Value != null)
  .DistinctBy(item => item.Key)

diff --git a/sources/Google.Solutions.LicenseTracker/Data/Events/Config/UpdateInstanceEvent.cs b/sources/Google.Solutions.LicenseTracker/Data/Events/Config/UpdateInstanceEvent.cs
@@ -71,8 +71,8 @@ public UpdateInstanceEvent(LogRecord logRecord) : base(logRecord)
  this.Labels = labels
  .OfType<JObject>()
  .Select(item => new {
- Key = (string?)item.PropertyValues().ElementAtOrDefault(0),
- Value = (string?)item.PropertyValues().ElementAtOrDefault(1)
+ Key = (string?)item.Value<string?>("key"),
+ Value = (string?)item.Value<string?>("value")
  })
  .Where(item => item.Key != null && item.Value != null)
  .DistinctBy(item => item.Key)

diff --git a/sources/Google.Solutions.LicenseTracker/Data/Events/Lifecycle/InsertInstanceEvent.cs b/sources/Google.Solutions.LicenseTracker/Data/Events/Lifecycle/InsertInstanceEvent.cs
@@ -107,8 +107,8 @@ internal InsertInstanceEvent(LogRecord logRecord) : base(logRecord)
  this.Labels = labels
  .OfType<JObject>()
  .Select(item => new {
- Key = (string?)item.PropertyValues().ElementAtOrDefault(0),
- Value = (string?)item.PropertyValues().ElementAtOrDefault(1)
+ Key = (string?)item.Value<string?>("key"),
+ Value = (string?)item.Value<string?>("value")
  })
  .Where(item => item.Key != null && item.Value != null)
  .DistinctBy(item => item.Key)