Merge pull request #647 from dscsolutions/dsc_release

DSC extension refactored code for ARM & ASM

Author: stankovski

setup/azurecmdfiles.wxi

@@ -103,12 +103,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAzure.Storage">
+      <HintPath>..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
@@ -145,6 +149,14 @@
     <Compile Include="AzurePowerShell.cs" />
     <Compile Include="ComputeCloudException.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="Extensions\DSC\DscExtensionCmdletConstants.cs" />
+    <Compile Include="Extensions\DSC\DscExtensionPrivateSettings.cs" />
+    <Compile Include="Extensions\DSC\DscExtensionPublicSettings.cs" />
+    <Compile Include="Extensions\DSC\DscExtensionSettingsSerializer.cs" />
+    <Compile Include="Extensions\DSC\Exceptions\GetDscResourceException.cs" />
+    <Compile Include="Extensions\DSC\Publish\ConfigurationParseResult.cs" />
+    <Compile Include="Extensions\DSC\Publish\ConfigurationParsingHelper.cs" />
+    <Compile Include="Extensions\DSC\Publish\DscExtensionPublishCmdletCommonBase.cs" />
     <Compile Include="SecureStringExtensions.cs" />
     <Compile Include="ConversionUtilities.cs" />
     <Compile Include="DebugStreamTraceListener.cs" />
@@ -182,13 +194,15 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

src/Common/Commands.Common/Commands.Common.csproj

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.WindowsAzure.Commands.Common.Extensions.DSC
+{
+    public static class DscExtensionCmdletConstants
+    {
+        //common extension constants
+        internal static readonly string ExtensionPublishedNamespace = "Microsoft.Powershell";
+        internal static readonly string ExtensionPublishedName = "DSC";
+        internal const string DefaultContainerName = "windows-powershell-dsc";
+
+        internal const int MinMajorPowerShellVersion = 4;
+        internal const string ZipFileExtension = ".zip";
+        internal const string Ps1FileExtension = ".ps1";
+        internal const string Psm1FileExtension = ".psm1";
+
+
+        internal static readonly HashSet<String> UploadArchiveAllowedFileExtensions =
+            new HashSet<String>(StringComparer.OrdinalIgnoreCase) { Ps1FileExtension, Psm1FileExtension, ZipFileExtension };
+        internal static readonly HashSet<String> CreateArchiveAllowedFileExtensions =
+            new HashSet<String>(StringComparer.OrdinalIgnoreCase) { Ps1FileExtension, Psm1FileExtension };
+    }
+}

src/Common/Commands.Common/Extensions/DSC/DscExtensionCmdletConstants.cs

