Skip to content

[Snyk] Security upgrade golang from 1.16 to 1.20rc3 #175

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

Open
snyk-bot wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[Snyk] Security upgrade golang from 1.16 to 1.20rc3 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0571bdf
Modify PHP codegen to store responses so they can be looked up in rea…
splittingred Mar 22, 2018
98da3f5
Update grpc with our compiler additions
splittingred Jul 13, 2022
2eca498
Merge pull request #107 from bigcommerce/php-compiler-upd
splittingred Jul 15, 2022
0475d73
Merge branch 'grpc:master' into master
splittingred Jul 15, 2022
07f36a0
fix: templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfil…
snyk-bot Jan 14, 2023
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
30 changes: 29 additions & 1 deletion src/compiler/php_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,36 @@ void PrintService(const ServiceDescriptor* service,
out->Print(GetPHPComments(service, " *").c_str());
out->Print(" */\n");
vars["name"] = GetPHPServiceClassname(service, class_suffix, is_server);
vars["extends"] = is_server ? "" : "extends \\Grpc\\BaseStub ";
vars["extends"] = is_server ? "" : "extends BaseStub ";
out->Print(vars, "class $name$ $extends${\n\n");
out->Indent();
out->Indent();

out->Print("public function getExpectedResponseMessages() {\n");
out->Indent();
out->Print("return [\n");
out->Indent();
map<grpc::string, grpc::string> response_vars;
for (int i = 0; i < service->method_count(); i++) {
const Descriptor* output_type = service->method(i)->output_type();
response_vars["method_name"] = grpc_generator::LowercaseFirstLetter(service->method(i)->name());
response_vars["output_type_id"] = MessageIdentifierName(GeneratedClassName(output_type), output_type->file());
out->Print(response_vars, "'$method_name$' => '\\$output_type_id$',\n");
}
out->Outdent();
out->Print("];\n");
out->Outdent();
out->Print("}\n\n");

// getServiceName() -> string - The name of the gRPC service
map<grpc::string, grpc::string> service_vars;
service_vars["service_name"] = service->full_name();
out->Print("public function getServiceName() {\n");
out->Indent();
out->Print(service_vars, "return '$service_name$';\n");
out->Outdent();
out->Print("}\n\n");

if (!is_server) {
out->Print(
"/**\n * @param string $$hostname hostname\n"
Expand Down Expand Up @@ -332,6 +358,8 @@ std::string GenerateFile(const FileDescriptor* file,
vars["package"] = php_namespace;
out.Print(vars, "namespace $package$;\n\n");

out.Print("use \\Grpc\\BaseStub;\n\n");

PrintService(service, class_suffix, is_server, &out);
}
return output;
Expand Down
2 changes: 1 addition & 1 deletion templates/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.16
FROM golang:1.20rc3

<%include file="../../go_path.include"/>
<%include file="../../run_tests_python_deps.include"/>
Expand Down