Skip to content

Add function app dir to worker init request #8144

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
merged 1 commit into from
Feb 16, 2022
Merged

Add function app dir to worker init request #8144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/WebJobs.Script.Grpc/Channel/GrpcWorkerChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ internal WorkerInitRequest GetWorkerInitRequest()
return new WorkerInitRequest()
{
HostVersion = ScriptHost.Version,
WorkerDirectory = _workerConfig.Description.WorkerDirectory
WorkerDirectory = _workerConfig.Description.WorkerDirectory,
FunctionAppDirectory = _applicationHostOptions.CurrentValue.ScriptPath
};
}

Expand Down
3 changes: 3 additions & 0 deletions src/WebJobs.Script.Grpc/azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ message WorkerInitRequest {

// Full path of worker.config.json location
string worker_directory = 4;

// base directory for function app
string function_app_directory = 5;
}

// Worker responds with the result of initializing itself
Expand Down
2 changes: 2 additions & 0 deletions test/WebJobs.Script.Tests/Workers/Rpc/GrpcWorkerChannelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,10 @@ public void WorkerInitRequest_Expected()
{
WorkerInitRequest initRequest = _workerChannel.GetWorkerInitRequest();
Assert.NotNull(initRequest.WorkerDirectory);
Assert.NotNull(initRequest.FunctionAppDirectory);
Assert.NotNull(initRequest.HostVersion);
Assert.Equal("testDir", initRequest.WorkerDirectory);
Assert.Equal(_scriptRootPath, initRequest.FunctionAppDirectory);
Assert.Equal(ScriptHost.Version, initRequest.HostVersion);
}

Expand Down