working solution

Author: Aditya Abhishek

src/VirtualClient/VirtualClient.Contracts/KeyVaultDescriptor.cs

@@ -45,41 +45,37 @@ public KeyVaultDescriptor(DependencyDescriptor descriptor)
         /// </summary>
         /// <param name="vaultUri">URI of Azure Key Vault.</param>
         /// <param name="objectName">Name of the Secret, key or Certificate as applicable.</param>
-        public KeyVaultDescriptor(string vaultUri, string objectName)
+        /// <param name="objectType">Type: Secret, key or Certificate as applicable.</param>
+        public KeyVaultDescriptor(KeyVaultObjectType objectType, string objectName, string? vaultUri = null)
             : base()
         {
-            vaultUri.ThrowIfNullOrWhiteSpace(nameof(vaultUri));
             objectName.ThrowIfNullOrWhiteSpace(nameof(objectName));
 
             this.VaultUri = vaultUri;
-            this.ObjectName = objectName;
+            this.Name = objectName;
+            this.ObjectType = objectType;
         }
 
         /// <summary>
-        /// Gets or sets the URI of the Azure Key Vault.
-        /// </summary>
-        public string VaultUri
-        {
-            get => this.GetValue<string>(nameof(this.VaultUri));
-            set => this[nameof(this.VaultUri)] = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the secret, key, or certificate.
+        /// Gets or sets the type of the Key Vault object (e.g. "Secret", "Key", "Certificate").
         /// </summary>
-        public string ObjectName
+        public KeyVaultObjectType ObjectType
         {
-            get => this.GetValue<string>(nameof(this.ObjectName));
-            set => this[nameof(this.ObjectName)] = value;
+            get => this.GetValue<KeyVaultObjectType>(nameof(this.ObjectType));
+            set => this[nameof(this.ObjectType)] = value;
         }
 
         /// <summary>
-        /// Gets or sets the type of the Key Vault object (e.g. "Secret", "Key", "Certificate").
+        /// Gets or sets the URI of the Azure Key Vault.
         /// </summary>
-        public KeyVaultObjectType ObjectType
+        public string VaultUri
         {
-            get => this.GetValue<KeyVaultObjectType>(nameof(this.ObjectType));
-            set => this[nameof(this.ObjectType)] = value;
+            get
+            {
+                this.TryGetValue(nameof(this.VaultUri), out IConvertible vaultUri);
+                return vaultUri?.ToString();
+            }
+            set => this[nameof(this.VaultUri)] = value;
         }
 
         /// <summary>

src/VirtualClient/VirtualClient.Core/KeyVaultManager.cs

@@ -70,14 +70,14 @@ public async Task<KeyVaultDescriptor> GetSecretAsync(
         {
             this.ValidateKeyVaultStore();
             this.StoreDescription.ThrowIfNull(nameof(this.StoreDescription));
-            KeyVaultManager.ValidateDescriptor(descriptor, nameof(descriptor.ObjectName));
+            KeyVaultManager.ValidateDescriptor(descriptor, nameof(descriptor.Name));
 
             // Use descriptor.VaultUri if set, otherwise use the store's EndpointUri
             Uri vaultUri = !string.IsNullOrWhiteSpace(descriptor.VaultUri)
                 ? new Uri(descriptor.VaultUri)
                 : ((DependencyKeyVaultStore)this.StoreDescription).EndpointUri;
 
-            string secretName = descriptor.ObjectName;
+            string secretName = descriptor.Name;
 
             SecretClient client = new SecretClient(vaultUri, ((DependencyKeyVaultStore)this.StoreDescription).Credentials);
 
@@ -90,7 +90,7 @@ public async Task<KeyVaultDescriptor> GetSecretAsync(
                     {
                         Value = secret.Value,
                         Version = secret.Properties.Version,
-                        ObjectName = secretName,
+                        Name = secretName,
                         VaultUri = vaultUri.ToString(),
                         ObjectId = secret.Id.ToString(),
                         ObjectType = KeyVaultObjectType.Secret
@@ -146,14 +146,14 @@ public async Task<KeyVaultDescriptor> GetKeyAsync(
             IAsyncPolicy retryPolicy = null)
         {
             this.ValidateKeyVaultStore();
-            KeyVaultManager.ValidateDescriptor(descriptor, nameof(descriptor.ObjectName));
+            KeyVaultManager.ValidateDescriptor(descriptor, nameof(descriptor.Name));
 
             // Use descriptor.VaultUri if set, otherwise use the store's EndpointUri
             Uri vaultUri = !string.IsNullOrWhiteSpace(descriptor.VaultUri)
                 ? new Uri(descriptor.VaultUri)
                 : ((DependencyKeyVaultStore)this.StoreDescription).EndpointUri;
 
-            string keyName = descriptor.ObjectName;
+            string keyName = descriptor.Name;
 
             KeyClient client = new KeyClient(vaultUri, ((DependencyKeyVaultStore)this.StoreDescription).Credentials);
 
@@ -165,7 +165,7 @@ public async Task<KeyVaultDescriptor> GetKeyAsync(
                     KeyVaultDescriptor result = new KeyVaultDescriptor(descriptor)
                     {
                         ObjectType = KeyVaultObjectType.Key,
-                        ObjectName = keyName,
+                        Name = keyName,
                         VaultUri = vaultUri.ToString(),
                         Version = key.Properties.Version,
                         ObjectId = key.Id.ToString()
@@ -221,14 +221,14 @@ public async Task<KeyVaultDescriptor> GetCertificateAsync(
             IAsyncPolicy retryPolicy = null)
         {
             this.ValidateKeyVaultStore();
-            KeyVaultManager.ValidateDescriptor(descriptor, nameof(descriptor.ObjectName));
+            KeyVaultManager.ValidateDescriptor(descriptor, nameof(descriptor.Name));
 
             // Use descriptor.VaultUri if set, otherwise use the store's EndpointUri
             Uri vaultUri = !string.IsNullOrWhiteSpace(descriptor.VaultUri)
                 ? new Uri(descriptor.VaultUri)
                 : ((DependencyKeyVaultStore)this.StoreDescription).EndpointUri;
 
-            string certName = descriptor.ObjectName;
+            string certName = descriptor.Name;
 
             CertificateClient client = new CertificateClient(vaultUri, ((DependencyKeyVaultStore)this.StoreDescription).Credentials);
 
@@ -240,7 +240,7 @@ public async Task<KeyVaultDescriptor> GetCertificateAsync(
                     KeyVaultDescriptor result = new KeyVaultDescriptor(descriptor)
                     {
                         ObjectType = KeyVaultObjectType.Certificate,
-                        ObjectName = certName,
+                        Name = certName,
                         VaultUri = vaultUri.ToString(),
                         Version = cert.Properties.Version,
                         ObjectId = cert.Id.ToString(),