Skip to content

Commit 9f7d966

Browse files
cormacpaynecormacpayne
authored
Merge branch 'preview' into preview-master-merge
2 parents bb46198 + 0b76130 commit 9f7d966

File tree

133 files changed

+4074
-1889
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+4074
-1889
lines changed

‎src/ResourceManager/KeyVault/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Updated cmdlets to include piping scenarios
2122

2223
## Version 4.2.1
2324
* Fix issue with Default Resource Group in CloudShell

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
2424
public class RemoveKeyVaultKeyTests : KeyVaultUnitTestBase
2525
{
2626
private RemoveAzureKeyVaultKey cmdlet;
27-
private KeyAttributes keyAttributes;
27+
private PSKeyVaultKeyAttributes keyAttributes;
2828
private WebKey.JsonWebKey webKey;
29-
private DeletedKeyBundle keyBundle;
29+
private PSDeletedKeyVaultKey keyBundle;
3030

3131
public RemoveKeyVaultKeyTests()
3232
{
@@ -39,16 +39,16 @@ public RemoveKeyVaultKeyTests()
3939
VaultName = VaultName
4040
};
4141

42-
keyAttributes = new KeyAttributes(true, DateTime.Now, DateTime.Now, "HSM", new string[] { "All" }, null);
42+
keyAttributes = new PSKeyVaultKeyAttributes(true, DateTime.Now, DateTime.Now, "HSM", new string[] { "All" }, null);
4343
webKey = new WebKey.JsonWebKey();
44-
keyBundle = new DeletedKeyBundle() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName };
44+
keyBundle = new PSDeletedKeyVaultKey() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName };
4545
}
4646

