chore(all): Move from types.* to cli.ServiceContext, refs go-orb/go-orb#33

Author: jochumdev

Taskfile.yml

@@ -1,6 +1,20 @@
 version: "3"
 
 tasks:
+  local-lint:
+    desc: Run "golangci-lint" in all packages with the go.work
+    cmds:
+      - |
+        for i in $(find . -name 'go.mod'); do
+          if [[ "$i" == "./.github/go.mod" ]]; then
+            continue
+          fi
+          pushd ${i:0:-6} 1>/dev/null
+          echo $i
+          golangci-lint run || true
+          popd 1>/dev/null
+        done
+
   lint:
     desc: Run "golangci-lint" in all packages
     cmds:

benchmarks/event/cmd/handler/wire.go

@@ -73,8 +73,8 @@ func run(
 		cli.ProvideSingleServiceContext,
 		types.ProvideComponents,
 
-		cli.ProvideConfigData,
-		cli.ProvideServiceName,
+		cli.ProvideAppConfigData,
+		cli.ProvideServiceConfigData,
 
 		log.ProvideNoOpts,
 

benchmarks/event/cmd/handler/wire_gen.go

@@ -17,7 +17,6 @@ import (
 	"github.com/go-orb/go-orb/config"
 	"github.com/go-orb/go-orb/event"
 	"github.com/go-orb/go-orb/log"
-	"github.com/go-orb/go-orb/types"
 	_ "github.com/go-orb/plugins/codecs/goccyjson"
 	_ "github.com/go-orb/plugins/codecs/proto"
 	_ "github.com/go-orb/plugins/event/natsjs"
@@ -96,9 +95,7 @@ func connection(
 //
 //nolint:funlen
 func bench(
-	ctx context.Context,
-	sn types.ServiceName,
-	configs types.ConfigData,
+	svcCtx *cli.ServiceContext,
 	logger log.Logger,
 	eventHandler event.Type,
 ) error {
@@ -110,8 +107,7 @@ func bench(
 		PackageSize: defaultPackageSize,
 	}
 
-	sections := append(types.SplitServiceName(sn), configSection)
-	if err := config.Parse(sections, configs, &cfg); err != nil {
+	if err := config.Parse(nil, event.DefaultConfigSection, svcCtx.Config, &cfg); err != nil {
 		return err
 	}
 
@@ -126,7 +122,7 @@ func bench(
 
 	runtime.GOMAXPROCS(cfg.Threads)
 
-	wCtx, wCancel := context.WithCancel(ctx)
+	wCtx, wCancel := context.WithCancel(svcCtx.Context())
 
 	// Create random bytes to ping-pong on each request.
 	msg := make([]byte, cfg.PackageSize)
@@ -169,7 +165,7 @@ func bench(
 	//
 	logger.Info("Now running the benchmark")
 
-	ctx, cancel := context.WithCancel(ctx)
+	ctx, cancel := context.WithCancel(svcCtx.Context())
 
 	// Timer to end requests
 	time.AfterFunc(time.Second*time.Duration(cfg.Duration), func() {

benchmarks/event/cmd/request/main.go

@@ -22,16 +22,13 @@ type wireRunResult struct{}
 
 // wireRunCallback is the actual code that runs the business logic.
 type wireRunCallback func(
-	ctx context.Context,
-	serviceName types.ServiceName,
-	configs types.ConfigData,
+	svcCtx *cli.ServiceContext,
 	logger log.Logger,
 	eventHandler event.Type,
 ) error
 
 func wireRun(
-	serviceName types.ServiceName,
-	configs types.ConfigData,
+	serviceContext *cli.ServiceContext,
 	components *types.Components,
 	logger log.Logger,
 	event event.Type,
@@ -49,9 +46,8 @@ func wireRun(
 		}
 	}
 
-	//
 	// Actual code
-	runErr := cb(ctx, serviceName, configs, logger, event)
+	runErr := cb(serviceContext, logger, event)
 
 	// Orb shutdown.
 	ctx = context.Background()
@@ -78,8 +74,8 @@ func run(
 		cli.ProvideSingleServiceContext,
 		types.ProvideComponents,
 
-		cli.ProvideConfigData,
-		cli.ProvideServiceName,
+		cli.ProvideAppConfigData,
+		cli.ProvideServiceConfigData,
 
 		log.ProvideNoOpts,
 

benchmarks/event/cmd/request/wire.go

@@ -67,7 +67,7 @@ func wireRun(
 	return wireRunResult{}, runErr
 }
 
-func provideClientConfig(serviceName types.ServiceName, configs types.ConfigData) (*clientConfig, error) {
+func provideClientConfig(svcCtx *cli.ServiceContext) (*clientConfig, error) {
 	cfg := &clientConfig{
 		BypassRegistry: defaultBypassRegistry,
 		PoolSize:       defaultPoolSize,
@@ -80,7 +80,7 @@ func provideClientConfig(serviceName types.ServiceName, configs types.ConfigData
 		ContentType:    defaultContentType,
 	}
 
-	if err := config.Parse([]string{configSection}, configs, &cfg); err != nil {
+	if err := config.Parse(nil, configSection, svcCtx.Config, &cfg); err != nil {
 		return nil, err
 	}
 
@@ -103,9 +103,8 @@ func run(
 		cli.ProvideSingleServiceContext,
 		types.ProvideComponents,
 
-		cli.ProvideConfigData,
-		cli.ProvideServiceName,
-		cli.ProvideServiceVersion,
+		cli.ProvideAppConfigData,
+		cli.ProvideServiceConfigData,
 
 		log.ProvideNoOpts,
 

benchmarks/event/cmd/request/wire_gen.go

@@ -126,9 +126,8 @@ func run(
 		cli.ProvideSingleServiceContext,
 		types.ProvideComponents,
 
-		cli.ProvideConfigData,
-		cli.ProvideServiceName,
-		cli.ProvideServiceVersion,
+		cli.ProvideAppConfigData,
+		cli.ProvideServiceConfigData,
 
 		log.ProvideNoOpts,
 		registry.ProvideNoOpts,