Skip to content

DSC Extension cmdlets bug fixes #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from Jun 9, 2015
Merged

DSC Extension cmdlets bug fixes #478

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b730135
Bug 2873841: race condition while creating an archive in publish dsc …
eshaparmar May 15, 2015
8173cb9
Fix zip folder issue
TravisEz13 May 27, 2015
1252930
Merge branch 'delete-tests' into bugfixes
eshaparmar Jun 4, 2015
6c339a4
Do not copy PSDesiredStateConfiguration when copying modules
eshaparmar Jun 4, 2015
9affcc7
Add comments
eshaparmar Jun 5, 2015
a1caa5e
Merge branch 'PublishFixes' of https://github.com/dscsolutions/azure-…
eshaparmar Jun 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions .../Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/PublishAzureVMDscConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,12 @@ private string CreateConfigurationArchive()
null));
}
List<string> requiredModules = parseResult.RequiredModules;
//Since LCM always uses the latest module there is no need to copy PSDesiredStateConfiguration
if (requiredModules.Contains("PSDesiredStateConfiguration"))
{
requiredModules.Remove("PSDesiredStateConfiguration");
}

WriteVerbose(String.Format(CultureInfo.CurrentUICulture, Resources.PublishVMDscExtensionRequiredModulesVerbose, String.Join(", ", requiredModules)));

// Create a temporary directory for uploaded zip file
Expand Down Expand Up @@ -290,8 +296,8 @@ private string CreateConfigurationArchive()
@"function Copy-Module([string]$module, [string]$tempZipFolder)
{
$mi = Get-Module -List -Name $module;
$moduleFolder = Split-Path -Parent $mi.Path;
Copy-Item -Recurse -Path $moduleFolder -Destination $tempZipFolder;
$moduleFolder = Split-Path $mi.Path;
Copy-Item -Recurse -Path $moduleFolder -Destination ""$tempZipFolder\$($mi.Name)""
}"
);
powershell.Invoke();
Expand Down Expand Up @@ -329,7 +335,11 @@ private string CreateConfigurationArchive()
}
else
{
archive = Path.Combine(Path.GetTempPath(), configurationName + ZipFileExtension);
string tempArchiveFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
WriteVerbose(String.Format(CultureInfo.CurrentUICulture, Resources.PublishVMDscExtensionTempFolderVerbose, tempArchiveFolder));
Directory.CreateDirectory(tempArchiveFolder);
this._temporaryDirectoriesToDelete.Add(tempArchiveFolder);
archive = Path.Combine(tempArchiveFolder, configurationName + ZipFileExtension);
this._temporaryFilesToDelete.Add(archive);
}

Expand Down