htwkmooc/poseidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add CODEOCEAN environment variable.

Browse Source
This commit is contained in:
Maximilian Paß
2022-06-09 23:26:36 +02:00
committed by Sebastian Serth
parent 2f066a9fb4
commit 59ca63268b
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/runner/aws_runner.go
View File

@ -84,7 +84,7 @@ func (w *AWSFunctionWorkload) ExecuteInteractively(id string, _ io.ReadWriter, s
if !ok { if !ok {
return nil, nil, ErrorUnknownExecution return nil, nil, ErrorUnknownExecution
} }
w.prepareEnvironmentVariables(request) hideEnvironmentVariables(request, "AWS")
command, ctx, cancel := prepareExecution(request) command, ctx, cancel := prepareExecution(request)
exitInternal := make(chan ExitInfo) exitInternal := make(chan ExitInfo)
exit := make(chan ExitInfo, 1) exit := make(chan ExitInfo, 1)
@ -210,11 +210,10 @@ func (w *AWSFunctionWorkload) handleRunnerTimeout(ctx context.Context,
} }
} }
// prepareEnvironmentVariables sets the CODEOCEAN variable and unsets some AWS variables. // hideEnvironmentVariables sets the CODEOCEAN variable and unsets all variables starting with the passed prefix.
func (w *AWSFunctionWorkload) prepareEnvironmentVariables(request *dto.ExecutionRequest) { func hideEnvironmentVariables(request *dto.ExecutionRequest, unsetPrefix string) {
if request.Environment == nil { if request.Environment == nil {
request.Environment = make(map[string]string) request.Environment = make(map[string]string)
} }
request.Environment["CODEOCEAN"] = "true" request.Command = "unset \"${!" + unsetPrefix + "@}\" && " + request.Command
request.Command = "unset \"${!AWS@}\" && " + request.Command
} }

6
pkg/dto/dto.go
View File

@ -25,6 +25,12 @@ type ExecutionRequest struct {
func (er *ExecutionRequest) FullCommand() []string { func (er *ExecutionRequest) FullCommand() []string {
command := make([]string, 0) command := make([]string, 0)
command = append(command, "env") command = append(command, "env")
if er.Environment == nil {
er.Environment = make(map[string]string)
}
er.Environment["CODEOCEAN"] = "true"
for variable, value := range er.Environment { for variable, value := range er.Environment {
command = append(command, fmt.Sprintf("%s=%s", variable, value)) command = append(command, fmt.Sprintf("%s=%s", variable, value))
} }