Skip to content

Allow test modules to load from artifacts directory #107

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 5 commits into from
Dec 28, 2018
Merged

Allow test modules to load from artifacts directory #107

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a8d561
Change EnvironmentSetupHelper to load modules from artifacts director…
MiYanni Dec 18, 2018
656a9d4
Accidentally missed removing a parenthesis.
MiYanni Dec 18, 2018
d897559
Didn't go up high enough in the directory structure to access artifacts.
MiYanni Dec 18, 2018
893afc8
Merge branch 'master' into artifacts-folder
MiYanni Dec 21, 2018
a1ecb7b
Merge branch 'master' into artifacts-folder
MiYanni Dec 26, 2018
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
32 changes: 16 additions & 16 deletions src/ScenarioTest.ResourceManager/EnvironmentSetupHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,13 @@ private static string ProbeForSrcDirectory()
return result;
}

private static string GetConfigDirectory(string targetDirectory = "Package")
private static string GetConfigDirectory(string targetDirectory = "artifacts")
{
string result = null;
var srcDirectory = ProbeForSrcDirectory();
if (srcDirectory != null)
var directoryPath = Path.Combine(ProbeForSrcDirectory(), "..");
if (Directory.Exists(directoryPath))
{
var baseDirectory = Path.Combine(srcDirectory, targetDirectory);
var baseDirectory = Path.Combine(directoryPath, targetDirectory);
if (Directory.Exists(baseDirectory))
{
result = Directory.EnumerateDirectories(baseDirectory).FirstOrDefault(
Expand All @@ -216,13 +216,13 @@ private static string GetConfigDirectory(string targetDirectory = "Package")
return result;
}

private static string GetRMModuleDirectory(string targetDirectory = "Package")
private static string GetRMModuleDirectory(string targetDirectory = "artifacts")
{
string configDirectory = GetConfigDirectory(targetDirectory);
return (string.IsNullOrEmpty(configDirectory)) ? null : Path.Combine(configDirectory, "ResourceManager", "AzureResourceManager");
return (string.IsNullOrEmpty(configDirectory)) ? null : configDirectory;
}

private static string GetStorageDirectory(string targetDirectory = "Package")
private static string GetStorageDirectory(string targetDirectory = "artifacts")
{
string configDirectory = GetConfigDirectory(targetDirectory);
return (string.IsNullOrEmpty(configDirectory)) ? null : Path.Combine(configDirectory, "Storage");
Expand Down Expand Up @@ -540,9 +540,9 @@ public void SetupModules(AzureModule mode, params string[] modules)
if (mode == AzureModule.AzureProfile)
{
this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1"));
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Accounts\AzureRM.Accounts.psd1"));
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
this.modules.Add(Path.Combine(PackageDirectory, @"AzureRM.Accounts\AzureRM.Accounts.psd1"));
this.modules.Add(Path.Combine(PackageDirectory, @"AzureRM.Resources\AzureRM.Resources.psd1"));
this.modules.Add(Path.Combine(PackageDirectory, @"AzureRM.Resources\AzureRM.Tags.psd1"));
}
else if (mode == AzureModule.AzureServiceManagement)
{
Expand All @@ -560,19 +560,19 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules)
if (mode == AzureModule.AzureProfile)
{
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Accounts\AzureRM.Accounts.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureRM.Accounts\AzureRM.Accounts.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureRM.Resources\AzureRM.Resources.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureRM.Resources\AzureRM.Tags.psd1"));
}
else if (mode == AzureModule.AzureServiceManagement)
{
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
}
else if (mode == AzureModule.AzureResourceManager)
{
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Accounts\AzureRM.Accounts.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Tags.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureRM.Accounts\AzureRM.Accounts.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureRM.Resources\AzureRM.Resources.psd1"));
this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"AzureRM.Resources\AzureRM.Tags.psd1"));
}
else
{
Expand Down