KeyVault improvements

src/ResourceManager/KeyVault/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Updated cmdlets to include piping scenarios
 * Fix issue with Default Resource Group in CloudShell
 
 ## Version 4.2.0

src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/RemoveKeyVaultKeyTests.cs

@@ -24,9 +24,9 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
     public class RemoveKeyVaultKeyTests : KeyVaultUnitTestBase
     {
         private RemoveAzureKeyVaultKey cmdlet;
-        private KeyAttributes keyAttributes;
+        private PSKeyVaultKeyAttributes keyAttributes;
         private WebKey.JsonWebKey webKey;
-        private DeletedKeyBundle keyBundle;
+        private PSDeletedKeyVaultKey keyBundle;
 
         public RemoveKeyVaultKeyTests()
         {
@@ -39,16 +39,16 @@ public RemoveKeyVaultKeyTests()
                 VaultName = VaultName
             };
 
-            keyAttributes = new KeyAttributes(true, DateTime.Now, DateTime.Now, "HSM", new string[] { "All" }, null);
+            keyAttributes = new PSKeyVaultKeyAttributes(true, DateTime.Now, DateTime.Now, "HSM", new string[] { "All" }, null);
             webKey = new WebKey.JsonWebKey();
-            keyBundle = new DeletedKeyBundle() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName };
+            keyBundle = new PSDeletedKeyVaultKey() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName };
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanRemoveKeyWithPassThruTest()
         {
-            DeletedKeyBundle expected = keyBundle;
+            PSDeletedKeyVaultKey expected = keyBundle;
             keyVaultClientMock.Setup(kv => kv.DeleteKey(VaultName, KeyName)).Returns(expected).Verifiable();
 
             // Mock the should process to return true
@@ -67,7 +67,7 @@ public void CanRemoveKeyWithPassThruTest()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanRemoveKeyWithNoPassThruTest()
         {
-            DeletedKeyBundle expected = keyBundle;
+            PSDeletedKeyVaultKey expected = keyBundle;
             keyVaultClientMock.Setup(kv => kv.DeleteKey(VaultName, KeyName)).Returns(expected).Verifiable();
 
             // Mock the should process to return true
@@ -89,7 +89,7 @@ public void CannotRemoveKeyWithoutShouldProcessOrForceConfirmationTest()
             // Should process but without force
             commandRuntimeMock.Setup(cr => cr.ShouldProcess(KeyName, It.IsAny<string>())).Returns(true);
 
-            KeyBundle expected = null;
+            PSKeyVaultKey expected = null;
 
             cmdlet.Name = KeyName;
             cmdlet.PassThru = true;
@@ -121,7 +121,7 @@ public void ErrorRemoveKeyWithPassThruTest()
             catch { }
 
             keyVaultClientMock.VerifyAll();
-            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<KeyBundle>()), Times.Never());
+            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultKey>()), Times.Never());
         }
     }
 }

src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/RemoveKeyVaultSecretTests.cs

@@ -42,7 +42,7 @@ public RemoveKeyVaultSecretTests()
         public void CanRemoveSecretWithPassThruTest()
         {
             SecureString secureSecretValue = SecretValue.ConvertToSecureString();
-            DeletedSecret expected = new DeletedSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
+            PSDeletedKeyVaultSecret expected = new PSDeletedKeyVaultSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
             keyVaultClientMock.Setup(kv => kv.DeleteSecret(VaultName, SecretName)).Returns(expected).Verifiable();
 
             // Mock the should process to return true
@@ -71,7 +71,7 @@ public void CanRemoveSecretWithPassThruTest()
         public void CanRemoveSecretWithNoPassThruTest()
         {
             SecureString secureSecretValue = SecretValue.ConvertToSecureString();
-            DeletedSecret expected = new DeletedSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
+            PSDeletedKeyVaultSecret expected = new PSDeletedKeyVaultSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
             keyVaultClientMock.Setup(kv => kv.DeleteSecret(VaultName, SecretName)).Returns(expected).Verifiable();
 
             // Mock the should process to return true
@@ -93,7 +93,7 @@ public void CannotRemoveSecretWithoutShouldProcessOrForceConfirmationTest()
             // Should process but without force
             commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
 
-            Secret expected = null;
+            PSKeyVaultSecret expected = null;
 
             cmdlet.Name = SecretName;
             cmdlet.PassThru = true;
@@ -125,7 +125,7 @@ public void ErrorRemoveSecretWithPassThruTest()
             catch { }
 
             keyVaultClientMock.VerifyAll();
-            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Secret>()), Times.Never());
+            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultSecret>()), Times.Never());
         }
     }
 }

