Skip to content

Commit 6bbd1e0

Browse files
Fix: Enable per project assumerole support in drift detection (#1315)
* add caching behaviors as an option to the action * fix: mixed if on the cache-save * initial attempt at fixing the assume * restore to upstream since develop has changes
1 parent 1e2d553 commit 6bbd1e0

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

cli/cmd/digger/main.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,9 @@ func gitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
263263
workflow := diggerConfig.Workflows[projectConfig.Workflow]
264264

265265
stateEnvVars, commandEnvVars := digger_config.CollectTerraformEnvConfig(workflow.EnvVars)
266-
266+
267+
StateEnvProvider, CommandEnvProvider := orchestrator.GetStateAndCommandProviders(projectConfig)
268+
267269
job := orchestrator.Job{
268270
ProjectName: projectConfig.Name,
269271
ProjectDir: projectConfig.Dir,
@@ -278,6 +280,8 @@ func gitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
278280
RequestedBy: githubActor,
279281
Namespace: ghRepository,
280282
EventName: "drift-detect",
283+
StateEnvProvider: StateEnvProvider,
284+
CommandEnvProvider: CommandEnvProvider,
281285
}
282286

283287
slackNotificationUrl := os.Getenv("INPUT_DRIFT_DETECTION_SLACK_NOTIFICATION_URL")
@@ -676,6 +680,8 @@ func bitbucketCI(lock core_locking.Lock, policyChecker core_policy.Checker, back
676680

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

683+
StateEnvProvider, CommandEnvProvider := orchestrator.GetStateAndCommandProviders(projectConfig)
684+
679685
job := orchestrator.Job{
680686
ProjectName: projectConfig.Name,
681687
ProjectDir: projectConfig.Dir,
@@ -690,6 +696,8 @@ func bitbucketCI(lock core_locking.Lock, policyChecker core_policy.Checker, back
690696
RequestedBy: actor,
691697
Namespace: repository,
692698
EventName: "drift-detect",
699+
CommandEnvProvider: CommandEnvProvider,
700+
StateEnvProvider: StateEnvProvider,
693701
}
694702
err := digger.RunJob(job, repository, actor, &bitbucketService, policyChecker, nil, backendApi, nil, currentDir)
695703
if err != nil {

0 commit comments

Comments
 (0)