Skip to content

support gitlab drift detection #1936

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.

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 8 commits into from
Apr 8, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 4 additions & 0 deletions ee/cli/cmd/digger/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/diggerhq/digger/ee/cli/pkg/comment_updater"
"github.com/diggerhq/digger/ee/cli/pkg/drift"
github2 "github.com/diggerhq/digger/ee/cli/pkg/github"
"github.com/diggerhq/digger/ee/cli/pkg/gitlab"
"github.com/diggerhq/digger/ee/cli/pkg/policy"
"github.com/diggerhq/digger/ee/cli/pkg/vcs"
comment_summary "github.com/diggerhq/digger/libs/comment_utils/summary"
Expand Down Expand Up @@ -67,6 +68,9 @@ var defaultCmd = &cobra.Command{
case digger.GitHub:
logLeader = os.Getenv("GITHUB_ACTOR")
github.GitHubCI(lock, policy.PolicyCheckerProviderAdvanced{}, BackendApi, ReportStrategy, github2.GithubServiceProviderAdvanced{}, comment_updater.CommentUpdaterProviderAdvanced{}, drift.DriftNotificationProviderAdvanced{})
case digger.GitLab:
log.Printf("gitlab CI detected")
gitlab.GitLabCI(lock, policy.PolicyCheckerProviderAdvanced{}, BackendApi, ReportStrategy, github2.GithubServiceProviderAdvanced{}, comment_updater.CommentUpdaterProviderAdvanced{}, drift.DriftNotificationProviderAdvanced{})
case digger.None:
print("No CI detected.")
os.Exit(10)
Expand Down
133 changes: 133 additions & 0 deletions ee/cli/pkg/gitlab/gitlab.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
package gitlab

import (
"fmt"
"github.com/diggerhq/digger/cli/pkg/digger"
"github.com/diggerhq/digger/cli/pkg/drift"
"github.com/diggerhq/digger/cli/pkg/usage"
core_backend "github.com/diggerhq/digger/libs/backendapi"
dg_github "github.com/diggerhq/digger/libs/ci/github"
"github.com/diggerhq/digger/libs/ci/gitlab"
"github.com/diggerhq/digger/libs/comment_utils/reporting"
comment_updater "github.com/diggerhq/digger/libs/comment_utils/summary"
"github.com/diggerhq/digger/libs/digger_config"
core_locking "github.com/diggerhq/digger/libs/locking"
core_policy "github.com/diggerhq/digger/libs/policy"
"github.com/diggerhq/digger/libs/scheduler"
"log"
"os"
)

func GitLabCI(lock core_locking.Lock, policyCheckerProvider core_policy.PolicyCheckerProvider, backendApi core_backend.Api, reportingStrategy reporting.ReportStrategy, githubServiceProvider dg_github.GithubServiceProvider, commentUpdaterProvider comment_updater.CommentUpdaterProvider, driftNotificationProvider drift.DriftNotificationProvider) {
println("Using GitLab.")

repoOwner := os.Getenv("CI_PROJECT_NAMESPACE")
repoName := os.Getenv("CI_PROJECT_NAME")
gitlabToken := os.Getenv("GITLAB_TOKEN")
actor := "gitlab_user"
if gitlabToken == "" {
fmt.Println("GITLAB_TOKEN is empty")
}

repoFullName := fmt.Sprintf("%v/%v", repoOwner, repoName)
diggerConfig, _, _, err := digger_config.LoadDiggerConfig("./", true, nil)
if err != nil {
usage.ReportErrorAndExit(repoOwner, fmt.Sprintf("Failed to read Digger digger_config. %s", err), 4)
}
log.Printf("Digger digger_config read successfully\n")

// default policy checker for backwards compatibility, will be overridden in orchestrator flow
var policyChecker = core_policy.NoOpPolicyChecker{}

currentDir, err := os.Getwd()
if err != nil {
usage.ReportErrorAndExit(repoName, fmt.Sprintf("Failed to get current dir. %s", err), 4)
}

gitLabContext, err := gitlab.ParseGitLabContext()
if err != nil {
fmt.Printf("failed to parse GitLab context. %s\n", err.Error())
os.Exit(4)
}

// it's ok to not have merge request info if it has been merged
//if (gitLabContext.MergeRequestIId == nil || len(gitLabContext.OpenMergeRequests) == 0) && gitLabContext.EventType != "merge_request_merge" {
// fmt.Println("No merge request found.")
// os.Exit(0)
//}

gitlabService, err := gitlab.NewGitLabService(gitlabToken, gitLabContext, "")
if err != nil {
fmt.Printf("failed to initialise GitLab service, %v", err)
os.Exit(4)
}

runningMode := os.Getenv("INPUT_DIGGER_MODE")

if runningMode == "drift-detection" {

for _, projectConfig := range diggerConfig.Projects {
if !projectConfig.DriftDetection {
continue
}
workflow := diggerConfig.Workflows[projectConfig.Workflow]

stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars, true)

StateEnvProvider, CommandEnvProvider := scheduler.GetStateAndCommandProviders(projectConfig)

stateArn, cmdArn := "", ""
if projectConfig.AwsRoleToAssume != nil {
if projectConfig.AwsRoleToAssume.State != "" {
stateArn = projectConfig.AwsRoleToAssume.State
}

if projectConfig.AwsRoleToAssume.Command != "" {
cmdArn = projectConfig.AwsRoleToAssume.Command
}
}

job := scheduler.Job{
ProjectName: projectConfig.Name,
ProjectDir: projectConfig.Dir,
ProjectWorkspace: projectConfig.Workspace,
Terragrunt: projectConfig.Terragrunt,
OpenTofu: projectConfig.OpenTofu,
Pulumi: projectConfig.Pulumi,
Commands: []string{"digger drift-detect"},
ApplyStage: scheduler.ToConfigStage(workflow.Apply),
PlanStage: scheduler.ToConfigStage(workflow.Plan),
CommandEnvVars: commandEnvVars,
StateEnvVars: stateEnvVars,
RequestedBy: actor,
Namespace: repoFullName,
EventName: "drift-detect",
StateEnvProvider: StateEnvProvider,
CommandEnvProvider: CommandEnvProvider,
StateRoleArn: stateArn,
CommandRoleArn: cmdArn,
}

notification, err := driftNotificationProvider.Get(gitlabService)
if err != nil {
usage.ReportErrorAndExit(repoFullName, fmt.Sprintf("could not get drift notification type: %v", err), 8)
}

err = digger.RunJob(job, repoFullName, actor, gitlabService, policyChecker, nil, backendApi, &notification, currentDir)
if err != nil {
usage.ReportErrorAndExit(repoOwner, fmt.Sprintf("Failed to run commands. %s", err), 8)
}
}
} else {
usage.ReportErrorAndExit(repoOwner, fmt.Sprintf("unrecognised input mode: %v", runningMode), 1)
}
println("Commands executed successfully")

usage.ReportErrorAndExit(repoOwner, "Digger finished successfully", 0)

defer func() {
if r := recover(); r != nil {
usage.ReportErrorAndExit(repoOwner, fmt.Sprintf("Panic occurred. %s", r), 1)
}
}()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: Defer block placed after ReportErrorAndExit is unreachable. Consider moving defer above exit call.

Suggested change
usage.ReportErrorAndExit(repoOwner, "Digger finished successfully", 0)
defer func() {
if r := recover(); r != nil {
usage.ReportErrorAndExit(repoOwner, fmt.Sprintf("Panic occurred. %s", r), 1)
}
}()
defer func() {
if r := recover(); r != nil {
usage.ReportErrorAndExit(repoOwner, fmt.Sprintf("Panic occurred. %s", r), 1)
}
}()
usage.ReportErrorAndExit(repoOwner, "Digger finished successfully", 0)

}
2 changes: 2 additions & 0 deletions go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,8 @@ github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbf
github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4=
github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
Expand Down
Loading