src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/SetKeyVaultKeyAttributeTests.cs

@@ -24,17 +24,17 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
     public class SetKeyVaultKeyAttributeTests : KeyVaultUnitTestBase
     {
         private SetAzureKeyVaultKeyAttribute cmdlet;
-        private KeyAttributes keyAttributes;
+        private PSKeyVaultKeyAttributes keyAttributes;
         private WebKey.JsonWebKey webKey;
-        private KeyBundle keyBundle;
+        private PSKeyVaultKey keyBundle;
 
         public SetKeyVaultKeyAttributeTests()
         {
             base.SetupTest();
 
-            keyAttributes = new KeyAttributes(true, DateTime.Now, DateTime.Now, null, null, null);
+            keyAttributes = new PSKeyVaultKeyAttributes(true, DateTime.Now, DateTime.Now, null, null, null);
             webKey = new WebKey.JsonWebKey();
-            keyBundle = new KeyBundle() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName, Version = KeyVersion };
+            keyBundle = new PSKeyVaultKey() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName, Version = KeyVersion };
 
             cmdlet = new SetAzureKeyVaultKeyAttribute()
             {
@@ -56,9 +56,9 @@ public void CanSetKeyAttributeTest()
             // Mock the should process to return true
             commandRuntimeMock.Setup(cr => cr.ShouldProcess(KeyName, It.IsAny<string>())).Returns(true);
 
-            KeyBundle expected = keyBundle;
+            PSKeyVaultKey expected = keyBundle;
             keyVaultClientMock.Setup(kv => kv.UpdateKey(VaultName, KeyName, string.Empty,
-                It.Is<KeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
+                It.Is<PSKeyVaultKeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
                         && kt.Expires == keyAttributes.Expires
                         && kt.NotBefore == keyAttributes.NotBefore
                         && kt.KeyType == keyAttributes.KeyType
@@ -79,9 +79,9 @@ public void ErrorSetKeyTest()
             // Mock the should process to return true
             commandRuntimeMock.Setup(cr => cr.ShouldProcess(KeyName, It.IsAny<string>())).Returns(true);
 
-            KeyBundle expected = keyBundle;
+            PSKeyVaultKey expected = keyBundle;
             keyVaultClientMock.Setup(kv => kv.UpdateKey(VaultName, KeyName, string.Empty,
-                It.Is<KeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
+                It.Is<PSKeyVaultKeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
                         && kt.Expires == keyAttributes.Expires
                         && kt.NotBefore == keyAttributes.NotBefore
                         && kt.KeyType == keyAttributes.KeyType
@@ -96,7 +96,7 @@ public void ErrorSetKeyTest()
 
             // Assert
             keyVaultClientMock.VerifyAll();
-            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<KeyBundle>()), Times.Never());
+            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultKey>()), Times.Never());
         }
     }
 }

src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/SetKeyVaultSecretAttributeTests.cs

@@ -25,14 +25,14 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
     public class SetKeyVaultSecretAttributeTests : KeyVaultUnitTestBase
     {
         private SetAzureKeyVaultSecretAttribute cmdlet;
-        private SecretAttributes secretAttributes;
-        private Secret secret;
+        private PSKeyVaultSecretAttributes secretAttributes;
+        private PSKeyVaultSecret secret;
         public SetKeyVaultSecretAttributeTests()
         {
             base.SetupTest();
 
-            secretAttributes = new SecretAttributes(true, DateTime.UtcNow.AddYears(2), DateTime.UtcNow, "contenttype", null);
-            secret = new Secret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = null, Attributes = secretAttributes };
+            secretAttributes = new PSKeyVaultSecretAttributes(true, DateTime.UtcNow.AddYears(2), DateTime.UtcNow, "contenttype", null);
+            secret = new PSKeyVaultSecret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = null, Attributes = secretAttributes };
 
             cmdlet = new SetAzureKeyVaultSecretAttribute()
             {
@@ -57,9 +57,9 @@ public void CanSetSecretAttributeTest()
             // Mock the should process to return true
             commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
 
-            Secret expected = secret;
+            PSKeyVaultSecret expected = secret;
             keyVaultClientMock.Setup(kv => kv.UpdateSecret(VaultName, SecretName, SecretVersion,
-                It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
+                It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
                         && st.Expires == secretAttributes.Expires
                         && st.NotBefore == secretAttributes.NotBefore
                         && st.ContentType == secretAttributes.ContentType
@@ -80,7 +80,7 @@ public void ErrorSetSecretAttributeTest()
             commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
 
             keyVaultClientMock.Setup(kv => kv.UpdateSecret(VaultName, SecretName, SecretVersion,
-                It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
+                It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
                         && st.Expires == secretAttributes.Expires
                         && st.NotBefore == secretAttributes.NotBefore
                         && st.ContentType == secretAttributes.ContentType
@@ -94,7 +94,7 @@ public void ErrorSetSecretAttributeTest()
             catch { }
 
             keyVaultClientMock.VerifyAll();
-            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Secret>()), Times.Never());
+            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultSecret>()), Times.Never());
         }
     }
 }

