Addressed PR comments

Author: samarthlakhotia

src/PolicyInsights/PolicyInsights.Test/ScenarioTests/AttestationTests.ps1

@@ -27,7 +27,7 @@ Gets test subscription ID.
 #>
 function Get-TestSubscriptionId {
    # Reminder: The subscription ID in the test context (created via PS command or by creating an env variable) should be the same as this subscription ID.
-   "086aecf4-23d6-4dfd-99a8-a5c6299f0322" # This is the Azure Governance Perf 21 subscription
+   "0b40be06-04e8-4f70-abde-a502b2646fe8" # This is the Azure Governance Perf 21 subscription
 }
 
 <#
@@ -283,7 +283,7 @@ function Validate-PolicyStateSummary {
    Assert-NotNull $policyStateSummary.Results.NonCompliantPolicies
 
    Assert-NotNull $policyStateSummary.PolicyAssignments
-   Assert-True { $policyStateSummary.PolicyAssignments.Count -gt 0 } 
+   Assert-True { $policyStateSummary.PolicyAssignments.Count -gt 0 }
 
    Foreach ($policyAssignmentSummary in $policyStateSummary.PolicyAssignments) {
       Assert-NotNull $policyAssignmentSummary
@@ -321,7 +321,7 @@ function Validate-SummaryResults {
    param([Microsoft.Azure.Commands.PolicyInsights.Models.SummaryResults] $results,
       [switch]$nonCompliantPoliciesAssertNull = $true
    )
-   
+
    Assert-NotNull $results.NonCompliantResources
    if ($nonCompliantPoliciesAssertNull) {
       Assert-Null $results.NonCompliantPolicies
@@ -641,10 +641,10 @@ function Validate-AttestationProperties {
       [Parameter(Mandatory = $false)]$expectedAssessmentDate = $null
    )
    if ($null -ne $expectedName) {
-      Assert-AreEqual $expectedName $attestation.Name 
+      Assert-AreEqual $expectedName $attestation.Name
    }
    if ($null -ne $expectedProvisioningState) {
-      Assert-AreEqual $expectedProvisioningState $attestation.ProvisioningState     
+      Assert-AreEqual $expectedProvisioningState $attestation.ProvisioningState
    }
    if ($null -ne $expectedPolicyAssignmentId) {
       Assert-AreEqual $expectedPolicyAssignmentId $attestation.PolicyAssignmentId
@@ -660,7 +660,7 @@ function Validate-AttestationProperties {
    }
    if ($null -ne $expectedMetadata) {
       $expectedMetadataJson = [Newtonsoft.Json.Linq.JObject]::Parse($expectedMetadata)
-      Assert-AreEqual $expectedMetadataJson.ToString() $attestation.metadata.ToString()
+      Assert-AreEqual $expectedMetadataJson.ToString() $attestation.metadata.metadata.ToString()
    }
    if ($null -ne $expectedEvidence) {
       Validate-PolicyAttestationEvidence($attestation.Evidence, $expectedEvidence)
@@ -682,7 +682,7 @@ Validates an attestation evidence.
 #>
 function Validate-AttestationEvidence {
    param($actualEvidence, $expectedEvidence)
-   
+
    Assert-NotNullOrEmpty $actualEvidence
    for ($i = 0; $i -lt $actualEvidence.Count; $i++) {
       Assert-AreEqual $expectedEvidence[$i].Description $actualEvidence[$i].Description

src/PolicyInsights/PolicyInsights.Test/ScenarioTests/Common.ps1

@@ -79,7 +79,7 @@ public class NewAzureRmPolicyAttestation : AttestationCmdletBase
         public DateTime? AssessmentDate { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = ParameterHelpMessages.AttestationMetadata)]
-        public object Metadata { get; set; }
+        public PSAttestationMetadata Metadata { get; set; }
 
         public override void Execute()
         {

src/PolicyInsights/PolicyInsights/Cmdlets/Attestations/NewAzureRmPolicyAttestation.cs

@@ -84,7 +84,7 @@ public class SetAzureRmPolicyAttestation : AttestationCmdletBase
         public DateTime? AssessmentDate { get; set; }
 
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = ParameterHelpMessages.AttestationMetadata)]
-        public object Metadata { get; set; }
+        public PSAttestationMetadata Metadata { get; set; }
 
         public override void Execute()
         {
@@ -106,7 +106,7 @@ public override void Execute()
                 this.Comment = this.IsParameterBound(c => c.Comment) ? this.Comment : this.InputObject?.Comment;
                 this.Evidence = this.IsParameterBound(c => c.Evidence) ? this.Evidence : this.InputObject?.Evidence;
                 this.AssessmentDate = this.IsParameterBound(c => c.AssessmentDate) ? this.AssessmentDate : this.InputObject?.AssessmentDate;
-                this.Metadata = this.IsParameterBound(c => c.Metadata) ? ConvertToMetadataJObject(this.Metadata) : this.InputObject?.Metadata;
+                this.Metadata = this.IsParameterBound(c => c.Metadata) ? this.Metadata : this.InputObject?.Metadata;
             }
 
             if (this.IsParameterBound(c => c.ResourceId))

src/PolicyInsights/PolicyInsights/Cmdlets/Attestations/SetAzureRmPolicyAttestation.cs

@@ -99,13 +99,13 @@ protected string GetAttestationName(string name = null, string resourceId = null
             return attestationName;
         }
 
-        protected static JObject ConvertToMetadataJObject(object metadata)
+        protected static JObject ConvertToMetadataJObject(PSAttestationMetadata metadata)
         {
             if (metadata != null)
             {
                 try
                 {
-                    return JObject.Parse(metadata.ToString());
+                    return JObject.Parse(metadata.Metadata.ToString());
                 }
                 catch
                 {

src/PolicyInsights/PolicyInsights/Common/AttestationCmdletBase.cs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.PolicyInsights.Models.Attestations
     using Newtonsoft.Json;
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     public class PSAttestation{
 
@@ -110,7 +110,7 @@ public class PSAttestation{
         /// <summary>
         /// Gets or sets additional metadata for this attestation
         /// </summary>
-        public object Metadata { get; set; }
+        public PSAttestationMetadata Metadata { get; set; }
 
         /// <summary>
         /// Gets azure Resource Manager metadata containing createdBy and
@@ -138,7 +138,7 @@ public PSAttestation(Attestation attestation)
             this.ExpiresOn = attestation.ExpiresOn;
             this.Owner = attestation.Owner;
             this.Comment = attestation.Comments;
-            this.Metadata = attestation.Metadata;
+            this.Metadata = attestation.Metadata != null? new PSAttestationMetadata(attestation.Metadata): null;
             this.LastComplianceStateChangeAt = attestation.LastComplianceStateChangeAt;
             this.AssessmentDate = attestation.AssessmentDate;
             this.Evidence = attestation.Evidence?.Select(evidence => new PSAttestationEvidence(evidence)).ToArray();

src/PolicyInsights/PolicyInsights/Models/Attestations/PSAttestation.cs

@@ -22,7 +22,6 @@ namespace Microsoft.Azure.Commands.PolicyInsights.Models.Attestations
 {
     public class PSAttestationEvidence
     {
-        
         /// <summary>
         /// Gets or sets the description for this piece of evidence.
         /// </summary>