Add labels

Author: nolag

pkg/capabilities/v2/actions/http/server/client_server_gen.go

@@ -4,6 +4,7 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
+	"text/template"
 
 	"google.golang.org/protobuf/compiler/protogen"
 )
@@ -35,6 +36,8 @@ var serverTemplates = map[ServerLanguage]TemplateGenerator{
 		Name:             "go_server",
 		Template:         goServerTemplate,
 		FileNameTemplate: "server/{{.}}_server_gen.go",
+		LabelMapper:      PbLabelToGoLabels,
+		ExtraFns:         template.FuncMap{"AppendLabels": AppendGoLabelsToVersion},
 	},
 }
 

pkg/capabilities/v2/chain-capabilities/evm/server/client_server_gen.go

@@ -20,6 +20,7 @@ type TemplateGenerator struct {
 	Template         string
 	FileNameTemplate string
 	Partials         map[string]string
+	LabelMapper      func(lbls map[string]*pb.Label) ([]Label, error)
 	ExtraFns         template.FuncMap
 }
 
@@ -198,7 +199,13 @@ func (t *TemplateGenerator) runTemplate(name, tmplText string, args any, partial
 				return line
 			}
 		},
-
+		"Labels": func(s *protogen.Service) ([]Label, error) {
+			md, err := getCapabilityMetadata(s)
+			if err != nil {
+				return nil, err
+			}
+			return t.LabelMapper(md.Labels)
+		},
 		"ConfigType": func(s *protogen.Service) (string, error) {
 			md, err := getCapabilityMetadata(s)
 			if err != nil {

pkg/capabilities/v2/consensus/server/consensus_server_gen.go

@@ -26,26 +26,27 @@ import (
 // Avoid unused imports if there is configuration type
 var _ = emptypb.Empty{}
 
-{{ range .Services}}
+{{- range .Services}}
 {{ $hasTriggers := false }}
 {{ $hasActions := false }}
-{{ $service := . -}}
-{{ if .Comments.Leading.String }}//{{.GoName}}Capability {{CleanComments .Comments.Leading.String}} {{ end }}
-type {{.GoName}}Capability interface { {{- if .Comments.Trailing.String }}//{{.GoName}}Capability {{CleanComments .Comments.Trailing.String}} {{ end }}
+{{ $service := . }}
+{{ $fullCapabilityId := printf "\"%s\"%s" (CapabilityId $service) (AppendLabels (Labels $service)) }}
+type {{.GoName}}Capability interface {
     {{- range .Methods}}
         {{- if isTrigger . }}
             {{ $hasTriggers = true }}
-    {{- if .Comments.Leading.String }}//Register{{.GoName}} registration for {{CleanComments .Comments.Leading.String}} {{ end }}
-    Register{{.GoName}}(ctx context.Context, triggerID string, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}}) (<- chan capabilities.TriggerAndId[*{{ImportAlias .Output.GoIdent.GoImportPath}}.{{.Output.GoIdent.GoName}}], error) {{- if .Comments.Trailing.String }}// {{CleanComments .Comments.Trailing.String}} {{ end }}
-    {{ if .Comments.Leading.String }}//Unregister{{.GoName}} unregistration for {{CleanComments .Comments.Leading.String}} {{ end }}
-    Unregister{{.GoName}}(ctx context.Context, triggerID string, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}}) error {{- if .Comments.Trailing.String }}// {{CleanComments .Comments.Trailing.String}} {{ end }}
+    Register{{.GoName}}(ctx context.Context, triggerID string, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}}) (<- chan capabilities.TriggerAndId[*{{ImportAlias .Output.GoIdent.GoImportPath}}.{{.Output.GoIdent.GoName}}], error)
+    Unregister{{.GoName}}(ctx context.Context, triggerID string, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}}) error
         {{- else }}
             {{ $hasActions = true }}
-    {{- if .Comments.Leading.String }}//{{.GoName}} {{CleanComments .Comments.Leading.String}} {{ end }}
-    {{.GoName}}(ctx context.Context, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}} {{if ne "emptypb.Empty" (ConfigType $service)}}, {{(ConfigType $service)}}{{ end }}) (*{{ImportAlias .Output.GoIdent.GoImportPath}}.{{.Output.GoIdent.GoName}}, error) {{- if .Comments.Trailing.String }}// {{CleanComments .Comments.Trailing.String}} {{ end }}
-        {{ end }}
+    {{.GoName}}(ctx context.Context, metadata capabilities.RequestMetadata, input *{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}} {{if ne "emptypb.Empty" (ConfigType $service)}}, {{(ConfigType $service)}}{{ end }}) (*{{ImportAlias .Output.GoIdent.GoImportPath}}.{{.Output.GoIdent.GoName}}, error)
+        {{- end }}
     {{- end }}
 
+    {{ range Labels . }}
+        {{.Name}}() {{.Type}}
+    {{ end }}
+
     Start(ctx context.Context) error
     Close() error
     HealthReport() map[string]error
@@ -62,50 +63,50 @@ func New{{.GoName}}Server(capability {{.GoName}}Capability) *{{.GoName}}Server {
         stopCh: stopCh,
     }
 }
