From 06fa6a8828cbfb76e4b0c2f4f281aeed555b69a5 Mon Sep 17 00:00:00 2001
From: Adi Suissa-Peleg <adip@google.com>
Date: Wed, 12 Apr 2023 14:35:44 +0000
Subject: [PATCH 1/2] cc: modify package namespace to split on dot

Also updated protoc-gen-star to v2.0.4 @496ad1ac90a4 using:
go get github.com/lyft/protoc-gen-star/v2@496ad1ac90a4

Signed-off-by: Adi Suissa-Peleg <adip@google.com>
---
 go.mod                   | 2 +-
 go.sum                   | 4 ++--
 templates/cc/file.go     | 8 ++++----
 templates/cc/register.go | 2 +-
 templates/ccnop/file.go  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/go.mod b/go.mod
index e05d65477..8cd184578 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/iancoleman/strcase v0.2.0
-	github.com/lyft/protoc-gen-star/v2 v2.0.3
+	github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
 	golang.org/x/net v0.9.0
 	golang.org/x/tools v0.7.0
diff --git a/go.sum b/go.sum
index 707460983..9636d1ee7 100644
--- a/go.sum
+++ b/go.sum
@@ -6,8 +6,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/lyft/protoc-gen-star/v2 v2.0.3 h1:/3+/2sWyXeMLzKd1bX+ixWKgEMsULrIivpDsuaF441o=
-github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
+github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4 h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE=
+github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/templates/cc/file.go b/templates/cc/file.go
index a85cf827a..9e7c8a671 100644
--- a/templates/cc/file.go
+++ b/templates/cc/file.go
@@ -34,7 +34,7 @@ pgv::Validator<{{ class . }}> {{ staticVarName . }}(static_cast<bool(*)(const {{
 } // namespace validate
 } // namespace pgv
 
-{{ range .Package.ProtoName.Split }}
+{{ range .Package.ProtoName.SplitOnDot }}
 namespace {{ . }} {
 {{- end }}
 
@@ -42,7 +42,7 @@ namespace {{ . }} {
 	{{- template "msg" . }}
 {{ end }}
 
-{{ range .Package.ProtoName.Split -}}
+{{ range .Package.ProtoName.SplitOnDot -}}
 } // namespace
 {{ end }}
 `
@@ -62,7 +62,7 @@ const headerFileTpl = `// Code generated by protoc-gen-validate
 #include "validate/validate.h"
 #include "{{ output .File ".h" }}"
 
-{{ range .Package.ProtoName.Split }}
+{{ range .Package.ProtoName.SplitOnDot }}
 namespace {{ . }} {
 {{- end }}
 
@@ -72,7 +72,7 @@ using std::string;
 	{{- template "decl" . }}
 {{ end }}
 
-{{ range .Package.ProtoName.Split -}}
+{{ range .Package.ProtoName.SplitOnDot -}}
 } // namespace
 {{ end }}
 
diff --git a/templates/cc/register.go b/templates/cc/register.go
index 4881de0e6..f846f5a8b 100644
--- a/templates/cc/register.go
+++ b/templates/cc/register.go
@@ -162,7 +162,7 @@ func (fns CCFuncs) className(ent childEntity) string {
 }
 
 func (fns CCFuncs) packageName(msg pgs.Entity) string {
-	return "::" + strings.Join(msg.Package().ProtoName().Split(), "::")
+	return "::" + strings.Join(msg.Package().ProtoName().SplitOnDot(), "::")
 }
 
 func (fns CCFuncs) quote(s interface {
diff --git a/templates/ccnop/file.go b/templates/ccnop/file.go
index 1329597e9..f51ac3906 100644
--- a/templates/ccnop/file.go
+++ b/templates/ccnop/file.go
@@ -11,7 +11,7 @@ const headerFileTpl = `// Code generated by protoc-gen-validate
 #include "validate/validate.h"
 #include "{{ output .File ".h" }}"
 
-{{ range .Package.ProtoName.Split }}
+{{ range .Package.ProtoName.SplitOnDot }}
 namespace {{ . }} {
 {{- end }}
 
@@ -21,7 +21,7 @@ using std::string;
 	extern inline bool Validate(__attribute__((unused)) const {{ class . }}& m, __attribute__((unused)) pgv::ValidationMsg* err) { return true; }
 {{ end }}
 
-{{ range .Package.ProtoName.Split -}}
+{{ range .Package.ProtoName.SplitOnDot -}}
 } // namespace
 {{ end }}
 

From 80ee2661e7513bef104e89ff761d07eb68d38c05 Mon Sep 17 00:00:00 2001
From: Adi Suissa-Peleg <adip@google.com>
Date: Thu, 13 Apr 2023 18:46:03 +0000
Subject: [PATCH 2/2] fix bazel dependencies

Signed-off-by: Adi Suissa-Peleg <adip@google.com>
---
 dependencies.bzl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.bzl b/dependencies.bzl
index b40d4ddb6..a993ccca8 100644
--- a/dependencies.bzl
+++ b/dependencies.bzl
@@ -220,8 +220,8 @@ def go_third_party():
     go_repository(
         name = "com_github_lyft_protoc_gen_star",
         importpath = "github.com/lyft/protoc-gen-star/v2",
-        sum = "h1:keaAo8hRuAT0O3DfJ/wM3rufbAjGeJ1lAtWZHDjKGB0=",
-        version = "v2.0.1",
+        sum = "h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE=",
+        version = "v2.0.4-0.20230330145011-496ad1ac90a4",
     )
     go_repository(
         name = "com_github_pkg_errors",