Bug 2873841: race condition while creating an archive in publish dsc azure extension cmdlet

eshaparmar · eshaparmar · commit b730135a52a8 · 2015-05-15T14:29:09.000-07:00
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/PublishAzureVMDscConfiguration.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/PublishAzureVMDscConfiguration.cs
@@ -329,7 +329,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);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,11 @@ private string CreateConfigurationArchive()`
`329`	`329`	`}`
`330`	`330`	`else`
`331`	`331`	`{`
`332`		`- archive = Path.Combine(Path.GetTempPath(), configurationName + ZipFileExtension);`
	`332`	`+ string tempArchiveFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());`
	`333`	`+ WriteVerbose(String.Format(CultureInfo.CurrentUICulture, Resources.PublishVMDscExtensionTempFolderVerbose, tempArchiveFolder));`
	`334`	`+ Directory.CreateDirectory(tempArchiveFolder);`
	`335`	`+ this._temporaryDirectoriesToDelete.Add(tempArchiveFolder);`
	`336`	`+ archive = Path.Combine(tempArchiveFolder, configurationName + ZipFileExtension);`
`333`	`337`	`this._temporaryFilesToDelete.Add(archive);`
`334`	`338`	`}`
`335`	`339`