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

Set and unset aws environment variables

Browse Source 
in order to provide the CodeOcean context for some scripts and hide AWS credentials from the users.
This commit is contained in:
Maximilian Paß
2022-05-24 23:48:39 +02:00
committed by Sebastian Serth
parent ecce3c294f
commit 903ad415c6
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/runner/aws_runner.go
View File

@ -84,6 +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)
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)
@ -208,3 +209,12 @@ func (w *AWSFunctionWorkload) handleRunnerTimeout(ctx context.Context,
exit <- ExitInfo{255, ErrorRunnerInactivityTimeout} exit <- ExitInfo{255, ErrorRunnerInactivityTimeout}
} }
} }
// prepareEnvironmentVariables sets the CODEOCEAN variable and unsets some AWS variables.
func (w *AWSFunctionWorkload) prepareEnvironmentVariables(request *dto.ExecutionRequest) {
if request.Environment == nil {
request.Environment = make(map[string]string)
}
request.Environment["CODEOCEAN"] = "true"
request.Command = "unset \"${!AWS@}\" && " + request.Command
}

5
internal/runner/aws_runner_test.go
View File

@ -92,7 +92,8 @@ func TestAWSFunctionWorkload_ExecuteInteractively(t *testing.T) {
cancel() cancel()
expectedRequestData := "{\"action\":\"" + environment.Image() + expectedRequestData := "{\"action\":\"" + environment.Image() +
"\",\"cmd\":[\"env\",\"sh\",\"-c\",\"" + command + "\"],\"files\":{}}" "\",\"cmd\":[\"env\",\"CODEOCEAN=true\",\"sh\",\"-c\",\"unset \\\"${!AWS@}\\\" \\u0026\\u0026 " + command +
"\"],\"files\":{}}"
assert.Equal(t, expectedRequestData, awsMock.receivedData) assert.Equal(t, expectedRequestData, awsMock.receivedData)
}) })
} }
@ -124,7 +125,7 @@ func TestAWSFunctionWorkload_UpdateFileSystem(t *testing.T) {
execCancel() execCancel()
expectedRequestData := "{\"action\":\"" + environment.Image() + expectedRequestData := "{\"action\":\"" + environment.Image() +
"\",\"cmd\":[\"env\",\"sh\",\"-c\",\"" + command + "\"]," + "\",\"cmd\":[\"env\",\"CODEOCEAN=true\",\"sh\",\"-c\",\"unset \\\"${!AWS@}\\\" \\u0026\\u0026 " + command + "\"]," +
"\"files\":{\"" + string(myFile.Path) + "\":\"" + base64.StdEncoding.EncodeToString(myFile.Content) + "\"}}" "\"files\":{\"" + string(myFile.Path) + "\":\"" + base64.StdEncoding.EncodeToString(myFile.Content) + "\"}}"
assert.Equal(t, expectedRequestData, awsMock.receivedData) assert.Equal(t, expectedRequestData, awsMock.receivedData)
} }