Skip to content

Commit 200edf5

Browse files
vermashivermashi
committed
Revert "switch to env variables"
This reverts commit 507717b.
1 parent a37fecc commit 200edf5

File tree

4 files changed

+84
-52
lines changed

4 files changed

+84
-52
lines changed

‎src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/AzureDiskEncryptionExtensionConstants.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,5 @@ public static class AzureDiskEncryptionExtensionConstants
4242
public const string defaultKeyEncryptionAlgorithm = "RSA-OAEP";
4343
public const string keyVaultResourceIdKey = "KeyVaultResourceId";
4444
public const string kekVaultResourceIdKey = "KekVaultResourceId";
45-
public const string extensionTypeEnvVarName = "ADE_TEST_EXTENSION_TYPE";
46-
public const string extensionPublisherEnvVarName = "ADE_TEST_EXTENSION_PUBLISHER";
4745
}
4846
}

‎src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/DisableAzureDiskEncryption.cs

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,22 @@ public class DisableAzureDiskEncryptionCommand : VirtualMachineExtensionBaseCmdl
8989
HelpMessage = "Disable auto-upgrade of minor version")]
9090
public SwitchParameter DisableAutoUpgradeMinorVersion { get; set; }
9191

92+
[Parameter(
93+
Mandatory = false,
94+
Position = 6,
95+
ValueFromPipelineByPropertyName = true,
96+
HelpMessage = "The extension type. Specify this parameter to override its default value of \"AzureDiskEncryption\" for Windows VMs and \"AzureDiskEncryptionForLinux\" for Linux VMs.")]
97+
[ValidateNotNullOrEmpty]
98+
public string ExtensionType { get; set; }
99+
100+
[Parameter(
101+
Mandatory = false,
102+
Position = 7,
103+
ValueFromPipelineByPropertyName = true,
104+
HelpMessage = "The extension publisher name. Specify this parameter only to override the default value of \"Microsoft.Azure.Security\".")]
105+
[ValidateNotNullOrEmpty]
106+
public string ExtensionPublisherName { get; set; }
107+
92108
private OperatingSystemTypes? currentOSType = null;
93109

94110
private Hashtable GetExtensionPublicSettings()
@@ -129,17 +145,15 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
129145
}
130146