src/ResourceManager/KeyVault/Commands.KeyVault.Test/UnitTests/SetKeyVaultSecretTests.cs

@@ -25,17 +25,17 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
     public class SetKeyVaultSecretTests : KeyVaultUnitTestBase
     {
         private SetAzureKeyVaultSecret cmdlet;
-        private SecretAttributes secretAttributes;
+        private PSKeyVaultSecretAttributes secretAttributes;
         private SecureString secureSecretValue;
-        private Secret secret;
+        private PSKeyVaultSecret secret;
 
         public SetKeyVaultSecretTests()
         {
             base.SetupTest();
 
-            secretAttributes = new SecretAttributes(true, null, null, null, null);
+            secretAttributes = new PSKeyVaultSecretAttributes(true, null, null, null, null);
             secureSecretValue = SecretValue.ConvertToSecureString();
-            secret = new Secret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = secureSecretValue, Attributes = secretAttributes };
+            secret = new PSKeyVaultSecret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = secureSecretValue, Attributes = secretAttributes };
 
             cmdlet = new SetAzureKeyVaultSecret()
             {
@@ -56,9 +56,9 @@ public SetKeyVaultSecretTests()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void CanSetSecretTest()
         {
-            Secret expected = secret;
+            PSKeyVaultSecret expected = secret;
             keyVaultClientMock.Setup(kv => kv.SetSecret(VaultName, SecretName, secureSecretValue,
-                It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
+                It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
                         && st.Expires == secretAttributes.Expires
                         && st.NotBefore == secretAttributes.NotBefore
                         && st.ContentType == secretAttributes.ContentType
@@ -82,7 +82,7 @@ public void ErrorSetSecretTest()
             commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
 
             keyVaultClientMock.Setup(kv => kv.SetSecret(VaultName, SecretName, secureSecretValue,
-                It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
+                It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
                         && st.Expires == secretAttributes.Expires
                         && st.NotBefore == secretAttributes.NotBefore
                         && st.ContentType == secretAttributes.ContentType
@@ -96,7 +96,7 @@ public void ErrorSetSecretTest()
             catch { }
 
             keyVaultClientMock.VerifyAll();
-            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Secret>()), Times.Never());
+            commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultSecret>()), Times.Never());
         }
     }
 }

src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj

@@ -93,23 +93,23 @@
     <Compile Include="Commands\UndoAzureKeyVaultRemoval.cs" />
     <Compile Include="Commands\UndoAzureKeyVaultKeyRemoval.cs" />
     <Compile Include="Commands\UndoAzureKeyVaultSecretRemoval.cs" />
-    <Compile Include="Models\DeletedCertificateIdentityItem.cs" />
-    <Compile Include="Models\DeletedKeyVaultCertificate.cs" />
-    <Compile Include="Models\PSDeletedVault.cs" />
-    <Compile Include="Models\CertificateIdentityItem.cs" />
+    <Compile Include="Models\PSDeletedKeyVaultCertificateIdentityItem.cs" />
+    <Compile Include="Models\PSDeletedKeyVaultCertificate.cs" />
+    <Compile Include="Models\PSDeletedKeyVault.cs" />
+    <Compile Include="Models\PSKeyVaultCertificateIdentityItem.cs" />
     <Compile Include="Commands\Constants.cs" />