-{{ if .Comments.Leading.String }}//{{.GoName}}Server {{CleanComments .Comments.Leading.String}} {{ end }}
-type {{.GoName}}Server struct { {{- if .Comments.Trailing.String }}// {{CleanComments .Comments.Trailing.String}} {{ end }}
+
+type {{.GoName}}Server struct {
     {{.GoName|LowerFirst}}Capability
     capabilityRegistry core.CapabilitiesRegistry
     stopCh chan struct{}
 }
 
 
-func (cs *{{.GoName}}Server) Initialise(ctx context.Context, config string, telemetryService core.TelemetryService, store core.KeyValueStore, capabilityRegistry core.CapabilitiesRegistry, errorLog core.ErrorLog, pipelineRunner core.PipelineRunnerService, relayerSet core.RelayerSet, oracleFactory core.OracleFactory, gatewayConnector core.GatewayConnector, p2pKeystore core.Keystore) error {
-    if err := cs.{{.GoName}}Capability.Initialise(ctx, config, telemetryService, store, errorLog, pipelineRunner, relayerSet, oracleFactory, gatewayConnector, p2pKeystore); err != nil {
+func (c *{{.GoName}}Server) Initialise(ctx context.Context, config string, telemetryService core.TelemetryService, store core.KeyValueStore, capabilityRegistry core.CapabilitiesRegistry, errorLog core.ErrorLog, pipelineRunner core.PipelineRunnerService, relayerSet core.RelayerSet, oracleFactory core.OracleFactory, gatewayConnector core.GatewayConnector, p2pKeystore core.Keystore) error {
+    if err := c.{{.GoName}}Capability.Initialise(ctx, config, telemetryService, store, errorLog, pipelineRunner, relayerSet, oracleFactory, gatewayConnector, p2pKeystore); err != nil {
         return fmt.Errorf("error when initializing capability: %w", err)
     }
 
-    cs.capabilityRegistry = capabilityRegistry
+    c.capabilityRegistry = capabilityRegistry
 
 	if err := capabilityRegistry.Add(ctx, &{{.GoName|LowerFirst}}Capability{
-	    {{.GoName}}Capability: cs.{{.GoName}}Capability,
+	    {{.GoName}}Capability: c.{{.GoName}}Capability,
 	}); err != nil {
 		return fmt.Errorf("error when adding kv store action to the registry: %w", err)
 	}
 
 	return nil
 }
 
-func (cs *{{.GoName}}Server) Close() error{
+func (c *{{.GoName}}Server) Close() error{
     ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 
-    if cs.capabilityRegistry != nil {
-        if err := cs.capabilityRegistry.Remove(ctx, "{{(CapabilityId $service)}}"); err != nil {
+    if c.capabilityRegistry != nil {
+        if err := c.capabilityRegistry.Remove(ctx, {{$fullCapabilityId}}); err != nil {
             return err
         }
     }
 
-    if cs.stopCh != nil {
-        close(cs.stopCh)
+    if c.stopCh != nil {
+        close(c.stopCh)
     }
 
-	return cs.{{.GoName|LowerFirst}}Capability.Close()
+	return c.{{.GoName|LowerFirst}}Capability.Close()
 }
 
 
-func (cs *{{.GoName}}Server) Infos(ctx context.Context) ([]capabilities.CapabilityInfo, error) {
-    info, err := cs.{{.GoName|LowerFirst}}Capability.Info(ctx)
+func (c *{{.GoName}}Server) Infos(ctx context.Context) ([]capabilities.CapabilityInfo, error) {
+    info, err := c.{{.GoName|LowerFirst}}Capability.Info(ctx)
     if err != nil {
         return nil, err
     }
@@ -119,7 +120,7 @@ type {{.GoName|LowerFirst}}Capability struct {
 
 func (c *{{.GoName|LowerFirst}}Capability) Info(ctx context.Context) (capabilities.CapabilityInfo, error) {
     // Maybe we do need to split it out, even if the user doesn't see it
-	return capabilities.NewCapabilityInfo("{{(CapabilityId $service)}}", capabilities.CapabilityTypeCombined, c.{{.GoName}}Capability.Description())
+	return capabilities.NewCapabilityInfo({{$fullCapabilityId}}, capabilities.CapabilityTypeCombined, c.{{.GoName}}Capability.Description())
 }
 
 
@@ -134,7 +135,7 @@ func (c *{{.GoName|LowerFirst}}Capability) RegisterTrigger(ctx context.Context,
         {{- if (isTrigger .) }}
             case {{- if (MapToUntypedAPI .) }} "" {{- else}} "{{.GoName}}" {{- end }}:
                 input := &{{ImportAlias .Input.GoIdent.GoImportPath}}.{{.Input.GoIdent.GoName}}{}
-                return capabilities.RegisterTrigger(ctx, c.stopCh, "{{(CapabilityId $service)}}", request, input, c.{{$service.GoName}}Capability.Register{{.GoName}})
+                return capabilities.RegisterTrigger(ctx, c.stopCh, {{$fullCapabilityId}}, request, input, c.{{$service.GoName}}Capability.Register{{.GoName}})
         {{- end }}
         {{- end }}
         	default: