Skip to content

Commit 1994d34

Browse files
author
Pooneh
committed
Adding Id to the top level output items returned and flattening single key and secret output structure
1 parent 5c475fb commit 1994d34

File tree

7 files changed

+27
-135
lines changed

7 files changed

+27
-135
lines changed

‎src/ResourceManager/KeyVault/Commands.KeyVault/Microsoft.Azure.Commands.KeyVault.dll-Help.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
5959
<maml:name>Disable</maml:name>
6060
<maml:description>
61-
<maml:para>Indicates that the key you are adding is set to an initial state of disabled. Any attempt to use the key will fail. Use this parameter if you are preloading keys that you intent to enable later.</maml:para>
61+
<maml:para>Indicates that the key you are adding is set to an initial state of disabled. Any attempt to use the key will fail. Use this parameter if you are preloading keys that you intend to enable later.</maml:para>
6262
</maml:description>
6363
</command:parameter>
6464
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true(ByPropertyName)" position="named" aliases="none">
@@ -128,7 +128,7 @@
128128
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
129129
<maml:name>Disable</maml:name>
130130
<maml:description>
131-
<maml:para>Indicates that the key you are adding is set to an initial state of disabled. Any attempt to use the key will fail. Use this parameter if you are preloading keys that you intent to enable later.</maml:para>
131+
<maml:para>Indicates that the key you are adding is set to an initial state of disabled. Any attempt to use the key will fail. Use this parameter if you are preloading keys that you intend to enable later.</maml:para>
132132
</maml:description>
133133
</command:parameter>
134134
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true(ByPropertyName)" position="named" aliases="none">
@@ -194,7 +194,7 @@
194194
<command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named" aliases="none">
195195
<maml:name>Disable</maml:name>
196196
<maml:description>
197-
<maml:para>Indicates that the key you are adding is set to an initial state of disabled. Any attempt to use the key will fail. Use this parameter if you are preloading keys that you intent to enable later.</maml:para>
197+
<maml:para>Indicates that the key you are adding is set to an initial state of disabled. Any attempt to use the key will fail. Use this parameter if you are preloading keys that you intend to enable later.</maml:para>
198198
</maml:description>
199199
<command:parameterValue required="false" variableLength="false">SwitchParameter</command:parameterValue>
200200
<dev:type>

‎src/ResourceManager/KeyVault/Commands.KeyVault/Microsoft.Azure.Commands.KeyVault.format.ps1xml

Lines changed: 10 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Configuration>
33
<ViewDefinitions>
44
<View>
5-
<Name>Microsoft.Azure.Commands.KeyVault.Models.KeyBundle</Name>
5+
<Name>Microsoft.Azure.Commands.KeyVault.Models.KeyIdentityItem</Name>
66
<ViewSelectedBy>
7-
<TypeName>Microsoft.Azure.Commands.KeyVault.Models.KeyBundle</TypeName>
7+
<TypeName>Microsoft.Azure.Commands.KeyVault.Models.KeyIdentityItem</TypeName>
88
</ViewSelectedBy>
99
<TableControl>
1010
<TableHeaders>
@@ -21,68 +21,7 @@
2121
<Alignment>Left</Alignment>
2222
</TableColumnHeader>
2323
<TableColumnHeader>
24-
<Label>Key Type</Label>
25-
<Alignment>Left</Alignment>
26-
</TableColumnHeader>
27-
<TableColumnHeader>
28-
<Label>Enabled</Label>
29-
<Alignment>Left</Alignment>
30-
</TableColumnHeader>
31-
<TableColumnHeader>
32-
<Label>Attributes</Label>
33-
<Alignment>Left</Alignment>
34-
</TableColumnHeader>
35-
<TableColumnHeader>
36-
<Label>Key</Label>
37-
<Alignment>Left</Alignment>
38-
</TableColumnHeader>
39-
</TableHeaders>
40-
<TableRowEntries>
41-
<TableRowEntry>
42-
<TableColumnItems>
43-
<TableColumnItem>
44-
<PropertyName>VaultName</PropertyName>
45-
</TableColumnItem>
46-
<TableColumnItem>
47-
<PropertyName>Name</PropertyName>
48-
</TableColumnItem>
49-
<TableColumnItem>
50-
<PropertyName>Version</PropertyName>
51-
</TableColumnItem>
52-
<TableColumnItem>
53-
<ScriptBlock>$_.Attributes.KeyType</ScriptBlock>
54-
</TableColumnItem>
55-
<TableColumnItem>
56-
<ScriptBlock>$_.Attributes.Enabled</ScriptBlock>
57-
</TableColumnItem>
58-
<TableColumnItem>
59-
<PropertyName>Attributes</PropertyName>
60-
</TableColumnItem>
61-
<TableColumnItem>
62-
<PropertyName>Key</PropertyName>
63-
</TableColumnItem>
64-
</TableColumnItems>
65-
</TableRowEntry>
66-
</TableRowEntries>
67-
</TableControl>
68-
</View>
69-
<View>
70-
<Name>Microsoft.Azure.Commands.KeyVault.Models.KeyIdentityItem</Name>
71-
<ViewSelectedBy>
72-
<TypeName>Microsoft.Azure.Commands.KeyVault.Models.KeyIdentityItem</TypeName>
73-
</ViewSelectedBy>
74-
<TableControl>
75-
<TableHeaders>
76-
<TableColumnHeader>
77-
<Label>Vault Name</Label>
78-
<Alignment>Left</Alignment>
79-
</TableColumnHeader>
80-
<TableColumnHeader>
81-
<Label>Name</Label>
82-
<Alignment>Left</Alignment>
83-
</TableColumnHeader>
84-
<TableColumnHeader>
85-
<Label>Version</Label>
24+
<Label>Id</Label>
8625
<Alignment>Left</Alignment>
8726
</TableColumnHeader>
8827
<TableColumnHeader>
@@ -110,6 +49,9 @@
11049
<TableColumnItem>
11150
<PropertyName>Version</PropertyName>
11251
</TableColumnItem>
52+
<TableColumnItem>
53+
<PropertyName>Id</PropertyName>
54+
</TableColumnItem>
11355
<TableColumnItem>
11456
<PropertyName>Enabled</PropertyName>
11557
</TableColumnItem>
@@ -125,9 +67,9 @@
12567
</TableControl>
12668
</View>
12769
<View>
128-
<Name>Microsoft.Azure.Commands.KeyVault.Models.Secret</Name>
70+
<Name>Microsoft.Azure.Commands.KeyVault.Models.SecretIdentityItem</Name>
12971
<ViewSelectedBy>
130-
<TypeName>Microsoft.Azure.Commands.KeyVault.Models.Secret</TypeName>
72+
<TypeName>Microsoft.Azure.Commands.KeyVault.Models.SecretIdentityItem</TypeName>
13173
</ViewSelectedBy>
13274
<TableControl>
13375
<TableHeaders>
@@ -144,11 +86,7 @@
14486
<Alignment>Left</Alignment>
14587
</TableColumnHeader>
14688
<TableColumnHeader>
147-
<Label>Plain Secret Text</Label>
148-
<Alignment>Left</Alignment>
149-
</TableColumnHeader>
150-
<TableColumnHeader>
151-
<Label>Secure Secret Value</Label>
89+
<Label>Id</Label>
15290
<Alignment>Left</Alignment>
15391
</TableColumnHeader>
15492
</TableHeaders>
@@ -165,47 +103,7 @@
165103
<PropertyName>Version</PropertyName>
166104
</TableColumnItem>
167105
<TableColumnItem>
168-
<PropertyName>SecretValueText</PropertyName>
169-
</TableColumnItem>
170-
<TableColumnItem>
171-
<PropertyName>SecretValue</PropertyName>
172-
</TableColumnItem>
173-
</TableColumnItems>
174-
</TableRowEntry>
175-
</TableRowEntries>
176-
</TableControl>
177-
</View>
178-
<View>
179-
<Name>Microsoft.Azure.Commands.KeyVault.Models.SecretIdentityItem</Name>
180-
<ViewSelectedBy>
181-
<TypeName>Microsoft.Azure.Commands.KeyVault.Models.SecretIdentityItem</TypeName>
182-
</ViewSelectedBy>
183-
<TableControl>
184-
<TableHeaders>
185-
<TableColumnHeader>
186-
<Label>Vault Name</Label>
187-
<Alignment>Left</Alignment>
188-
</TableColumnHeader>
189-
<TableColumnHeader>
190-
<Label>Name</Label>
191-
<Alignment>Left</Alignment>
192-
</TableColumnHeader>
193-
<TableColumnHeader>
194-
<Label>Version</Label>
195-
<Alignment>Left</Alignment>
196-
</TableColumnHeader>
197-
</TableHeaders>
198-
<TableRowEntries>
199-
<TableRowEntry>
200-
<TableColumnItems>
201-
<TableColumnItem>
202-
<PropertyName>VaultName</PropertyName>
203-
</TableColumnItem>
204-
<TableColumnItem>
205-
<PropertyName>Name</PropertyName>
206-
</TableColumnItem>
207-
<TableColumnItem>
208-
<PropertyName>Version</PropertyName>
106+
<PropertyName>Id</PropertyName>
209107
</TableColumnItem>
210108
</TableColumnItems>
211109
</TableRowEntry>

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyBundle.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ internal KeyBundle(Client.KeyBundle clientKeyBundle, VaultUriHelper vaultUriHelp
4343
clientKeyBundle.Attributes.Expires,
4444
clientKeyBundle.Attributes.NotBefore,
4545
clientKeyBundle.Key.Kty,
46-
clientKeyBundle.Key.KeyOps);
46+
clientKeyBundle.Key.KeyOps);
47+
48+
Id = clientKeyBundle.Key.Kid;
4749
}
4850

