Skip to content

Commit 2c3020e

Browse files
author
Hovsep
committed
Merge pull request #111 from pomortaz/dev
removing try catch from cmdlet classes and getting the inner exception in PSH KV client model
2 parents 26759ec + 9d9d3dd commit 2c3020e

18 files changed

+242
-242
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,14 @@ public void ErrorRemvoeKeyWithPassThruTest()
116116
cmdlet.Name = KeyName;
117117
cmdlet.Force = true;
118118
cmdlet.PassThru = true;
119-
cmdlet.ExecuteCmdlet();
119+
try
120+
{
121+
cmdlet.ExecuteCmdlet();
122+
}
123+
catch { }
120124

121-
// Assert
122125
keyVaultClientMock.VerifyAll();
123-
commandRuntimeMock.Verify(f => f.WriteError(It.IsAny<ErrorRecord>()), Times.Once());
126+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<KeyBundle>()), Times.Never());
124127
}
125128
}
126129
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,14 @@ public void ErrorRemoveSecretWithPassThruTest()
121121
cmdlet.Name = SecretName;
122122
cmdlet.Force = true;
123123
cmdlet.PassThru = true;
124-
cmdlet.ExecuteCmdlet();
124+
try
125+
{
126+
cmdlet.ExecuteCmdlet();
127+
}
128+
catch { }
125129

126130
keyVaultClientMock.VerifyAll();
127-
commandRuntimeMock.Verify(f => f.WriteError(It.IsAny<ErrorRecord>()), Times.Once());
131+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Cmdlet.Secret>()), Times.Never());
128132
}
129133
}
130134
}

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,15 @@ public void ErrorSetKeyTest()
8383
&& kt.KeyOps == keyAttributes.KeyOps)))
8484
.Throws(new Exception("exception")).Verifiable();
8585

86-
cmdlet.ExecuteCmdlet();
86+
try
87+
{
88+
cmdlet.ExecuteCmdlet();
89+
}
90+
catch { }
8791

8892
// Assert
8993
keyVaultClientMock.VerifyAll();
90-
commandRuntimeMock.Verify(f => f.WriteError(It.IsAny<ErrorRecord>()), Times.Once());
94+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<KeyBundle>()), Times.Never());
9195
}
9296
}
9397
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,14 @@ public void ErrorSetSecretTest()
6767

6868
cmdlet.Name = SecretName;
6969
cmdlet.SecretValue = secureSecretValue;
70-
cmdlet.ExecuteCmdlet();
70+
try
71+
{
72+
cmdlet.ExecuteCmdlet();
73+
}
74+
catch{}
7175

72-
// Assert
7376
keyVaultClientMock.VerifyAll();
74-
commandRuntimeMock.Verify(f => f.WriteError(It.IsAny<ErrorRecord>()), Times.Once());
77+
commandRuntimeMock.Verify(f => f.WriteObject(It.IsAny<Cmdlet.Secret>()), Times.Never());
7578
}
7679
}
7780
}

‎src/ResourceManager/KeyVault/Commands.KeyVault/Client/KeyVaultClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ protected virtual async Task<bool> EnsureSuccessStatusCode(HttpResponseMessage r
706706
Error = new Error()
707707
{
708708
Code = response.StatusCode.ToString(),
709-
Message = string.Format("HTTP {0} Error: ", response.StatusCode.ToString(), response.ReasonPhrase),
709+
Message = string.Format("HTTP {0} Error: {1}", response.StatusCode.ToString(), response.ReasonPhrase),
710710
},
711711
};
712712
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
<Compile Include="Models\KeyBundle.cs" />
9393
<Compile Include="Models\KeyIdentityItem.cs" />
9494
<Compile Include="Models\KeyVaultCmdletBase.cs" />
95-
<Compile Include="Models\KeyVaultExceptionHandler.cs" />
9695
<Compile Include="Models\ObjectIdentifier.cs" />
9796
<Compile Include="Models\PfxWebKeyConverter.cs" />
9897
<Compile Include="Models\Secret.cs" />

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/AddAzureKeyVaultKey.cs

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -167,37 +167,30 @@ public class AddAzureKeyVaultKey : KeyVaultCmdletBase
167167

168168
public override void ExecuteCmdlet()
169169
{
170-
try
170+
KeyBundle keyBundle;
171+
switch (ParameterSetName)
171172
{
172-
KeyBundle keyBundle;
173-
switch (ParameterSetName)
174-
{
175-
case CreateParameterSet:
176-
keyBundle = this.DataServiceClient.CreateKey(
177-
VaultName,
178-
Name,
179-
CreateKeyAttributes());
180-
break;
181-
182-
case ImportParameterSet:
183-
bool? importToHsm = null;
184-
keyBundle = this.DataServiceClient.ImportKey(
185-
VaultName, Name,
186-
CreateKeyAttributes(),
187-
CreateWebKeyFromFile(),
188-
string.IsNullOrEmpty(Destination) ? importToHsm : HsmDestination.Equals(Destination, StringComparison.OrdinalIgnoreCase));
189-
break;
190-
191-
default:
192-
throw new ArgumentException(Resources.BadParameterSetName);
193-
}
194-
195-
this.WriteObject(keyBundle);
196-
}
197-
catch (Exception ex)
198-
{
199-
this.WriteErrorDetails(ex);
173+
case CreateParameterSet:
174+
keyBundle = this.DataServiceClient.CreateKey(
175+
VaultName,
176+
Name,
177+
CreateKeyAttributes());
178+
break;
179+
180+
case ImportParameterSet:
181+
bool? importToHsm = null;
182+
keyBundle = this.DataServiceClient.ImportKey(
183+
VaultName, Name,
184+
CreateKeyAttributes(),
185+
CreateWebKeyFromFile(),
186+
string.IsNullOrEmpty(Destination) ? importToHsm : HsmDestination.Equals(Destination, StringComparison.OrdinalIgnoreCase));
187+
break;
188+
189+
default:
190+
throw new ArgumentException(Resources.BadParameterSetName);
200191
}
192+
193+
this.WriteObject(keyBundle);
201194
}
202195

203196
internal KeyAttributes CreateKeyAttributes()

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/BackupAzureKeyVaultKey.cs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,16 @@ public class BackupAzureKeyVaultKey : KeyVaultCmdletBase
6464

6565
public override void ExecuteCmdlet()
6666
{
67-
try
67+
if (string.IsNullOrEmpty(OutputFile))
6868
{
69-
if (string.IsNullOrEmpty(OutputFile))
70-
{
71-
OutputFile = GetDefaultFile();
72-
}
69+
OutputFile = GetDefaultFile();
70+
}
7371

74-
var filePath = ResolvePath(OutputFile, Resources.BackupKeyFileNotFound);
72+
var filePath = ResolvePath(OutputFile, Resources.BackupKeyFileNotFound);
7573

76-
var backupBlobPath = this.DataServiceClient.BackupKey(VaultName, Name, filePath);
74+
var backupBlobPath = this.DataServiceClient.BackupKey(VaultName, Name, filePath);
7775

78-
this.WriteObject(backupBlobPath);
79-
}
80-
catch (Exception ex)
81-
{
82-
this.WriteErrorDetails(ex);
83-
}
76+
this.WriteObject(backupBlobPath);
8477
}
8578

8679
private string GetDefaultFile()

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultKey.cs

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -81,29 +81,21 @@ public class GetAzureKeyVaultKey : KeyVaultCmdletBase
8181

8282
public override void ExecuteCmdlet()
8383
{
84-
try
84+
switch (ParameterSetName)
8585
{
86-
switch (ParameterSetName)
87-
{
88-
case ByKeyNameParameterSet:
89-
var keyBundle = DataServiceClient.GetKey(VaultName, Name, Version);
90-
WriteObject(keyBundle);
91-
break;
86+
case ByKeyNameParameterSet:
87+
var keyBundle = DataServiceClient.GetKey(VaultName, Name, Version);
88+
WriteObject(keyBundle);
89+
break;
9290

93-
case ByVaultNameParameterSet:
94-
IEnumerable<KeyIdentityItem> keyBundles = DataServiceClient.GetKeys(VaultName);
95-
WriteObject(keyBundles, true);
96-
break;
91+
case ByVaultNameParameterSet:
92+
IEnumerable<KeyIdentityItem> keyBundles = DataServiceClient.GetKeys(VaultName);
93+
WriteObject(keyBundles, true);
94+
break;
9795

98-
default:
99-
throw new ArgumentException(Resources.BadParameterSetName);
100-
}
101-
}
102-
catch (Exception ex)
103-
{
104-
this.WriteErrorDetails(ex);
96+
default:
97+
throw new ArgumentException(Resources.BadParameterSetName);
10598
}
10699
}
107-
108100
}
109101
}

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultSecret.cs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,27 +79,20 @@ public class GetAzureKeyVaultSecret : KeyVaultCmdletBase
7979

