Merge pull request #84 from cludden/cludden/cli-fix

fix cross-package cli imports, repeated string flags
cludden · Dec 19, 2024 · 7c69f56 · 7c69f56
2 parents b3f3ee9 + 724b629
commit 7c69f56
Show file tree

Hide file tree

Showing 46 changed files with 123 additions and 123 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - [#80](https://github.com/cludden/protoc-gen-go-temporal/pull/80) fix cross-package signal-with-start
+- [#84](https://github.com/cludden/protoc-gen-go-temporal/pull/84) q
 
 
 

diff --git a/gen/example/helloworld/v1/example.pb.go b/gen/example/helloworld/v1/example.pb.go
diff --git a/gen/example/helloworld/v1/example_temporal.pb.go b/gen/example/helloworld/v1/example_temporal.pb.go
diff --git a/gen/example/helloworld/v1/helloworldv1xns/example_xns_temporal.pb.go b/gen/example/helloworld/v1/helloworldv1xns/example_xns_temporal.pb.go
diff --git a/gen/example/mutex/v1/mutex.pb.go b/gen/example/mutex/v1/mutex.pb.go
diff --git a/gen/example/mutex/v1/mutex_temporal.pb.go b/gen/example/mutex/v1/mutex_temporal.pb.go
diff --git a/gen/example/mutex/v1/mutexv1xns/mutex_xns_temporal.pb.go b/gen/example/mutex/v1/mutexv1xns/mutex_xns_temporal.pb.go
diff --git a/gen/example/schedule/v1/schedule.pb.go b/gen/example/schedule/v1/schedule.pb.go
diff --git a/gen/example/schedule/v1/schedule_temporal.pb.go b/gen/example/schedule/v1/schedule_temporal.pb.go
diff --git a/gen/example/schedule/v1/schedulev1xns/schedule_xns_temporal.pb.go b/gen/example/schedule/v1/schedulev1xns/schedule_xns_temporal.pb.go
diff --git a/gen/example/searchattributes/v1/searchattributes.pb.go b/gen/example/searchattributes/v1/searchattributes.pb.go
diff --git a/gen/example/searchattributes/v1/searchattributes_temporal.pb.go b/gen/example/searchattributes/v1/searchattributes_temporal.pb.go
diff --git a/gen/example/searchattributes/v1/searchattributesv1xns/searchattributes_xns_temporal.pb.go b/gen/example/searchattributes/v1/searchattributesv1xns/searchattributes_xns_temporal.pb.go
diff --git a/gen/example/updatabletimer/v1/updatabletimer.pb.go b/gen/example/updatabletimer/v1/updatabletimer.pb.go
diff --git a/gen/example/updatabletimer/v1/updatabletimer_temporal.pb.go b/gen/example/updatabletimer/v1/updatabletimer_temporal.pb.go
diff --git a/gen/example/updatabletimer/v1/updatabletimerv1xns/updatabletimer_xns_temporal.pb.go b/gen/example/updatabletimer/v1/updatabletimerv1xns/updatabletimer_xns_temporal.pb.go
diff --git a/gen/example/v1/example.pb.go b/gen/example/v1/example.pb.go
diff --git a/gen/example/v1/example_temporal.pb.go b/gen/example/v1/example_temporal.pb.go
diff --git a/gen/example/v1/examplev1xns/example_xns_temporal.pb.go b/gen/example/v1/examplev1xns/example_xns_temporal.pb.go
diff --git a/gen/example/xns/v1/xns.pb.go b/gen/example/xns/v1/xns.pb.go
diff --git a/gen/example/xns/v1/xns_temporal.pb.go b/gen/example/xns/v1/xns_temporal.pb.go
diff --git a/gen/example/xns/v1/xnsv1xns/xns_xns_temporal.pb.go b/gen/example/xns/v1/xnsv1xns/xns_xns_temporal.pb.go
diff --git a/gen/patch/go.pb.go b/gen/patch/go.pb.go
diff --git a/gen/temporal/v1/temporal.pb.go b/gen/temporal/v1/temporal.pb.go
diff --git a/gen/temporal/xns/v1/xns.pb.go b/gen/temporal/xns/v1/xns.pb.go
diff --git a/gen/test/expression/v1/expression.pb.go b/gen/test/expression/v1/expression.pb.go
diff --git a/gen/test/option/v1/option.pb.go b/gen/test/option/v1/option.pb.go
diff --git a/gen/test/option/v1/option_temporal.pb.go b/gen/test/option/v1/option_temporal.pb.go
diff --git a/gen/test/option/v1/optionv1xns/option_xns_temporal.pb.go b/gen/test/option/v1/optionv1xns/option_xns_temporal.pb.go
diff --git a/gen/test/simple/common/v1/common.pb.go b/gen/test/simple/common/v1/common.pb.go
diff --git a/gen/test/simple/v1/simple.pb.go b/gen/test/simple/v1/simple.pb.go
diff --git a/gen/test/simple/v1/simple_temporal.pb.go b/gen/test/simple/v1/simple_temporal.pb.go
diff --git a/gen/test/simple/v1/v1xns/simple_xns_temporal.pb.go b/gen/test/simple/v1/v1xns/simple_xns_temporal.pb.go
diff --git a/gen/test/xnserr/v1/xnserr.pb.go b/gen/test/xnserr/v1/xnserr.pb.go
diff --git a/gen/test/xnserr/v1/xnserr_temporal.pb.go b/gen/test/xnserr/v1/xnserr_temporal.pb.go
diff --git a/gen/test/xnserr/v1/xnserrv1xns/xnserr_xns_temporal.pb.go b/gen/test/xnserr/v1/xnserrv1xns/xnserr_xns_temporal.pb.go
diff --git a/internal/plugin/cli.go b/internal/plugin/cli.go
@@ -828,10 +828,10 @@ func (svc *Manifest) genCliUnmarshalMessage(f *g.File, msg *protogen.Message) {
 					oneof := field.Oneof
 
 					switch {
-					case field.Desc.IsList():
+					case field.Desc.IsList() && field.Desc.Kind() != protoreflect.StringKind:
 						fallthrough
 					case field.Desc.IsMap():
-						b.Var().Id("tmp").Id(name)
+						b.Var().Id("tmp").Qual(string(msg.GoIdent.GoImportPath), name)
 						b.If(
 							g.Err().Op(":=").Qual(protojsonPkg, "Unmarshal").Call(
 								g.Index().Byte().Call(g.Qual("fmt", "Sprintf").Call(g.Lit(fmt.Sprintf(`{"%s":%%s}`, field.Desc.JSONName())), g.Id("cmd").Dot("String").Call(g.Lit(flag)))),
@@ -944,6 +944,10 @@ func (svc *Manifest) genCliUnmarshalMessage(f *g.File, msg *protogen.Message) {
 							b.Id("result").Dot(oneof.GoName).Op("=").Op("&").Qual(string(field.GoIdent.GoImportPath), field.GoIdent.GoName).Values(g.Id(goName).Op(":").Id("cmd").Dot("String").Call(g.Lit(flag)))
 							return
 						}
+						if field.Desc.IsList() {
+							b.Id("result").Dot(goName).Op("=").Id("cmd").Dot("StringSlice").Call(g.Lit(flag))
+							return
+						}
 						b.Id("result").Dot(goName).Op("=").Id("cmd").Dot("String").Call(g.Lit(flag))
 					}
 				})

diff --git a/internal/plugin/plugin.go b/internal/plugin/plugin.go
@@ -2,7 +2,6 @@ package plugin
 
 import (
 	"fmt"
-	"io"
 	"runtime"
 	"strings"
 
@@ -37,7 +36,6 @@ type Plugin struct {
 	Version string
 	cfg     *Config
 	flags   *pflag.FlagSet
-	stderr  io.WriteCloser
 }
 
 func New(commit, version string) *Plugin {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
		### Fixed

		- [#80](https://github.com/cludden/protoc-gen-go-temporal/pull/80) fix cross-package signal-with-start
		- [#84](https://github.com/cludden/protoc-gen-go-temporal/pull/84) q



Expand Down