Skip to content

fix: allow EnvManagerRole to access the s3 bucket that holds task's env files #5760

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

Merged
mergify merged 3 commits into from
Apr 8, 2024
Merged

fix: allow EnvManagerRole to access the s3 bucket that holds task's env files #5760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad5d741
allow env manager role to access envfile s3 bucket for task
Lou1415926 Apr 5, 2024
bc64e3c
enhance e2e test
Lou1415926 Apr 5, 2024
aa095f1
Merge branch 'mainline' into fix/task/run/env/file/permission/to/envm…
mergify[bot] Apr 8, 2024
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 e2e/internal/client/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ type TaskRunInput struct {

Image string
Dockerfile string
EnvFile string

Subnets []string
SecurityGroups []string
Expand Down Expand Up @@ -893,6 +894,9 @@ func (cli *CLI) TaskRun(input *TaskRunInput) (string, error) {
if input.Image != "" {
commands = append(commands, "--image", input.Image)
}
if input.EnvFile != "" {
commands = append(commands, "--env-file", input.EnvFile)
}
if input.AppName != "" {
commands = append(commands, "--app", input.AppName)
}
Expand Down
1 change: 1 addition & 0 deletions e2e/task/backend/check_override.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ sleep 20

for i in 1 2 3 4 5 6 7 8; do
echo "e2e environment variables: $STATUS"
echo "$BEST_ICE_CREAM_FLAVOR"
sleep 3
done
1 change: 1 addition & 0 deletions e2e/task/sesame.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BEST_ICE_CREAM_FLAVOR=sesame
2 changes: 2 additions & 0 deletions e2e/task/task_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ var _ = Describe("Task", func() {

AppName: appName,
Env: envName,

EnvFile: "./sesame.env",
})
})

Expand Down
5 changes: 5 additions & 0 deletions internal/pkg/template/templates/task/cf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,11 @@ Resources:
Principal:
AWS:
- !Sub arn:${AWS::Partition}:iam::${AWS::AccountId}:root
{{- if and .App .Env }}
AWS:
- !Sub 'arn:${AWS::Partition}:iam::${AWS::AccountId}:role/{{ .App }}-{{ .Env }}-EnvManagerRole'
{{- end}}

Outputs:
ECRRepo:
Description: ECR Repo used to store images of task.
Expand Down