Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions src/proto/FunctionRpc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ option go_package ="github.com/Azure/azure-functions-go-worker/internal/rpc";
package AzureFunctionsRpcMessages;

import "google/protobuf/duration.proto";
import "identity/ClaimsIdentityRpc.proto";
import "shared/NullableTypes.proto";
import "azure_functions_worker/protos/ClaimsIdentityRpc.proto";
import "azure_functions_worker/protos/NullableTypes.proto";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed shared? intentional? needed to flatten dir structure?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's intentional. I copy the files over into a staging folder where they are flattened and then I run the compiler. With these import statements, the compiler is able to figure out the proper absolute imports without me having to do any fancy regex manipulation. I pulled in the protobuf changes into my private repo so I could get a CI run if you wanted to see the full context: maiqbal11/azure-functions-python-worker#24.


// Interface exported by the server.
service FunctionRpc {
Expand Down
2 changes: 1 addition & 1 deletion src/proto/identity/ClaimsIdentityRpc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ syntax = "proto3";

option java_package = "com.microsoft.azure.functions.rpc.messages";

import "shared/NullableTypes.proto";
import "azure_functions_worker/protos/NullableTypes.proto";

// Light-weight representation of a .NET System.Security.Claims.ClaimsIdentity object.
// This is the same serialization as found in EasyAuth, and needs to be kept in sync with
Expand Down