4951
public KeyAttributes Attributes { get; set; }

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyIdentityItem.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ internal KeyIdentityItem(Client.KeyItem clientKeyItem, VaultUriHelper vaultUriHe
4242
Enabled = attribute.Enabled;
4343
Expires = attribute.Expires;
4444
NotBefore = attribute.NotBefore;
45+
Id = clientKeyItem.Kid;
4546
}
4647

4748
public bool? Enabled { get; set; }

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/ObjectIdentifier.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,7 @@ internal void SetObjectIdentifier(VaultUriHelper vaultUriHelper, Client.ObjectId
3636
public string Name { get; set; }
3737

3838
public string Version { get; set; }
39+
40+
public string Id { get; set; }
3941
}
4042
}

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/Secret.cs

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,19 @@ internal Secret(Client.Secret clientSecret, VaultUriHelper vaultUriHelper)
3636
}
3737

3838
SetObjectIdentifier(vaultUriHelper, new Client.SecretIdentifier(clientSecret.Id));
39-
SecretValue = clientSecret.Value.ConvertToSecureString();
40-
SecretValueText = clientSecret.Value;
39+
SecretValue = clientSecret.SecureValue;
40+
41+
Id = clientSecret.Id;
4142
}
4243

43-
public SecureString SecretValue
44+
public SecureString SecretValue { get; set; }
45+
46+
public string SecretValueText
4447
{
4548
get
4649
{
47-
return secretValue;
48-
}
49-
set
50-
{
51-
secretValue = value;
52-
if (secretValue != null)
53-
{
54-
SecretValueText = secretValue.ConvertToString();
55-
}
56-
else
57-
{
58-
SecretValueText = null;
59-
}
50+
return SecretValue.ConvertToString();
6051
}
6152
}
62-
private SecureString secretValue;
63-
64-
public string SecretValueText { get; private set; }
6553
}
6654
}

‎src/ResourceManager/KeyVault/Commands.KeyVault/Models/SecretIdentityItem.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ internal SecretIdentityItem(Client.SecretItem clientSecretItem, VaultUriHelper v
3434
}
3535

3636
SetObjectIdentifier(vaultUriHelper, new Client.SecretIdentifier(clientSecretItem.Id));
37+
Id = clientSecretItem.Id;
3738
}
3839
}
3940
}

0 commit comments

Comments
 (0)