8080
public override void ExecuteCmdlet()
8181
{
82-
try
82+
switch (ParameterSetName)
8383
{
84-
switch (ParameterSetName)
85-
{
86-
case BySecretNameParameterSet:
87-
var secret = DataServiceClient.GetSecret(VaultName, Name, Version);
88-
WriteObject(secret);
89-
break;
84+
case BySecretNameParameterSet:
85+
var secret = DataServiceClient.GetSecret(VaultName, Name, Version);
86+
WriteObject(secret);
87+
break;
9088

91-
case ByVaultNameParameterSet:
92-
var secrets = DataServiceClient.GetSecrets(VaultName);
93-
WriteObject(secrets, true);
94-
break;
89+
case ByVaultNameParameterSet:
90+
var secrets = DataServiceClient.GetSecrets(VaultName);
91+
WriteObject(secrets, true);
92+
break;
9593

96-
default:
97-
throw new ArgumentException(Resources.BadParameterSetName);
98-
}
99-
}
100-
catch (Exception ex)
101-
{
102-
this.WriteErrorDetails(ex);
94+
default:
95+
throw new ArgumentException(Resources.BadParameterSetName);
10396
}
10497
}
10598
}

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultKey.cs

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,30 +63,23 @@ public class RemoveAzureKeyVaultKey : KeyVaultCmdletBase
6363
#endregion
6464
public override void ExecuteCmdlet()
6565
{
66-
try
67-
{
68-
KeyBundle keyBundle = null;
69-
ConfirmAction(
70-
Force.IsPresent,
71-
string.Format(
72-
CultureInfo.InvariantCulture,
73-
Resources.RemoveKeyWarning,
74-
Name),
75-
string.Format(
76-
CultureInfo.InvariantCulture,
77-
Resources.RemoveKeyWhatIfMessage,
78-
Name),
79-
Name,
80-
() => { keyBundle = DataServiceClient.DeleteKey(VaultName, Name); });
81-
82-
if (PassThru.IsPresent)
83-
{
84-
WriteObject(keyBundle);
85-
}
86-
}
87-
catch (Exception ex)
66+
KeyBundle keyBundle = null;
67+
ConfirmAction(
68+
Force.IsPresent,
69+
string.Format(
70+
CultureInfo.InvariantCulture,
71+
Resources.RemoveKeyWarning,
72+
Name),
73+
string.Format(
74+
CultureInfo.InvariantCulture,
75+
Resources.RemoveKeyWhatIfMessage,
76+
Name),
77+
Name,
78+
() => { keyBundle = DataServiceClient.DeleteKey(VaultName, Name); });
79+
80+
if (PassThru.IsPresent)
8881
{
89-
this.WriteErrorDetails(ex);
82+
WriteObject(keyBundle);
9083
}
9184
}
9285

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultSecret.cs

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,30 +64,23 @@ public class RemoveAzureKeyVaultSecret : KeyVaultCmdletBase
6464

6565
public override void ExecuteCmdlet()
6666
{
67-
try
68-
{
69-
Secret secret = null;
70-
ConfirmAction(
71-
Force.IsPresent,
72-
string.Format(
73-
CultureInfo.InvariantCulture,
74-
Resources.RemoveSecretWarning,
75-
Name),
76-
string.Format(
77-
CultureInfo.InvariantCulture,
78-
Resources.RemoveSecretWhatIfMessage,
79-
Name),
80-
Name,
81-
() => { secret = DataServiceClient.DeleteSecret(VaultName, Name); });
82-
83-
if (PassThru.IsPresent)
84-
{
85-
WriteObject(secret);
86-
}
87-
}
88-
catch (Exception ex)
67+
Secret secret = null;
68+
ConfirmAction(
69+
Force.IsPresent,
70+
string.Format(
71+
CultureInfo.InvariantCulture,
72+
Resources.RemoveSecretWarning,
73+
Name),
74+
string.Format(
75+
CultureInfo.InvariantCulture,
76+
Resources.RemoveSecretWhatIfMessage,
77+
Name),
78+
Name,
79+
() => { secret = DataServiceClient.DeleteSecret(VaultName, Name); });
80+
81+
if (PassThru.IsPresent)
8982
{
90-
this.WriteErrorDetails(ex);
83+
WriteObject(secret);
9184
}
9285
}
9386
}

‎src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RestoreAzureKeyVaultKey.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,11 @@ public class RestoreAzureKeyVaultKey : KeyVaultCmdletBase
5151

5252
public override void ExecuteCmdlet()
5353
{
54-
try
55-
{
56-
var filePath = ResolvePath(InputFile, Resources.BackupKeyFileNotFound);
54+
var filePath = ResolvePath(InputFile, Resources.BackupKeyFileNotFound);
5755

58-
var restoredKeyBundle = this.DataServiceClient.RestoreKey(VaultName, filePath);
56+
var restoredKeyBundle = this.DataServiceClient.RestoreKey(VaultName, filePath);
5957

60-
this.WriteObject(restoredKeyBundle);
61-
}
62-
catch (Exception ex)
63-
{
64-
this.WriteErrorDetails(ex);
65-
}
58+
this.WriteObject(restoredKeyBundle);
6659
}
67-
6860
}
6961
}

0 commit comments

Comments
 (0)