Skip to content

Fix/handle missing digger config gracefully #2517

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

Open
joshuamkite-nfb wants to merge 4 commits into
base: develop
Choose a base branch
from
+189 −55
Open

Fix/handle missing digger config gracefully #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d95f986
fix: handle missing digger config files gracefully
joshuamkite-nfb Dec 16, 2025
2e1d7ba
test: update tests for graceful missing config handling
joshuamkite-nfb Dec 16, 2025
2c8ec82
fix: add nil pointer safety checks
joshuamkite-nfb Dec 16, 2025
a79da31
Merge develop branch - resolve conflict in github.go
joshuamkite-nfb Dec 16, 2025
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
23 changes: 14 additions & 9 deletions cli/pkg/integration/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ package integration

import (
"context"
"github.com/diggerhq/digger/libs/ci/generic"
"github.com/diggerhq/digger/libs/execution"
"github.com/diggerhq/digger/libs/locking"
"github.com/diggerhq/digger/libs/locking/aws"
"github.com/diggerhq/digger/libs/storage"
"log"
"math/rand"
"os"
"testing"
"time"

"github.com/diggerhq/digger/libs/comment_utils/summary"
"github.com/diggerhq/digger/libs/ci/generic"
"github.com/diggerhq/digger/libs/execution"
"github.com/diggerhq/digger/libs/locking"
"github.com/diggerhq/digger/libs/locking/aws"
"github.com/diggerhq/digger/libs/storage"

comment_updater "github.com/diggerhq/digger/libs/comment_utils/summary"

"github.com/diggerhq/digger/cli/pkg/digger"
"github.com/diggerhq/digger/cli/pkg/github/models"
Expand Down Expand Up @@ -238,9 +239,13 @@ var githubContextNewPullRequestMinJson = `{
"event": {
"action": "opened",
"number": 11,
"repository": {
"default_branch": "main"
},
"repository": {
"default_branch": "main",
"full_name": "diggerhq/digger_demo"
},
"sender": {
"login": "test-user"
},
"pull_request": {
"active_lock_reason": null,
"number": 11,
Expand Down
177 changes: 142 additions & 35 deletions libs/ci/github/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,23 +334,23 @@ func (svc GithubService) CreateCheckRun(name string, status string, conclusion s

ctx := context.Background()
checkRun, resp, err := client.Checks.CreateCheckRun(ctx, owner, repoName, opts)

// Log rate limit information
if resp != nil {
limit := resp.Header.Get("X-RateLimit-Limit")
remaining := resp.Header.Get("X-RateLimit-Remaining")
reset := resp.Header.Get("X-RateLimit-Reset")

if limit != "" && remaining != "" {
limitInt, _ := strconv.Atoi(limit)
remainingInt, _ := strconv.Atoi(remaining)

// Calculate percentage remaining
var percentRemaining float64
if limitInt > 0 {
percentRemaining = (float64(remainingInt) / float64(limitInt)) * 100
}

// Log based on severity
if remainingInt == 0 {
slog.Error("GitHub API rate limit EXHAUSTED",
Expand Down Expand Up @@ -381,17 +381,17 @@ func (svc GithubService) CreateCheckRun(name string, status string, conclusion s
}
}
}

return checkRun, err
}

type GithubCheckRunUpdateOptions struct {
Status *string
Status *string
Conclusion *string
Title *string
Summary *string
Text *string
Actions []*github.CheckRunAction
Title *string
Summary *string
Text *string
Actions []*github.CheckRunAction
}

func (svc GithubService) UpdateCheckRun(checkRunId string, options GithubCheckRunUpdateOptions) (*github.CheckRun, error) {
Expand Down Expand Up @@ -477,8 +477,8 @@ func (svc GithubService) UpdateCheckRun(checkRunId string, options GithubCheckRu
}

opts := github.UpdateCheckRunOptions{
Name: *existingCheckRun.Name,
Output: output,
Name: *existingCheckRun.Name,
Output: output,
Actions: newActions,
}

Expand All @@ -490,7 +490,55 @@ func (svc GithubService) UpdateCheckRun(checkRunId string, options GithubCheckRu
opts.Conclusion = github.String(*conclusion)
}

checkRun, _, err := client.Checks.UpdateCheckRun(ctx, owner, repoName, checkRunIdInt64, opts)
checkRun, resp, err := client.Checks.UpdateCheckRun(ctx, owner, repoName, checkRunIdInt64, opts)

// Log rate limit information
if resp != nil {
limit := resp.Header.Get("X-RateLimit-Limit")
remaining := resp.Header.Get("X-RateLimit-Remaining")
reset := resp.Header.Get("X-RateLimit-Reset")

if limit != "" && remaining != "" {
limitInt, _ := strconv.Atoi(limit)
remainingInt, _ := strconv.Atoi(remaining)

// Calculate percentage remaining
var percentRemaining float64
if limitInt > 0 {
percentRemaining = (float64(remainingInt) / float64(limitInt)) * 100
}

// Log based on severity
if remainingInt == 0 {
slog.Error("GitHub API rate limit EXHAUSTED",
"operation", "UpdateCheckRun",
"checkRunId", checkRunId,
"limit", limit,
"remaining", remaining,
"reset", reset,
"owner", owner,
"repo", repoName)
} else if percentRemaining < 20 {
slog.Warn("GitHub API rate limit getting LOW",
"operation", "UpdateCheckRun",
"checkRunId", checkRunId,
"limit", limit,
"remaining", remaining,
"percentRemaining", fmt.Sprintf("%.1f%%", percentRemaining),
"reset", reset,
"owner", owner,
"repo", repoName)
} else {
slog.Debug("GitHub API rate limit status",
"operation", "UpdateCheckRun",
"checkRunId", checkRunId,
"limit", limit,
"remaining", remaining,
"percentRemaining", fmt.Sprintf("%.1f%%", percentRemaining))
}
}
}

if err != nil {
slog.Error("Failed to update check run",
"inputCheckRunId", checkRunId,
Expand Down Expand Up @@ -691,12 +739,53 @@ func (svc GithubService) CheckBranchExists(branchName string) (bool, error) {
return true, nil
}

// getStringValue safely dereferences a string pointer, returning empty string if nil
func getStringValue(s *string) string {
if s == nil {
return ""
}
return *s
}

// getWorkflowCommands safely retrieves workflow commands, returning empty slice if configuration is nil
func getWorkflowCommands(config *digger_config.WorkflowConfiguration, commandType string) []string {
if config == nil {
return []string{}
}

switch commandType {
case "OnCommitToDefault":
return config.OnCommitToDefault
case "OnPullRequestPushed":
return config.OnPullRequestPushed
case "OnPullRequestClosed":
return config.OnPullRequestClosed
case "OnPullRequestConvertedToDraft":
return config.OnPullRequestConvertedToDraft
default:
return []string{}
}
}

func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impactedProjects []digger_config.Project, requestedProject *digger_config.Project, config digger_config.DiggerConfig, performEnvVarInterpolation bool) ([]scheduler.Job, bool, error) {
workflows := config.Workflows
jobs := make([]scheduler.Job, 0)

defaultBranch := *payload.Repo.DefaultBranch
prBranch := payload.PullRequest.Head.GetRef()
if payload == nil || payload.Repo == nil || payload.PullRequest == nil {
return nil, false, fmt.Errorf("invalid payload: missing required fields")
}

var defaultBranch string
if payload.Repo.DefaultBranch != nil {
defaultBranch = *payload.Repo.DefaultBranch
} else {
defaultBranch = "main" // fallback default
}

var prBranch string
if payload.PullRequest.Head != nil {
prBranch = payload.PullRequest.Head.GetRef()
}

coversAllImpactedProjects := true

Expand All @@ -717,7 +806,13 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
runEnvVars := generic.GetRunEnvVars(defaultBranch, prBranch, project.Name, project.Dir)

stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars, performEnvVarInterpolation)
pullRequestNumber := payload.PullRequest.Number
var pullRequestNumber *int
if payload.PullRequest.Number != nil {
pullRequestNumber = payload.PullRequest.Number
} else {
defaultPRNumber := 0
pullRequestNumber = &defaultPRNumber
}

stateRole, cmdRole := "", ""
if project.AwsRoleToAssume != nil {
Expand All @@ -731,11 +826,23 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
}

StateEnvProvider, CommandEnvProvider := scheduler.GetStateAndCommandProviders(project)
if *payload.Action == "closed" && *payload.PullRequest.Merged && *(payload.PullRequest.Base).Ref == *(payload.Repo).DefaultBranch {
action := getStringValue(payload.Action)

var isMerged bool
if payload.PullRequest.Merged != nil {
isMerged = *payload.PullRequest.Merged
}

var baseRef string
if payload.PullRequest.Base != nil && payload.PullRequest.Base.Ref != nil {
baseRef = *payload.PullRequest.Base.Ref
}

if action == "closed" && isMerged && baseRef == defaultBranch {
slog.Info("processing merged PR to default branch",
"prNumber", *pullRequestNumber,
"project", project.Name,
"action", *payload.Action)
"action", action)

jobs = append(jobs, scheduler.Job{
ProjectName: project.Name,
Expand All @@ -747,28 +854,28 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
Terragrunt: project.Terragrunt,
OpenTofu: project.OpenTofu,
Pulumi: project.Pulumi,
Commands: workflow.Configuration.OnCommitToDefault,
Commands: getWorkflowCommands(workflow.Configuration, "OnCommitToDefault"),
ApplyStage: scheduler.ToConfigStage(workflow.Apply),
PlanStage: scheduler.ToConfigStage(workflow.Plan),
RunEnvVars: runEnvVars,
CommandEnvVars: commandEnvVars,
StateEnvVars: stateEnvVars,
PullRequestNumber: pullRequestNumber,
EventName: "pull_request",
Namespace: *payload.Repo.FullName,
RequestedBy: *payload.Sender.Login,
Namespace: getStringValue(payload.Repo.FullName),
RequestedBy: getStringValue(payload.Sender.Login),
CommandEnvProvider: CommandEnvProvider,
CommandRoleArn: cmdRole,
StateRoleArn: stateRole,
StateEnvProvider: StateEnvProvider,
CognitoOidcConfig: project.AwsCognitoOidcConfig,
SkipMergeCheck: skipMerge,
})
} else if *payload.Action == "opened" || *payload.Action == "reopened" || *payload.Action == "synchronize" {
} else if action == "opened" || action == "reopened" || action == "synchronize" {
slog.Info("processing PR update",
"prNumber", *pullRequestNumber,
"project", project.Name,
"action", *payload.Action)
"action", action)

jobs = append(jobs, scheduler.Job{
ProjectName: project.Name,
Expand All @@ -780,24 +887,24 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
Terragrunt: project.Terragrunt,
OpenTofu: project.OpenTofu,
Pulumi: project.Pulumi,
Commands: workflow.Configuration.OnPullRequestPushed,
Commands: getWorkflowCommands(workflow.Configuration, "OnPullRequestPushed"),
ApplyStage: scheduler.ToConfigStage(workflow.Apply),
PlanStage: scheduler.ToConfigStage(workflow.Plan),
RunEnvVars: runEnvVars,
CommandEnvVars: commandEnvVars,
StateEnvVars: stateEnvVars,
PullRequestNumber: pullRequestNumber,
EventName: "pull_request",
Namespace: *payload.Repo.FullName,
RequestedBy: *payload.Sender.Login,
Namespace: getStringValue(payload.Repo.FullName),
RequestedBy: getStringValue(payload.Sender.Login),
CommandEnvProvider: CommandEnvProvider,
CommandRoleArn: cmdRole,
StateRoleArn: stateRole,
StateEnvProvider: StateEnvProvider,
CognitoOidcConfig: project.AwsCognitoOidcConfig,
SkipMergeCheck: skipMerge,
})
} else if *payload.Action == "closed" {
} else if action == "closed" {
slog.Info("processing PR closed",
"prNumber", *pullRequestNumber,
"project", project.Name)
Expand All @@ -812,29 +919,29 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
Terragrunt: project.Terragrunt,
OpenTofu: project.OpenTofu,
Pulumi: project.Pulumi,
Commands: workflow.Configuration.OnPullRequestClosed,
Commands: getWorkflowCommands(workflow.Configuration, "OnPullRequestClosed"),
ApplyStage: scheduler.ToConfigStage(workflow.Apply),
PlanStage: scheduler.ToConfigStage(workflow.Plan),
RunEnvVars: runEnvVars,
CommandEnvVars: commandEnvVars,
StateEnvVars: stateEnvVars,
PullRequestNumber: pullRequestNumber,
EventName: "pull_request",
Namespace: *payload.Repo.FullName,
RequestedBy: *payload.Sender.Login,
Namespace: getStringValue(payload.Repo.FullName),
RequestedBy: getStringValue(payload.Sender.Login),
CommandEnvProvider: CommandEnvProvider,
CommandRoleArn: cmdRole,
StateRoleArn: stateRole,
StateEnvProvider: StateEnvProvider,
CognitoOidcConfig: project.AwsCognitoOidcConfig,
SkipMergeCheck: skipMerge,
})
} else if *payload.Action == "converted_to_draft" {
} else if action == "converted_to_draft" {
var commands []string
if config.AllowDraftPRs == false && len(workflow.Configuration.OnPullRequestConvertedToDraft) == 0 {
if config.AllowDraftPRs == false && len(getWorkflowCommands(workflow.Configuration, "OnPullRequestConvertedToDraft")) == 0 {
commands = []string{"digger unlock"}
} else {
commands = workflow.Configuration.OnPullRequestConvertedToDraft
commands = getWorkflowCommands(workflow.Configuration, "OnPullRequestConvertedToDraft")
}

slog.Info("processing PR converted to draft",
Expand All @@ -860,8 +967,8 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
StateEnvVars: stateEnvVars,
PullRequestNumber: pullRequestNumber,
EventName: "pull_request_converted_to_draft",
Namespace: *payload.Repo.FullName,
RequestedBy: *payload.Sender.Login,
Namespace: getStringValue(payload.Repo.FullName),
RequestedBy: getStringValue(payload.Sender.Login),
CommandEnvProvider: CommandEnvProvider,
CommandRoleArn: cmdRole,
StateRoleArn: stateRole,
Expand Down
Loading
Loading