131147
VirtualMachineExtension vmExtensionParameters = null;
132-
var extensionPublisherName = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionPublisherEnvVarName);
133-
var extensionType = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionTypeEnvVarName);
134148
if (OperatingSystemTypes.Windows.Equals(currentOSType))
135149
{
136150
this.Name = this.Name ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultName;
137151

138152
vmExtensionParameters = new VirtualMachineExtension
139153
{
140154
Location = vmParameters.Location,
141-
Publisher = extensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher,
142-
VirtualMachineExtensionType = extensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType,
155+
Publisher = this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher,
156+
VirtualMachineExtensionType = this.ExtensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType,
143157
TypeHandlerVersion = this.TypeHandlerVersion ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultVersion,
144158
Settings = SettingString,
145159
ProtectedSettings = ProtectedSettingString,
@@ -153,8 +167,8 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
153167
vmExtensionParameters = new VirtualMachineExtension
154168
{
155169
Location = vmParameters.Location,
156-
Publisher = extensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher,
157-
VirtualMachineExtensionType = extensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType,
170+
Publisher = this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher,
171+
VirtualMachineExtensionType = this.ExtensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType,
158172
TypeHandlerVersion = this.TypeHandlerVersion ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultVersion,
159173
Settings = SettingString,
160174
ProtectedSettings = ProtectedSettingString,

‎src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,22 @@ public class GetAzureDiskEncryptionStatusCommand : VirtualMachineExtensionBaseCm
5858
[ValidateNotNullOrEmpty]
5959
public string Name { get; set; }
6060

61+
[Parameter(
62+
Mandatory = false,
63+
Position = 3,
64+
ValueFromPipelineByPropertyName = true,
65+
HelpMessage = "The extension type. Specify this parameter to override its default value of \"AzureDiskEncryption\" for Windows VMs and \"AzureDiskEncryptionForLinux\" for Linux VMs.")]
66+
[ValidateNotNullOrEmpty]
67+
public string ExtensionType { get; set; }
68+
69+
[Parameter(
70+
Mandatory = false,
71+
Position = 4,
72+
ValueFromPipelineByPropertyName = true,
73+
HelpMessage = "The extension publisher name. Specify this parameter only to override the default value of \"Microsoft.Azure.Security\".")]
74+
[ValidateNotNullOrEmpty]
75+
public string ExtensionPublisherName { get; set; }
76+
6177
private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParameters, OSType currentOSType)
6278
{
6379
Hashtable publicSettings = new Hashtable();
@@ -76,18 +92,16 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
7692

7793
VirtualMachineExtension vmExtensionParameters = null;
7894

79-
var extensionPublisherName = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionPublisherEnvVarName);
80-
var extensionType = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionTypeEnvVarName);
8195
if (OSType.Windows.Equals(currentOSType))
8296
{
8397
this.Name = this.Name ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultName;
84-
extensionPublisherName = extensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher;
85-
extensionType = extensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType;
98+
this.ExtensionPublisherName = this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher;
99+
this.ExtensionType = this.ExtensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType;
86100
vmExtensionParameters = new VirtualMachineExtension
87101
{
88102
Location = vmParameters.Location,
89-
Publisher = extensionPublisherName,
90-
VirtualMachineExtensionType = extensionType,
103+
Publisher = this.ExtensionPublisherName,
104+
VirtualMachineExtensionType = this.ExtensionType,
91105
TypeHandlerVersion = AzureDiskEncryptionExtensionContext.ExtensionDefaultVersion,
92106
Settings = publicSettings,
93107
ProtectedSettings = protectedSettings
@@ -96,13 +110,13 @@ private VirtualMachineExtension GetVmExtensionParameters(VirtualMachine vmParame
96110
else if (OSType.Linux.Equals(currentOSType))
97111
{
98112
this.Name = this.Name ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultName;
99-
extensionPublisherName = extensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher;
100-
extensionType = extensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType;
113+
this.ExtensionPublisherName = this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher;
114+
this.ExtensionType = this.ExtensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType;
101115
vmExtensionParameters = new VirtualMachineExtension
102116
{
103117
Location = vmParameters.Location,
104-
Publisher = extensionPublisherName,
105-
VirtualMachineExtensionType = extensionType,
118+
Publisher = this.ExtensionPublisherName,
119+
VirtualMachineExtensionType = this.ExtensionType,
106120
TypeHandlerVersion = AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultVersion,
107121
Settings = publicSettings,
108122
ProtectedSettings = protectedSettings
@@ -139,22 +153,20 @@ private bool IsExtensionInstalled(OSType currentOSType)
139153
return false;
140154
}
141155
bool publisherMatch = false;
142-
var extensionPublisherName = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionPublisherEnvVarName);
143-
var extensionType = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionTypeEnvVarName);
144156
if (OSType.Linux.Equals(currentOSType))
145157
{
146-
if (returnedExtension.Publisher.Equals(extensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher,
158+
if (returnedExtension.Publisher.Equals(this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher,
147159
StringComparison.InvariantCultureIgnoreCase) &&
148-
returnedExtension.ExtensionType.Equals(extensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType,
160+
returnedExtension.ExtensionType.Equals(this.ExtensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType,
149161
StringComparison.InvariantCultureIgnoreCase))
150162
{
151163
publisherMatch = true;
152164
}
153165
}
154166
else if (OSType.Windows.Equals(currentOSType))
155167
{
156-
if (returnedExtension.Publisher.Equals(extensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase) &&
157-
returnedExtension.ExtensionType.Equals(extensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase))
168+
if (returnedExtension.Publisher.Equals(this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase) &&
169+
returnedExtension.ExtensionType.Equals(this.ExtensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase))
158170
{
159171
publisherMatch = true;
160172
}
@@ -191,20 +203,18 @@ private string GetExtensionStatusMessage(OSType currentOSType, bool returnSubsta
191203
null));
192204
}
193205
bool publisherMatch = false;
194-
var extensionPublisherName = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionPublisherEnvVarName);
195-
var extensionType = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionTypeEnvVarName);
196206
if (OSType.Linux.Equals(currentOSType))
197207
{
198-
if (returnedExtension.Publisher.Equals(extensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase) &&
199-
returnedExtension.ExtensionType.Equals(extensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase))
208+
if (returnedExtension.Publisher.Equals(this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase) &&
209+
returnedExtension.ExtensionType.Equals(this.ExtensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase))
200210
{
201211
publisherMatch = true;
202212
}
203213
}
204214
else if (OSType.Windows.Equals(currentOSType))
205215
{
206-
if (returnedExtension.Publisher.Equals(extensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase) &&
207-
returnedExtension.ExtensionType.Equals(extensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase))
216+
if (returnedExtension.Publisher.Equals(this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase) &&
217+
returnedExtension.ExtensionType.Equals(this.ExtensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase))
208218
{
209219
publisherMatch = true;
210220
}
@@ -302,16 +312,14 @@ private DiskEncryptionSettings GetOsVolumeEncryptionSettings(VirtualMachine vmPa
302312

303313
private bool IsAzureDiskEncryptionExtension(OSType osType, VirtualMachineExtension vmExtension)
304314
{
305-
var extensionPublisherName = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionPublisherEnvVarName);
306-
var extensionType = Environment.GetEnvironmentVariable(AzureDiskEncryptionExtensionConstants.extensionTypeEnvVarName);
307315
switch (osType)
308316
{
309317
case OSType.Windows:
310318
if ((vmExtension != null) &&
311319
(vmExtension.Publisher != null) &&
312320
(vmExtension.VirtualMachineExtensionType != null) &&
313-
(vmExtension.Publisher.Equals(extensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase)) &&
314-
(vmExtension.VirtualMachineExtensionType.Equals(extensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase)))
321+
(vmExtension.Publisher.Equals(this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase)) &&
322+
(vmExtension.VirtualMachineExtensionType.Equals(this.ExtensionType ?? AzureDiskEncryptionExtensionContext.ExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase)))
315323
{
316324
return true;
317325
}
@@ -321,8 +329,8 @@ private bool IsAzureDiskEncryptionExtension(OSType osType, VirtualMachineExtensi
321329
if ((vmExtension != null) &&
322330
(vmExtension.Publisher != null) &&
323331
(vmExtension.VirtualMachineExtensionType != null) &&
324-
(vmExtension.Publisher.Equals(extensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase)) &&
325-
(vmExtension.VirtualMachineExtensionType.Equals(extensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase)))
332+
(vmExtension.Publisher.Equals(this.ExtensionPublisherName ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultPublisher, StringComparison.InvariantCultureIgnoreCase)) &&
333+
(vmExtension.VirtualMachineExtensionType.Equals(this.ExtensionType ?? AzureDiskEncryptionExtensionContext.LinuxExtensionDefaultType, StringComparison.InvariantCultureIgnoreCase)))
326334
{
327335
return true;
328336
}

0 commit comments

Comments
 (0)