Skip to content
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

🔧 Fix variable extraction to always run #1500

Merged
merged 4 commits into from
Dec 10, 2024
Merged

🔧 Fix variable extraction to always run #1500

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d89ff24
Fix variable extraction to always run
davidreneuw Dec 9, 2024
107a3f6
Change it to extract variables on any status, not just create requested
davidreneuw Dec 9, 2024
186e1ea
Extract redundant code
davidreneuw Dec 9, 2024
5fb4ee3
Revert config change
davidreneuw Dec 9, 2024
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
90 changes: 47 additions & 43 deletions ResourceProvisioner/src/ResourceProvisioner.Infrastructure/Services/RepositoryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public async Task<PullRequestUpdateMessage> HandleResourcing(CreateResourceRunCo
{
DirectoryUtils.tempDirectory = Guid.NewGuid().ToString().Substring(0, 8);
CreateTemporaryDirectory();

var user = command.RequestingUserEmail ??
throw new NullReferenceException("Requesting user's email is null");
logger.LogInformation("Checking out workspace branch for {WorkspaceAcronym}", command.Workspace.Acronym);
Expand All @@ -69,7 +69,7 @@ public async Task<PullRequestUpdateMessage> HandleResourcing(CreateResourceRunCo
logger.LogInformation("Completing pull request for {WorkspaceAcronym}", command.Workspace.Acronym);
await AutoApproveInfrastructurePullRequest(pullRequestValueObject.PullRequestId,
command.Workspace.Acronym!);


var pullRequestMessage = new PullRequestUpdateMessage
{
Expand Down Expand Up @@ -126,7 +126,7 @@ public async Task<List<Version>> GetModuleVersions()
.ToList();
return versions;
}

private void CreateTemporaryDirectory()
{
CleanUpEnvironment();
Expand All @@ -147,26 +147,25 @@ public void FetchModuleRepository()
var repositoryPath = DirectoryUtils.GetModuleRepositoryPath(resourceProvisionerConfiguration);
DirectoryUtils.VerifyDirectoryDoesNotExist(repositoryPath);

logger.LogInformation("Cloning repository {RepositoryUrl} to {LocalPath}", repositoryUrl, repositoryPath);
Repository.Clone(repositoryUrl, repositoryPath);
logger.LogInformation("Cloning repository {RepositoryUrl} to {LocalPath}", repositoryUrl, repositoryPath);
Repository.Clone(repositoryUrl, repositoryPath);

if (resourceProvisionerConfiguration.ModuleRepository.Branch != ModuleRepositoryConfiguration.DefaultBranch)
{
using var repo = new Repository(repositoryPath);
var branch =
repo.Branches[$"refs/remotes/origin/{resourceProvisionerConfiguration.ModuleRepository.Branch}"];
if (branch == null)
if (resourceProvisionerConfiguration.ModuleRepository.Branch != ModuleRepositoryConfiguration.DefaultBranch)
{
logger.LogInformation("Branch {Branch} does not exist, checking out default branch",
resourceProvisionerConfiguration.ModuleRepository.Branch);
branch = repo.Branches[ModuleRepositoryConfiguration.DefaultBranch];
}
using var repo = new Repository(repositoryPath);
var branch =
repo.Branches[$"refs/remotes/origin/{resourceProvisionerConfiguration.ModuleRepository.Branch}"];
if (branch == null)
{
logger.LogInformation("Branch {Branch} does not exist, checking out default branch",
resourceProvisionerConfiguration.ModuleRepository.Branch);
branch = repo.Branches[ModuleRepositoryConfiguration.DefaultBranch];
}

Commands.Checkout(repo, branch);
}

logger.LogInformation("Repository {RepositoryUrl} cloned to {LocalPath}", repositoryUrl, repositoryPath);

}
catch (Exception e)
{
Expand Down Expand Up @@ -204,10 +203,12 @@ public async Task FetchInfrastructureRepository()
}
};

logger.LogInformation("Cloning repository {RepositoryUrl} to {LocalPath}", repositoryUrl, Path.GetFullPath(repositoryPath));
logger.LogInformation("Cloning repository {RepositoryUrl} to {LocalPath}", repositoryUrl,
Path.GetFullPath(repositoryPath));
Repository.Clone(repositoryUrl, repositoryPath, cloneOptions);

logger.LogInformation("Repository {RepositoryUrl} cloned to {LocalPath}", repositoryUrl, Path.GetFullPath(repositoryPath));
logger.LogInformation("Repository {RepositoryUrl} cloned to {LocalPath}", repositoryUrl,
Path.GetFullPath(repositoryPath));
}

public async Task CheckoutInfrastructureBranch(string workspaceName)
Expand Down Expand Up @@ -472,10 +473,10 @@ public async Task<List<RepositoryUpdateEvent>> ExecuteResourceRuns(List<Terrafor

await ValidateWorkspaceVersion(terraformWorkspace);


// Execute each module but make sure the `new-project-template` module is first for creation
modules = modules.OrderBy(x => x.Name != TerraformTemplate.NewProjectTemplate).ToList();

foreach (var module in modules)
{
var result = await ExecuteResourceRun(module, terraformWorkspace, requestingUsername, resourcegroup);
Expand Down Expand Up @@ -507,12 +508,6 @@ public async Task<RepositoryUpdateEvent> ExecuteResourceRun(TerraformTemplate te
{
try
{
var templateStatusToIgnore = new List<string>
{
TerraformStatus.Deleted,
TerraformStatus.DeleteInProgress
};

if (template.Status == TerraformStatus.DeleteRequested)
{
if (template.Name == TerraformTemplate.NewProjectTemplate)
Expand All @@ -523,24 +518,18 @@ public async Task<RepositoryUpdateEvent> ExecuteResourceRun(TerraformTemplate te
{
await terraformService.DeleteTemplateAsync(template.Name, terraformWorkspace);
}

await CommitTerraformTemplate(template, requestingUsername);
}
else if (template.Status == TerraformStatus.CreateRequested)
{
await terraformService.CopyTemplateAsync(template.Name, terraformWorkspace);
await terraformService.ExtractVariables(template.Name, terraformWorkspace);
switch (template.Name)
{
case TerraformTemplate.NewProjectTemplate:
await terraformService.ExtractBackendConfig(terraformWorkspace.Acronym!);
break;
case TerraformTemplate.VariableUpdate:
await terraformService.ExtractAllVariables(terraformWorkspace);
break;
}
await CommitTerraformTemplate(template, requestingUsername);
}
await ExtractVariables(template, terraformWorkspace);
}
else
{
await ExtractVariables(template, terraformWorkspace);
}

await CommitTerraformTemplate(template, requestingUsername);

return new RepositoryUpdateEvent()
{
Expand Down Expand Up @@ -573,6 +562,19 @@ public async Task<RepositoryUpdateEvent> ExecuteResourceRun(TerraformTemplate te
}
}

private async Task ExtractVariables(TerraformTemplate template, TerraformWorkspace terraformWorkspace)
{
await terraformService.ExtractVariables(template.Name, terraformWorkspace);
switch (template.Name)
{
case TerraformTemplate.NewProjectTemplate:
await terraformService.ExtractBackendConfig(terraformWorkspace.Acronym!);
break;
case TerraformTemplate.VariableUpdate:
await terraformService.ExtractAllVariables(terraformWorkspace);
break;
}
}

private async Task<string> GetExistingPullRequestId(string workspaceAcronym)
{
Expand All @@ -592,16 +594,18 @@ private async Task<string> GetExistingPullRequestId(string workspaceAcronym)
throw new NullReferenceException(
$"Could not get existing pull request id for workspace {workspaceAcronym}");
}

private void CleanUpEnvironment()
{
try
{
logger.LogInformation("Deleting temporary directory {Directory} for resource run", DirectoryUtils.tempDirectory);
logger.LogInformation("Deleting temporary directory {Directory} for resource run",
DirectoryUtils.tempDirectory);
var tempPath = DirectoryUtils.GetTempDirectoryPath(resourceProvisionerConfiguration);
var dir = new DirectoryInfo(tempPath);
DirectoryUtils.NormalizeAndDelete(dir);
} catch (Exception e)
}
catch (Exception e)
{
logger.LogError(e, "Error while cleaning up environment");
}
Expand Down
Loading