-    <Compile Include="Models\CertificateIssuerIdentityItem.cs" />
-    <Compile Include="Models\DeletedKeyBundle.cs" />
-    <Compile Include="Models\DeletedKeyIdentityItem.cs" />
-    <Compile Include="Models\DeletedSecret.cs" />
-    <Compile Include="Models\DeletedSecretIdentityItem.cs" />
-    <Compile Include="Models\KeyVaultCertificate.cs" />
-    <Compile Include="Models\KeyVaultCertificateAdministratorDetails.cs" />
-    <Compile Include="Models\KeyVaultCertificateContact.cs" />
-    <Compile Include="Models\KeyVaultCertificateIssuer.cs" />
-    <Compile Include="Models\KeyVaultCertificateOperation.cs" />
-    <Compile Include="Models\KeyVaultCertificateOrganizationDetails.cs" />
-    <Compile Include="Models\KeyVaultCertificatePolicy.cs" />
+    <Compile Include="Models\PSKeyVaultCertificateIssuerIdentityItem.cs" />
+    <Compile Include="Models\PSDeletedKeyVaultKey.cs" />
+    <Compile Include="Models\PSDeletedKeyVaultKeyIdentityItem.cs" />
+    <Compile Include="Models\PSDeletedKeyVaultSecret.cs" />
+    <Compile Include="Models\PSDeletedKeyVaultSecretIdentityItem.cs" />
+    <Compile Include="Models\PSKeyVaultCertificate.cs" />
+    <Compile Include="Models\PSKeyVaultCertificateAdministratorDetails.cs" />
+    <Compile Include="Models\PSKeyVaultCertificateContact.cs" />
+    <Compile Include="Models\PSKeyVaultCertificateIssuer.cs" />
+    <Compile Include="Models\PSKeyVaultCertificateOperation.cs" />
+    <Compile Include="Models\PSKeyVaultCertificateOrganizationDetails.cs" />
+    <Compile Include="Models\PSKeyVaultCertificatePolicy.cs" />
     <Compile Include="Models\ManagedStorageAccounts\ManagedStorageAccount.cs" />
     <Compile Include="Models\ManagedStorageAccounts\ManagedStorageAccountAttributes.cs" />
     <Compile Include="Models\ManagedStorageAccounts\ManagedStorageAccountListItem.cs" />
@@ -119,10 +119,10 @@
     <Compile Include="Models\ManagedStorageAccounts\ManagedStorageSasDefinitiontFilterOptions.cs" />
     <Compile Include="Models\VaultManagementClient.cs" />
     <Compile Include="Models\ModelExtensions.cs" />
-    <Compile Include="Models\PSVault.cs" />
-    <Compile Include="Models\PSVaultAccessPolicy.cs" />
+    <Compile Include="Models\PSKeyVault.cs" />
+    <Compile Include="Models\PSKeyVaultAccessPolicy.cs" />
     <Compile Include="Models\VaultCreationParameters.cs" />
-    <Compile Include="Models\PSVaultIdentityItem.cs" />
+    <Compile Include="Models\PSKeyVaultIdentityItem.cs" />
     <Compile Include="Commands\GetAzureKeyVault.cs" />
     <Compile Include="Commands\NewAzureKeyVault.cs" />
     <Compile Include="Commands\RemoveAzureKeyVault.cs" />
@@ -157,16 +157,16 @@
     <Compile Include="Models\DataServiceCredential.cs" />
     <Compile Include="Models\IKeyVaultDataServiceClient.cs" />
     <Compile Include="Models\IWebKeyConverter.cs" />
-    <Compile Include="Models\KeyAttributes.cs" />
-    <Compile Include="Models\KeyBundle.cs" />
-    <Compile Include="Models\KeyIdentityItem.cs" />
+    <Compile Include="Models\PSKeyVaultKeyAttributes.cs" />
+    <Compile Include="Models\PSKeyVaultKey.cs" />
+    <Compile Include="Models\PSKeyVaultKeyIdentityItem.cs" />
     <Compile Include="Models\KeyVaultCmdletBase.cs" />
     <Compile Include="Models\KeyVaultObjectFilterOptions.cs" />
     <Compile Include="Models\ObjectIdentifier.cs" />
     <Compile Include="Models\PfxWebKeyConverter.cs" />
-    <Compile Include="Models\Secret.cs" />
-    <Compile Include="Models\SecretAttributes.cs" />
-    <Compile Include="Models\SecretIdentityItem.cs" />
+    <Compile Include="Models\PSKeyVaultSecret.cs" />
+    <Compile Include="Models\PSKeyVaultSecretAttributes.cs" />
+    <Compile Include="Models\PSKeyVaultSecretIdentityItem.cs" />
     <Compile Include="Models\SecureStringExtensions.cs" />
     <Compile Include="Models\TagsHelper.cs" />
     <Compile Include="Models\VaultUriHelper.cs" />