feat: allow libraries to generate gRPC clients (#470)

getoutreach · Apr 2, 2024 · d5d5425 · d5d5425
1 parent 50ade01
commit d5d5425
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/...tool-versions-ruby-.tool-versions.tpl-testdata-tool-versions-ruby-.tool-versions.snapshot b/...tool-versions-ruby-.tool-versions.tpl-testdata-tool-versions-ruby-.tool-versions.snapshot
@@ -0,0 +1,2 @@
+(*codegen.File)(
+)
diff --git a/...ool-versions-ruby-.tool-versions.snapshot → ...ool-versions-ruby-.tool-versions.snapshot b/...ool-versions-ruby-.tool-versions.snapshot → ...ool-versions-ruby-.tool-versions.snapshot
diff --git a/...ool-versions-ruby-.tool-versions.snapshot → ...ool-versions-ruby-.tool-versions.snapshot b/...ool-versions-ruby-.tool-versions.snapshot → ...ool-versions-ruby-.tool-versions.snapshot
@@ -8,4 +8,6 @@
 # Used in CI
 - name: protoc
   version: 21.5
+- name: ruby
+  version: 3.1.3
 )
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -54,14 +54,14 @@
 {{- .Config.Name | replace "_" "-" | title | replace "-" "" -}}
 {{- end }}
 
-# Skips the current file if a node client shouldn't be generated
+# Skips the current file if a Node.js gRPC client shouldn't be generated
 # {{- $_ := stencil.ApplyTemplate "skipGrpcClient" "node" -}}
 {{- define "skipGrpcClient" }}
 {{- $grpcClient := . }}
 {{- $serviceActivities := (stencil.Arg "serviceActivities") }}
 {{- $grpcClients := (stencil.Arg "grpcClients") }}
-{{- if not (and (has "grpc" $serviceActivities) (has $grpcClient $grpcClients)) }}
-  {{ file.Skip (printf "Not a gRPC service, or %s client not specified in grpcClients" $grpcClient) }}
+{{- if not (and (or (not (stencil.Arg "service")) (has "grpc" $serviceActivities)) (has $grpcClient $grpcClients)) }}
+  {{ $_ := file.Skip (printf "Not a gRPC service/library, or %s client not specified in grpcClients" $grpcClient) }}
 {{- end }}
 {{- end }}
 

diff --git a/templates/main_test.go b/templates/main_test.go
@@ -233,15 +233,26 @@ func TestGRPCServerRPC(t *testing.T) {
 	st.Run(true)
 }
 
-func TestIncludeRubyToolVersionsIfRubyGRPCCLient(t *testing.T) {
+func TestIncludeRubyToolVersionsIfRubyGRPCClient(t *testing.T) {
 	st := stenciltest.New(t, "testdata/tool-versions-ruby/.tool-versions.tpl", libraryTmpls...)
 	st.Args(map[string]interface{}{
 		"grpcClients": []interface{}{"ruby"},
 	})
 	st.Run(stenciltest.RegenerateSnapshots())
 }
 
-func TestDontIncludeRubyToolVersionsIfNotRubyGRPCCLient(t *testing.T) {
+func TestIncludeRubyToolVersionsIfRubyGRPCClientLibrary(t *testing.T) {
+	// Need to use testdata because stenciltest cannot test file.Skip
+	st := stenciltest.New(t, "testdata/tool-versions-ruby/.tool-versions.tpl", libraryTmpls...)
+	st.Args(map[string]interface{}{
+		"grpcClients":       []interface{}{"ruby"},
+		"service":           false,
+		"serviceActivities": []interface{}{},
+	})
+	st.Run(stenciltest.RegenerateSnapshots())
+}
+
+func TestDontIncludeRubyToolVersionsIfNotRubyGRPCClient(t *testing.T) {
 	st := stenciltest.New(t, "testdata/tool-versions-ruby/.tool-versions.tpl", libraryTmpls...)
 	st.Args(map[string]interface{}{})
 	st.Run(stenciltest.RegenerateSnapshots())

diff --git a/templates/testdata/tool-versions-ruby/.tool-versions.tpl b/templates/testdata/tool-versions-ruby/.tool-versions.tpl
@@ -1,2 +1,6 @@
 {{- $_ := file.Skip "Test file" }}
+{{- $serviceActivities := (stencil.Arg "serviceActivities") }}
+{{- $grpcClients := (stencil.Arg "grpcClients") }}
+{{- if and (or (not (stencil.Arg "service")) (has "grpc" $serviceActivities)) (has "ruby" $grpcClients) }}
 {{ stencil.ApplyTemplate "toolVersions" }}
+{{- end }}