Skip to content

fix env variable interpolation for backendless mode #1880

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 1 commit into from
Feb 4, 2025
Merged

fix env variable interpolation for backendless mode #1880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ee/backend/controllers/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (d DiggerEEController) GetSpec(c *gin.Context) {

workflowFile := project.WorkflowFile

jobs, err := generic.CreateJobsForProjects([]digger_config.Project{project}, command, "manual", repoFullName, actor, config.Workflows, &issueNumber, &commitSha, "", "")
jobs, err := generic.CreateJobsForProjects([]digger_config.Project{project}, command, "manual", repoFullName, actor, config.Workflows, &issueNumber, &commitSha, "", "", false)
if err != nil {
log.Printf("could not create jobs based on project: %v", err)
c.String(500, fmt.Sprintf("could not create jobs based on project: %v", err))
Expand Down
6 changes: 3 additions & 3 deletions ee/drift/controllers/drift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (mc MainController) TriggerDriftRunForProject(c *gin.Context) {
}
projects := []dg_configuration.Project{*theProject}

jobsForImpactedProjects, err := generic.CreateJobsForProjects(projects, command, "drift", repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch)
jobsForImpactedProjects, err := generic.CreateJobsForProjects(projects, command, "drift", repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch, false)
if err != nil {
log.Printf("error converting digger project %v to job", project.Name, err)
c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("could not find project %v in digger.yml", theProject)})
Expand Down Expand Up @@ -207,14 +207,14 @@ func (mc MainController) ProcessAllDrift(c *gin.Context) {
}

if matches {
log.Printf("Crontab matched for org: %v %v", orgSetting.OrgID, cron);
log.Printf("Crontab matched for org: %v %v", orgSetting.OrgID, cron)
err := sendProcessDriftForOrgRequest(orgSetting.OrgID)
if err != nil {
log.Printf("Failed to send request to process drift for org: %v", orgSetting.OrgID)
continue
}
} else {
log.Printf("Crontab ignored for org: %v %v", orgSetting.OrgID, cron);
log.Printf("Crontab ignored for org: %v %v", orgSetting.OrgID, cron)
}
}

Expand Down
10 changes: 5 additions & 5 deletions libs/ci/generic/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func ConvertIssueCommentEventToJobs(repoFullName string, requestedBy string, prN
return nil, false, fmt.Errorf("command is not supported: %v", diggerCommand)
}

jobs, err := CreateJobsForProjects(runForProjects, commandToRun, "issue_comment", repoFullName, requestedBy, workflows, &prNumber, nil, defaultBranch, prBranch)
jobs, err := CreateJobsForProjects(runForProjects, commandToRun, "issue_comment", repoFullName, requestedBy, workflows, &prNumber, nil, defaultBranch, prBranch, true)
if err != nil {
return nil, false, err
}
Expand All @@ -138,7 +138,7 @@ func ConvertIssueCommentEventToJobs(repoFullName string, requestedBy string, prN

}

func CreateJobsForProjects(projects []digger_config.Project, command string, event string, repoFullName string, requestedBy string, workflows map[string]digger_config.Workflow, issueNumber *int, commitSha *string, defaultBranch string, prBranch string) ([]scheduler.Job, error) {
func CreateJobsForProjects(projects []digger_config.Project, command string, event string, repoFullName string, requestedBy string, workflows map[string]digger_config.Workflow, issueNumber *int, commitSha *string, defaultBranch string, prBranch string, performEnvVarsInterpolations bool) ([]scheduler.Job, error) {
jobs := make([]scheduler.Job, 0)

for _, project := range projects {
Expand Down Expand Up @@ -166,7 +166,7 @@ func CreateJobsForProjects(projects []digger_config.Project, command string, eve
}

runEnvVars := GetRunEnvVars(defaultBranch, prBranch, project.Name, project.Dir)
stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars, false)
stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars, performEnvVarsInterpolations)
StateEnvProvider, CommandEnvProvider := scheduler.GetStateAndCommandProviders(project)
workspace := project.Workspace
jobs = append(jobs, scheduler.Job{
Expand All @@ -189,8 +189,8 @@ func CreateJobsForProjects(projects []digger_config.Project, command string, eve
RequestedBy: requestedBy,
StateEnvProvider: StateEnvProvider,
CommandEnvProvider: CommandEnvProvider,
CommandRoleArn: cmdRole,
StateRoleArn: stateRole,
CommandRoleArn: cmdRole,
StateRoleArn: stateRole,
CognitoOidcConfig: project.AwsCognitoOidcConfig,
SkipMergeCheck: skipMerge,
})
Expand Down
4 changes: 2 additions & 2 deletions next/controllers/github_after_merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ func handlePushEventApplyAfterMerge(gh nextutils.GithubClientProvider, payload *
// TODO: find a way to set the right PR branch
issueNumber := 0

planJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger plan", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch)
planJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger plan", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch, false)
if err != nil {
log.Printf("Error creating jobs: %v", err)
return fmt.Errorf("error creating jobs")
}

applyJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger apply", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch)
applyJobs, err := generic.CreateJobsForProjects(impactedProjects, "digger apply", "push", repoFullName, requestedBy, config.Workflows, &issueNumber, &commitId, targetBranch, targetBranch, false)
if err != nil {
log.Printf("Error creating jobs: %v", err)
return fmt.Errorf("error creating jobs")
Expand Down
2 changes: 1 addition & 1 deletion next/services/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func CreateJobAndBatchForProjectFromBranch(gh utils.GithubClientProvider, projec

issueNumber := 0

jobs, err := generic.CreateJobsForProjects(dgprojects, command, string(event), repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch)
jobs, err := generic.CreateJobsForProjects(dgprojects, command, string(event), repoFullName, "digger", config.Workflows, &issueNumber, nil, branch, branch, false)
if err != nil {
log.Printf("Error creating jobs: %v", err)
return nil, nil, fmt.Errorf("error creating jobs: %v", err)
Expand Down
Loading