@@ -4,17 +4,18 @@ import (
44 "context"
55 "encoding/json"
66 "fmt"
7- "github.com/diggerhq/digger/cli/pkg/comment_updater"
8- core_drift "github.com/diggerhq/digger/cli/pkg/core/drift"
9- core_reporting "github.com/diggerhq/digger/cli/pkg/core/reporting"
10- "github.com/diggerhq/digger/cli/pkg/drift"
117 "log"
128 "net/http"
139 "os"
1410 "strconv"
1511 "strings"
1612 "time"
1713
14+ "github.com/diggerhq/digger/cli/pkg/comment_updater"
15+ core_drift "github.com/diggerhq/digger/cli/pkg/core/drift"
16+ core_reporting "github.com/diggerhq/digger/cli/pkg/core/reporting"
17+ "github.com/diggerhq/digger/cli/pkg/drift"
18+
1819 "github.com/diggerhq/digger/cli/pkg/azure"
1920 "github.com/diggerhq/digger/cli/pkg/bitbucket"
2021 core_backend "github.com/diggerhq/digger/cli/pkg/core/backend"
@@ -263,23 +264,23 @@ func gitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
263264 workflow := diggerConfig .Workflows [projectConfig .Workflow ]
264265
265266 stateEnvVars , commandEnvVars := digger_config .CollectTerraformEnvConfig (workflow .EnvVars )
266-
267+
267268 StateEnvProvider , CommandEnvProvider := orchestrator .GetStateAndCommandProviders (projectConfig )
268-
269+
269270 job := orchestrator.Job {
270- ProjectName : projectConfig .Name ,
271- ProjectDir : projectConfig .Dir ,
272- ProjectWorkspace : projectConfig .Workspace ,
273- Terragrunt : projectConfig .Terragrunt ,
274- OpenTofu : projectConfig .OpenTofu ,
275- Commands : []string {"digger drift-detect" },
276- ApplyStage : orchestrator .ToConfigStage (workflow .Apply ),
277- PlanStage : orchestrator .ToConfigStage (workflow .Plan ),
278- CommandEnvVars : commandEnvVars ,
279- StateEnvVars : stateEnvVars ,
280- RequestedBy : githubActor ,
281- Namespace : ghRepository ,
282- EventName : "drift-detect" ,
271+ ProjectName : projectConfig .Name ,
272+ ProjectDir : projectConfig .Dir ,
273+ ProjectWorkspace : projectConfig .Workspace ,
274+ Terragrunt : projectConfig .Terragrunt ,
275+ OpenTofu : projectConfig .OpenTofu ,
276+ Commands : []string {"digger drift-detect" },
277+ ApplyStage : orchestrator .ToConfigStage (workflow .Apply ),
278+ PlanStage : orchestrator .ToConfigStage (workflow .Plan ),
279+ CommandEnvVars : commandEnvVars ,
280+ StateEnvVars : stateEnvVars ,
281+ RequestedBy : githubActor ,
282+ Namespace : ghRepository ,
283+ EventName : "drift-detect" ,
283284 StateEnvProvider : StateEnvProvider ,
284285 CommandEnvProvider : CommandEnvProvider ,
285286 }
@@ -683,19 +684,19 @@ func bitbucketCI(lock core_locking.Lock, policyChecker core_policy.Checker, back
683684 StateEnvProvider , CommandEnvProvider := orchestrator .GetStateAndCommandProviders (projectConfig )
684685
685686 job := orchestrator.Job {
686- ProjectName : projectConfig .Name ,
687- ProjectDir : projectConfig .Dir ,
688- ProjectWorkspace : projectConfig .Workspace ,
689- Terragrunt : projectConfig .Terragrunt ,
690- OpenTofu : projectConfig .OpenTofu ,
691- Commands : []string {"digger drift-detect" },
692- ApplyStage : orchestrator .ToConfigStage (workflow .Apply ),
693- PlanStage : orchestrator .ToConfigStage (workflow .Plan ),
694- CommandEnvVars : commandEnvVars ,
695- StateEnvVars : stateEnvVars ,
696- RequestedBy : actor ,
697- Namespace : repository ,
698- EventName : "drift-detect" ,
687+ ProjectName : projectConfig .Name ,
688+ ProjectDir : projectConfig .Dir ,
689+ ProjectWorkspace : projectConfig .Workspace ,
690+ Terragrunt : projectConfig .Terragrunt ,
691+ OpenTofu : projectConfig .OpenTofu ,
692+ Commands : []string {"digger drift-detect" },
693+ ApplyStage : orchestrator .ToConfigStage (workflow .Apply ),
694+ PlanStage : orchestrator .ToConfigStage (workflow .Plan ),
695+ CommandEnvVars : commandEnvVars ,
696+ StateEnvVars : stateEnvVars ,
697+ RequestedBy : actor ,
698+ Namespace : repository ,
699+ EventName : "drift-detect" ,
699700 CommandEnvProvider : CommandEnvProvider ,
700701 StateEnvProvider : StateEnvProvider ,
701702 }
@@ -887,7 +888,8 @@ func newPlanStorage(ghToken string, ghRepoOwner string, ghRepositoryName string,
887888 var planStorage core_storage.PlanStorage
888889
889890 uploadDestination := strings .ToLower (os .Getenv ("PLAN_UPLOAD_DESTINATION" ))
890- if uploadDestination == "github" {
891+ switch {
892+ case uploadDestination == "github" :
891893 zipManager := utils.Zipper {}
892894 planStorage = & storage.GithubPlanStorage {
893895 Client : github .NewTokenClient (context .Background (), ghToken ),
@@ -896,19 +898,33 @@ func newPlanStorage(ghToken string, ghRepoOwner string, ghRepositoryName string,
896898 PullRequestNumber : * prNumber ,
897899 ZipManager : zipManager ,
898900 }
899- } else if uploadDestination == "gcp" {
901+ case uploadDestination == "gcp" :
900902 ctx , client := gcp .GetGoogleStorageClient ()
901903 bucketName := strings .ToLower (os .Getenv ("GOOGLE_STORAGE_BUCKET" ))
902904 if bucketName == "" {
903- reportErrorAndExit (requestedBy , fmt . Sprintf ( "GOOGLE_STORAGE_BUCKET is not defined" ) , 9 )
905+ reportErrorAndExit (requestedBy , "GOOGLE_STORAGE_BUCKET is not defined" , 9 )
904906 }
905907 bucket := client .Bucket (bucketName )
906908 planStorage = & storage.PlanStorageGcp {
907909 Client : client ,
908910 Bucket : bucket ,
909911 Context : ctx ,
910912 }
911- } else if uploadDestination == "gitlab" {
913+ case uploadDestination == "aws" :
914+ ctx , client , err := storage .GetAWSStorageClient ()
915+ if err != nil {
916+ reportErrorAndExit (requestedBy , fmt .Sprintf ("Failed to create AWS storage client: %s" , err ), 9 )
917+ }
918+ bucketName := strings .ToLower (os .Getenv ("AWS_S3_BUCKET" ))
919+ if bucketName == "" {
920+ reportErrorAndExit (requestedBy , "AWS_S3_BUCKET is not defined" , 9 )
921+ }
922+ planStorage = & storage.PlanStorageAWS {
923+ Context : ctx ,
924+ Client : client ,
925+ Bucket : bucketName ,
926+ }
927+ case uploadDestination == "gitlab" :
912928 //TODO implement me
913929 }
914930
0 commit comments