4747
[Fact]
4848
[Trait(Category.AcceptanceType, Category.CheckIn)]
4949
public void CanRemoveKeyWithPassThruTest()
5050
{
51-
DeletedKeyBundle expected = keyBundle;
51+
PSDeletedKeyVaultKey expected = keyBundle;
5252
keyVaultClientMock.Setup(kv => kv.DeleteKey(VaultName, KeyName)).Returns(expected).Verifiable();
5353

5454
// Mock the should process to return true
@@ -67,7 +67,7 @@ public void CanRemoveKeyWithPassThruTest()
6767
[Trait(Category.AcceptanceType, Category.CheckIn)]
6868
public void CanRemoveKeyWithNoPassThruTest()
6969
{
70-
DeletedKeyBundle expected = keyBundle;
70+
PSDeletedKeyVaultKey expected = keyBundle;
7171
keyVaultClientMock.Setup(kv => kv.DeleteKey(VaultName, KeyName)).Returns(expected).Verifiable();
7272

7373
// Mock the should process to return true
@@ -89,7 +89,7 @@ public void CannotRemoveKeyWithoutShouldProcessOrForceConfirmationTest()
8989
// Should process but without force
9090
commandRuntimeMock.Setup(cr => cr.ShouldProcess(KeyName, It.IsAny<string>())).Returns(true);
9191

92-
KeyBundle expected = null;
92+
PSKeyVaultKey expected = null;
9393

9494
cmdlet.Name = KeyName;
9595
cmdlet.PassThru = true;
@@ -121,7 +121,7 @@ public void ErrorRemoveKeyWithPassThruTest()
121121
catch { }
122122

123123
keyVaultClientMock.VerifyAll();
124-
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<KeyBundle>()), Times.Never());
124+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultKey>()), Times.Never());
125125
}
126126
}
127127
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public RemoveKeyVaultSecretTests()
4242
public void CanRemoveSecretWithPassThruTest()
4343
{
4444
SecureString secureSecretValue = SecretValue.ConvertToSecureString();
45-
DeletedSecret expected = new DeletedSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
45+
PSDeletedKeyVaultSecret expected = new PSDeletedKeyVaultSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
4646
keyVaultClientMock.Setup(kv => kv.DeleteSecret(VaultName, SecretName)).Returns(expected).Verifiable();
4747

4848
// Mock the should process to return true
@@ -71,7 +71,7 @@ public void CanRemoveSecretWithPassThruTest()
7171
public void CanRemoveSecretWithNoPassThruTest()
7272
{
7373
SecureString secureSecretValue = SecretValue.ConvertToSecureString();
74-
DeletedSecret expected = new DeletedSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
74+
PSDeletedKeyVaultSecret expected = new PSDeletedKeyVaultSecret() { Name = SecretName, VaultName = VaultName, SecretValue = secureSecretValue };
7575
keyVaultClientMock.Setup(kv => kv.DeleteSecret(VaultName, SecretName)).Returns(expected).Verifiable();
7676

7777
// Mock the should process to return true
@@ -93,7 +93,7 @@ public void CannotRemoveSecretWithoutShouldProcessOrForceConfirmationTest()
9393
// Should process but without force
9494
commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
9595

96-
Secret expected = null;
96+
PSKeyVaultSecret expected = null;
9797

9898
cmdlet.Name = SecretName;
9999
cmdlet.PassThru = true;
@@ -125,7 +125,7 @@ public void ErrorRemoveSecretWithPassThruTest()
125125
catch { }
126126

127127
keyVaultClientMock.VerifyAll();
128-
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Secret>()), Times.Never());
128+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultSecret>()), Times.Never());
129129
}
130130
}
131131
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
2424
public class SetKeyVaultKeyAttributeTests : KeyVaultUnitTestBase
2525
{
2626
private SetAzureKeyVaultKeyAttribute cmdlet;
27-
private KeyAttributes keyAttributes;
27+
private PSKeyVaultKeyAttributes keyAttributes;
2828
private WebKey.JsonWebKey webKey;
29-
private KeyBundle keyBundle;
29+
private PSKeyVaultKey keyBundle;
3030

3131
public SetKeyVaultKeyAttributeTests()
3232
{
3333
base.SetupTest();
3434

35-
keyAttributes = new KeyAttributes(true, DateTime.Now, DateTime.Now, null, null, null);
35+
keyAttributes = new PSKeyVaultKeyAttributes(true, DateTime.Now, DateTime.Now, null, null, null);
3636
webKey = new WebKey.JsonWebKey();
37-
keyBundle = new KeyBundle() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName, Version = KeyVersion };
37+
keyBundle = new PSKeyVaultKey() { Attributes = keyAttributes, Key = webKey, Name = KeyName, VaultName = VaultName, Version = KeyVersion };
3838

3939
cmdlet = new SetAzureKeyVaultKeyAttribute()
4040
{
@@ -56,9 +56,9 @@ public void CanSetKeyAttributeTest()
5656
// Mock the should process to return true
5757
commandRuntimeMock.Setup(cr => cr.ShouldProcess(KeyName, It.IsAny<string>())).Returns(true);
5858

59-
KeyBundle expected = keyBundle;
59+
PSKeyVaultKey expected = keyBundle;
6060
keyVaultClientMock.Setup(kv => kv.UpdateKey(VaultName, KeyName, string.Empty,
61-
It.Is<KeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
61+
It.Is<PSKeyVaultKeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
6262
&& kt.Expires == keyAttributes.Expires
6363
&& kt.NotBefore == keyAttributes.NotBefore
6464
&& kt.KeyType == keyAttributes.KeyType
@@ -79,9 +79,9 @@ public void ErrorSetKeyTest()
7979
// Mock the should process to return true
8080
commandRuntimeMock.Setup(cr => cr.ShouldProcess(KeyName, It.IsAny<string>())).Returns(true);
8181

82-
KeyBundle expected = keyBundle;
82+
PSKeyVaultKey expected = keyBundle;
8383
keyVaultClientMock.Setup(kv => kv.UpdateKey(VaultName, KeyName, string.Empty,
84-
It.Is<KeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
84+
It.Is<PSKeyVaultKeyAttributes>(kt => kt.Enabled == keyAttributes.Enabled
8585
&& kt.Expires == keyAttributes.Expires
8686
&& kt.NotBefore == keyAttributes.NotBefore
8787
&& kt.KeyType == keyAttributes.KeyType
@@ -96,7 +96,7 @@ public void ErrorSetKeyTest()
9696

9797
// Assert
9898
keyVaultClientMock.VerifyAll();
99-
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<KeyBundle>()), Times.Never());
99+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultKey>()), Times.Never());
100100
}
101101
}
102102
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
2525
public class SetKeyVaultSecretAttributeTests : KeyVaultUnitTestBase
2626
{
2727
private SetAzureKeyVaultSecretAttribute cmdlet;
28-
private SecretAttributes secretAttributes;
29-
private Secret secret;
28+
private PSKeyVaultSecretAttributes secretAttributes;
29+
private PSKeyVaultSecret secret;
3030
public SetKeyVaultSecretAttributeTests()
3131
{
3232
base.SetupTest();
3333

34-
secretAttributes = new SecretAttributes(true, DateTime.UtcNow.AddYears(2), DateTime.UtcNow, "contenttype", null);
35-
secret = new Secret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = null, Attributes = secretAttributes };
34+
secretAttributes = new PSKeyVaultSecretAttributes(true, DateTime.UtcNow.AddYears(2), DateTime.UtcNow, "contenttype", null);
35+
secret = new PSKeyVaultSecret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = null, Attributes = secretAttributes };
3636

3737
cmdlet = new SetAzureKeyVaultSecretAttribute()
3838
{
@@ -57,9 +57,9 @@ public void CanSetSecretAttributeTest()
5757
// Mock the should process to return true
5858
commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
5959

60-
Secret expected = secret;
60+
PSKeyVaultSecret expected = secret;
6161
keyVaultClientMock.Setup(kv => kv.UpdateSecret(VaultName, SecretName, SecretVersion,
62-
It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
62+
It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
6363
&& st.Expires == secretAttributes.Expires
6464
&& st.NotBefore == secretAttributes.NotBefore
6565
&& st.ContentType == secretAttributes.ContentType
@@ -80,7 +80,7 @@ public void ErrorSetSecretAttributeTest()
8080
commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
8181

8282
keyVaultClientMock.Setup(kv => kv.UpdateSecret(VaultName, SecretName, SecretVersion,
83-
It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
83+
It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
8484
&& st.Expires == secretAttributes.Expires
8585
&& st.NotBefore == secretAttributes.NotBefore
8686
&& st.ContentType == secretAttributes.ContentType
@@ -94,7 +94,7 @@ public void ErrorSetSecretAttributeTest()
9494
catch { }
9595

9696
keyVaultClientMock.VerifyAll();
97-
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Secret>()), Times.Never());
97+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultSecret>()), Times.Never());
9898
}
9999
}
100100
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ namespace Microsoft.Azure.Commands.KeyVault.Test.UnitTests
2525
public class SetKeyVaultSecretTests : KeyVaultUnitTestBase
2626
{
2727
private SetAzureKeyVaultSecret cmdlet;
28-
private SecretAttributes secretAttributes;
28+
private PSKeyVaultSecretAttributes secretAttributes;
2929
private SecureString secureSecretValue;
30-
private Secret secret;
30+
private PSKeyVaultSecret secret;
3131

3232
public SetKeyVaultSecretTests()
3333
{
3434
base.SetupTest();
3535

36-
secretAttributes = new SecretAttributes(true, null, null, null, null);
36+
secretAttributes = new PSKeyVaultSecretAttributes(true, null, null, null, null);
3737
secureSecretValue = SecretValue.ConvertToSecureString();
38-
secret = new Secret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = secureSecretValue, Attributes = secretAttributes };
38+
secret = new PSKeyVaultSecret() { VaultName = VaultName, Name = SecretName, Version = SecretVersion, SecretValue = secureSecretValue, Attributes = secretAttributes };
3939

4040
cmdlet = new SetAzureKeyVaultSecret()
4141
{
@@ -56,9 +56,9 @@ public SetKeyVaultSecretTests()
5656
[Trait(Category.AcceptanceType, Category.CheckIn)]
5757
public void CanSetSecretTest()
5858
{
59-
Secret expected = secret;
59+
PSKeyVaultSecret expected = secret;
6060
keyVaultClientMock.Setup(kv => kv.SetSecret(VaultName, SecretName, secureSecretValue,
61-
It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
61+
It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
6262
&& st.Expires == secretAttributes.Expires
6363
&& st.NotBefore == secretAttributes.NotBefore
6464
&& st.ContentType == secretAttributes.ContentType
@@ -82,7 +82,7 @@ public void ErrorSetSecretTest()
8282
commandRuntimeMock.Setup(cr => cr.ShouldProcess(SecretName, It.IsAny<string>())).Returns(true);
8383

8484
keyVaultClientMock.Setup(kv => kv.SetSecret(VaultName, SecretName, secureSecretValue,
85-
It.Is<SecretAttributes>(st => st.Enabled == secretAttributes.Enabled
85+
It.Is<PSKeyVaultSecretAttributes>(st => st.Enabled == secretAttributes.Enabled
8686
&& st.Expires == secretAttributes.Expires
8787
&& st.NotBefore == secretAttributes.NotBefore
8888
&& st.ContentType == secretAttributes.ContentType
@@ -96,7 +96,7 @@ public void ErrorSetSecretTest()
9696
catch { }
9797

9898
keyVaultClientMock.VerifyAll();
99-
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Secret>()), Times.Never());
99+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<PSKeyVaultSecret>()), Times.Never());
100100
}
101101
}
102102
}

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@
9393
<Compile Include="Commands\UndoAzureKeyVaultRemoval.cs" />
9494
<Compile Include="Commands\UndoAzureKeyVaultKeyRemoval.cs" />
9595
<Compile Include="Commands\UndoAzureKeyVaultSecretRemoval.cs" />
96-
<Compile Include="Models\DeletedCertificateIdentityItem.cs" />
97-
<Compile Include="Models\DeletedKeyVaultCertificate.cs" />
98-
<Compile Include="Models\PSDeletedVault.cs" />
99-
<Compile Include="Models\CertificateIdentityItem.cs" />
96+
<Compile Include="Models\PSDeletedKeyVaultCertificateIdentityItem.cs" />
97+
<Compile Include="Models\PSDeletedKeyVaultCertificate.cs" />
98+
<Compile Include="Models\PSDeletedKeyVault.cs" />
99+
<Compile Include="Models\PSKeyVaultCertificateIdentityItem.cs" />
100100
<Compile Include="Commands\Constants.cs" />
101-
<Compile Include="Models\CertificateIssuerIdentityItem.cs" />
102-
<Compile Include="Models\DeletedKeyBundle.cs" />
103-
<Compile Include="Models\DeletedKeyIdentityItem.cs" />
104-
<Compile Include="Models\DeletedSecret.cs" />
105-
<Compile Include="Models\DeletedSecretIdentityItem.cs" />
106-
<Compile Include="Models\KeyVaultCertificate.cs" />
107-
<Compile Include="Models\KeyVaultCertificateAdministratorDetails.cs" />
108-
<Compile Include="Models\KeyVaultCertificateContact.cs" />
109-
<Compile Include="Models\KeyVaultCertificateIssuer.cs" />
110-
<Compile Include="Models\KeyVaultCertificateOperation.cs" />
111-
<Compile Include="Models\KeyVaultCertificateOrganizationDetails.cs" />
112-
<Compile Include="Models\KeyVaultCertificatePolicy.cs" />
101+
<Compile Include="Models\PSKeyVaultCertificateIssuerIdentityItem.cs" />
102+
<Compile Include="Models\PSDeletedKeyVaultKey.cs" />
103+
<Compile Include="Models\PSDeletedKeyVaultKeyIdentityItem.cs" />
104+
<Compile Include="Models\PSDeletedKeyVaultSecret.cs" />
105+
<Compile Include="Models\PSDeletedKeyVaultSecretIdentityItem.cs" />
106+
<Compile Include="Models\PSKeyVaultCertificate.cs" />
107+
<Compile Include="Models\PSKeyVaultCertificateAdministratorDetails.cs" />
108+
<Compile Include="Models\PSKeyVaultCertificateContact.cs" />
109+
<Compile Include="Models\PSKeyVaultCertificateIssuer.cs" />
110+
<Compile Include="Models\PSKeyVaultCertificateOperation.cs" />
111+
<Compile Include="Models\PSKeyVaultCertificateOrganizationDetails.cs" />
112+
<Compile Include="Models\PSKeyVaultCertificatePolicy.cs" />
113113
<Compile Include="Models\ManagedStorageAccounts\ManagedStorageAccount.cs" />
114114
<Compile Include="Models\ManagedStorageAccounts\ManagedStorageAccountAttributes.cs" />
115115
<Compile Include="Models\ManagedStorageAccounts\ManagedStorageAccountListItem.cs" />
@@ -119,10 +119,10 @@
119119
<Compile Include="Models\ManagedStorageAccounts\ManagedStorageSasDefinitiontFilterOptions.cs" />
120120
<Compile Include="Models\VaultManagementClient.cs" />
121121
<Compile Include="Models\ModelExtensions.cs" />
122-
<Compile Include="Models\PSVault.cs" />
123-
<Compile Include="Models\PSVaultAccessPolicy.cs" />
122+
<Compile Include="Models\PSKeyVault.cs" />
123+
<Compile Include="Models\PSKeyVaultAccessPolicy.cs" />
124124
<Compile Include="Models\VaultCreationParameters.cs" />
125-
<Compile Include="Models\PSVaultIdentityItem.cs" />
125+
<Compile Include="Models\PSKeyVaultIdentityItem.cs" />
126126
<Compile Include="Commands\GetAzureKeyVault.cs" />
127127
<Compile Include="Commands\NewAzureKeyVault.cs" />
128128
<Compile Include="Commands\RemoveAzureKeyVault.cs" />
@@ -157,16 +157,16 @@
157157
<Compile Include="Models\DataServiceCredential.cs" />
158158
<Compile Include="Models\IKeyVaultDataServiceClient.cs" />
159159
<Compile Include="Models\IWebKeyConverter.cs" />
160-
<Compile Include="Models\KeyAttributes.cs" />
161-
<Compile Include="Models\KeyBundle.cs" />
162-
<Compile Include="Models\KeyIdentityItem.cs" />
160+
<Compile Include="Models\PSKeyVaultKeyAttributes.cs" />
161+
<Compile Include="Models\PSKeyVaultKey.cs" />
162+
<Compile Include="Models\PSKeyVaultKeyIdentityItem.cs" />
163163
<Compile Include="Models\KeyVaultCmdletBase.cs" />
164164
<Compile Include="Models\KeyVaultObjectFilterOptions.cs" />
165165
<Compile Include="Models\ObjectIdentifier.cs" />
166166
<Compile Include="Models\PfxWebKeyConverter.cs" />
167-
<Compile Include="Models\Secret.cs" />
168-
<Compile Include="Models\SecretAttributes.cs" />
169-
<Compile Include="Models\SecretIdentityItem.cs" />
167+
<Compile Include="Models\PSKeyVaultSecret.cs" />
168+
<Compile Include="Models\PSKeyVaultSecretAttributes.cs" />
169+
<Compile Include="Models\PSKeyVaultSecretIdentityItem.cs" />
170170
<Compile Include="Models\SecureStringExtensions.cs" />
171171
<Compile Include="Models\TagsHelper.cs" />
172172
<Compile Include="Models\VaultUriHelper.cs" />

0 commit comments

Comments
 (0)