@@ -12,9 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.Compute.Extension.DSC
+namespace Microsoft.WindowsAzure.Commands.Common.Extensions.DSC
 {
-
     using System.Collections;
 
     /// <summary>

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/DscExtensionPrivateSettings.cs renamed to src/Common/Commands.Common/Extensions/DSC/DscExtensionPrivateSettings.cs

@@ -16,7 +16,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.Azure.Commands.Compute.Extension.DSC
+namespace Microsoft.WindowsAzure.Commands.Common.Extensions.DSC
 {
     /// <summary>
     /// Represents public settings. Serialized representation of this object stored as a plain text string on the VM.
@@ -40,21 +40,21 @@ internal class Version1
             /// <returns></returns>
             public DscExtensionPublicSettings ToCurrentVersion()
             {
-                List<Property> properties = new List<Property>();
-                foreach (DictionaryEntry p in this.Properties)
+                var properties = new List<Property>();
+                foreach (DictionaryEntry p in Properties)
                 {
-                    properties.Add(new Property()
+                    properties.Add(new Property
                     {
                         Name = p.Key.ToString(), 
                         TypeName = p.Value.GetType().ToString(), 
                         Value = p.Value
                     });
                 }
-                return new DscExtensionPublicSettings()
+                return new DscExtensionPublicSettings
                 {
-                    SasToken = this.SasToken,
-                    ModulesUrl = this.ModulesUrl,
-                    ConfigurationFunction = this.ConfigurationFunction,
+                    SasToken = SasToken,
+                    ModulesUrl = ModulesUrl,
+                    ConfigurationFunction = ConfigurationFunction,
                     Properties = properties.ToArray(),
                     ProtocolVersion = new Version(1, 0, 0, 0)
                 };

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/DscExtensionPublicSettings.cs renamed to src/Common/Commands.Common/Extensions/DSC/DscExtensionPublicSettings.cs

@@ -12,28 +12,27 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-
+using Newtonsoft.Json;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Management.Automation;
 using System.Runtime.InteropServices;
 using System.Security;
-using Newtonsoft.Json;
 
-namespace Microsoft.Azure.Commands.Compute.Extension.DSC
+namespace Microsoft.WindowsAzure.Commands.Common.Extensions.DSC
 {
-    public class DscSettingsSerializer
+    public class DscExtensionSettingsSerializer
     {
         /// <summary>
-        /// Serialize DscPublicSettings to string.
+        /// Serialize DscExtensionPublicSettings to string.
         /// </summary>
-        /// <param name="publicSettings"></param>
+        /// <param name="extensionPublicSettings"></param>
         /// <returns></returns>
-        public static string SerializePublicSettings(DscExtensionPublicSettings publicSettings)
+        public static string SerializePublicSettings(DscExtensionPublicSettings extensionPublicSettings)
         {
-            return JsonConvert.SerializeObject(publicSettings);
+            return JsonConvert.SerializeObject(extensionPublicSettings);
         }
 
         /// <summary>
@@ -48,10 +47,10 @@ public static string SerializePrivateSettings(DscExtensionPrivateSettings privat
 
         public static DscExtensionPublicSettings DeserializePublicSettings(string publicSettingsString)
         {
-            DscExtensionPublicSettings publicSettings;
+            DscExtensionPublicSettings extensionPublicSettings;
             try
             {
-                publicSettings = string.IsNullOrEmpty(publicSettingsString)
+                extensionPublicSettings = string.IsNullOrEmpty(publicSettingsString)
                                      ? null
                                      : JsonConvert.DeserializeObject<DscExtensionPublicSettings>(publicSettingsString);
             }
@@ -62,14 +61,14 @@ public static DscExtensionPublicSettings DeserializePublicSettings(string public
                 {
                     DscExtensionPublicSettings.Version1 publicSettingsV1 =
                         JsonConvert.DeserializeObject<DscExtensionPublicSettings.Version1>(publicSettingsString);
-                    publicSettings = publicSettingsV1.ToCurrentVersion();
+                    extensionPublicSettings = publicSettingsV1.ToCurrentVersion();
                 }
                 catch (JsonException)
                 {
                     throw;
                 } 
             }
-            return publicSettings;
+            return extensionPublicSettings;
         }
 
          /// <summary>

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/DscSettingsSerializer.cs renamed to src/Common/Commands.Common/Extensions/DSC/DscExtensionSettingsSerializer.cs

@@ -15,7 +15,8 @@
 using System;
 using System.Globalization;
 
-namespace Microsoft.Azure.Commands.Compute.Extension.DSC
+
+namespace Microsoft.WindowsAzure.Commands.Common.Extensions.DSC.Exceptions
 {
     [Serializable]
     public class GetDscResourceException : UnauthorizedAccessException

src/ResourceManager/Compute/Commands.Compute/Extension/DSC/GetDscResourceException.cs renamed to src/Common/Commands.Common/Extensions/DSC/Exceptions/GetDscResourceException.cs

@@ -12,17 +12,16 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
 using System.Collections.Generic;
 using System.Management.Automation.Language;
 
-namespace Microsoft.Azure.Commands.Compute.Extension.DSC
+namespace Microsoft.WindowsAzure.Commands.Common.Extensions.DSC.Publish
 {
     public class ConfigurationParseResult
     {
         public string Path { get; set; }
         public ParseError[] Errors { get; set; }
-        public List<String> RequiredModules { get; set; }
+        public Dictionary<string,string> RequiredModules { get; set; }
 
     }
 }