@@ -457,6 +457,17 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
457
457
stateEnvVars , commandEnvVars := digger_config .CollectTerraformEnvConfig (workflow .EnvVars , performEnvVarInterpolation )
458
458
pullRequestNumber := payload .PullRequest .Number
459
459
460
+ stateRole , cmdRole := "" , ""
461
+ if project .AwsRoleToAssume != nil {
462
+ if project .AwsRoleToAssume .State != "" {
463
+ stateRole = project .AwsRoleToAssume .State
464
+ }
465
+
466
+ if project .AwsRoleToAssume .Command != "" {
467
+ cmdRole = project .AwsRoleToAssume .Command
468
+ }
469
+ }
470
+
460
471
StateEnvProvider , CommandEnvProvider := scheduler .GetStateAndCommandProviders (project )
461
472
if * payload .Action == "closed" && * payload .PullRequest .Merged && * (payload .PullRequest .Base ).Ref == * (payload .Repo ).DefaultBranch {
462
473
jobs = append (jobs , scheduler.Job {
@@ -478,7 +489,10 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
478
489
Namespace : * payload .Repo .FullName ,
479
490
RequestedBy : * payload .Sender .Login ,
480
491
CommandEnvProvider : CommandEnvProvider ,
492
+ CommandRoleArn : cmdRole ,
493
+ StateRoleArn : stateRole ,
481
494
StateEnvProvider : StateEnvProvider ,
495
+ CognitoOidcConfig : project .AwsCognitoOidcConfig ,
482
496
SkipMergeCheck : skipMerge ,
483
497
})
484
498
} else if * payload .Action == "opened" || * payload .Action == "reopened" || * payload .Action == "synchronize" {
@@ -501,7 +515,10 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
501
515
Namespace : * payload .Repo .FullName ,
502
516
RequestedBy : * payload .Sender .Login ,
503
517
CommandEnvProvider : CommandEnvProvider ,
518
+ CommandRoleArn : cmdRole ,
519
+ StateRoleArn : stateRole ,
504
520
StateEnvProvider : StateEnvProvider ,
521
+ CognitoOidcConfig : project .AwsCognitoOidcConfig ,
505
522
SkipMergeCheck : skipMerge ,
506
523
})
507
524
} else if * payload .Action == "closed" {
@@ -524,7 +541,10 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
524
541
Namespace : * payload .Repo .FullName ,
525
542
RequestedBy : * payload .Sender .Login ,
526
543
CommandEnvProvider : CommandEnvProvider ,
544
+ CommandRoleArn : cmdRole ,
545
+ StateRoleArn : stateRole ,
527
546
StateEnvProvider : StateEnvProvider ,
547
+ CognitoOidcConfig : project .AwsCognitoOidcConfig ,
528
548
SkipMergeCheck : skipMerge ,
529
549
})
530
550
} else if * payload .Action == "converted_to_draft" {
@@ -554,7 +574,10 @@ func ConvertGithubPullRequestEventToJobs(payload *github.PullRequestEvent, impac
554
574
Namespace : * payload .Repo .FullName ,
555
575
RequestedBy : * payload .Sender .Login ,
556
576
CommandEnvProvider : CommandEnvProvider ,
577
+ CommandRoleArn : cmdRole ,
578
+ StateRoleArn : stateRole ,
557
579
StateEnvProvider : StateEnvProvider ,
580
+ CognitoOidcConfig : project .AwsCognitoOidcConfig ,
558
581
SkipMergeCheck : skipMerge ,
559
582
})
560
583
}
0 commit comments