prepare_v4 (#199)

move to v4 micro Co-authored-by: Vasiliy Tolstov <v.tolstov@unistack.org> Reviewed-on: #199 Co-authored-by: Evstigneev Denis <danteevstigneev@yandex.ru> Co-committed-by: Evstigneev Denis <danteevstigneev@yandex.ru>
2025-03-02 12:33:55 +03:00
parent 707476bbd4
commit 76bf0520c0
22 changed files with 225 additions and 537 deletions
--- a/handler/generate.go
+++ b/handler/generate.go
@@ -2,11 +2,11 @@ package handler

 import (
 	// import required packages
-	_ "go.unistack.org/micro-proto/v3/openapiv3"
+	_ "go.unistack.org/micro-proto/v4/openapiv3"
 )

 //go:generate sh -c "curl -L https://github.com/swagger-api/swagger-ui/archive/refs/tags/v4.18.3.zip -o - | bsdtar -C swagger-ui --strip-components=2 -xv swagger-ui-4.18.3/dist && rm swagger-ui/*.map swagger-ui/*-es-*.js swagger-ui/swagger-ui.js swagger-ui/swagger-initializer.js"

-//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./meter/meter.proto"
+//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v4) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./meter/meter.proto"

-//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./health/health.proto"
+//go:generate sh -c "protoc -I./ -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v4) --go-micro_out='components=micro|http|server',standalone=false,debug=true,paths=source_relative:./ ./health/health.proto"
--- a/handler/graphql/graphql.go
+++ b/handler/graphql/graphql.go
@@ -7,8 +7,8 @@ import (
 	"fmt"

 	"github.com/99designs/gqlgen/graphql"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/store"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/store"
 )

 var _ graphql.Cache = (*cacheWrapper)(nil)
--- a/handler/health/health.go
+++ b/handler/health/health.go
@@ -3,8 +3,8 @@ package health_handler
 import (
 	"context"

-	codecpb "go.unistack.org/micro-proto/v3/codec"
-	"go.unistack.org/micro/v3/errors"
+	codecpb "go.unistack.org/micro-proto/v4/codec"
+	"go.unistack.org/micro/v4/errors"
 )

 var _ HealthServiceServer = &Handler{}
--- a/handler/health/health.proto
+++ b/handler/health/health.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";

-package micro.server.http.v3.handler.health;
-option go_package = "go.unistack.org/micro-server-http/v3/handler/health;health_handler";
+package micro.server.http.v4.handler.health;
+option go_package = "go.unistack.org/micro-server-http/v4/handler/health;health_handler";

 import "api/annotations.proto";
 import "openapiv3/annotations.proto";
--- a/handler/health/health_micro.pb.go
+++ b/handler/health/health_micro.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.10.4
-// - protoc              v5.28.3
+// - protoc-gen-go-micro v4.1.0
+// - protoc              v5.29.3
 // source: health/health.proto

 package health_handler

 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v3/codec"
-	client "go.unistack.org/micro/v3/client"
+	codec "go.unistack.org/micro-proto/v4/codec"
+	client "go.unistack.org/micro/v4/client"
 )

 var (
--- a/handler/health/health_micro_http.pb.go
+++ b/handler/health/health_micro_http.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.4
+// protoc-gen-go-micro version: v4.1.0
 // source: health/health.proto

 package health_handler

 import (
 	context "context"
-	v31 "go.unistack.org/micro-client-http/v3"
-	codec "go.unistack.org/micro-proto/v3/codec"
-	v3 "go.unistack.org/micro-server-http/v3"
-	client "go.unistack.org/micro/v3/client"
-	server "go.unistack.org/micro/v3/server"
+	v41 "go.unistack.org/micro-client-http/v4"
+	codec "go.unistack.org/micro-proto/v4/codec"
+	v4 "go.unistack.org/micro-server-http/v4"
+	client "go.unistack.org/micro/v4/client"
+	server "go.unistack.org/micro/v4/server"
 	http "net/http"
 )

 var (
-	HealthServiceServerEndpoints = []v3.EndpointMetadata{
+	HealthServiceServerEndpoints = []v4.EndpointMetadata{
 		{
 			Name:   "HealthService.Healthy",
 			Path:   "/health",
@@ -81,11 +81,11 @@ func (c *healthServiceClient) Healthy(ctx context.Context, req *codec.Frame, opt
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &codec.Frame{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodGet),
-		v31.Path("/health"),
+		v41.Method(http.MethodGet),
+		v41.Path("/health"),
 	)
 	rsp := &codec.Frame{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Healthy", req), rsp, opts...)
@@ -99,11 +99,11 @@ func (c *healthServiceClient) Live(ctx context.Context, req *codec.Frame, opts .
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &codec.Frame{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodGet),
-		v31.Path("/live"),
+		v41.Method(http.MethodGet),
+		v41.Path("/live"),
 	)
 	rsp := &codec.Frame{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Live", req), rsp, opts...)
@@ -117,11 +117,11 @@ func (c *healthServiceClient) Ready(ctx context.Context, req *codec.Frame, opts
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &codec.Frame{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodGet),
-		v31.Path("/ready"),
+		v41.Method(http.MethodGet),
+		v41.Path("/ready"),
 	)
 	rsp := &codec.Frame{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Ready", req), rsp, opts...)
@@ -135,11 +135,11 @@ func (c *healthServiceClient) Version(ctx context.Context, req *codec.Frame, opt
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &codec.Frame{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodGet),
-		v31.Path("/version"),
+		v41.Method(http.MethodGet),
+		v41.Path("/version"),
 	)
 	rsp := &codec.Frame{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "HealthService.Version", req), rsp, opts...)
@@ -180,7 +180,6 @@ func RegisterHealthServiceServer(s server.Server, sh HealthServiceServer, opts .
 		healthService
 	}
 	h := &healthServiceServer{sh}
-	var nopts []server.HandlerOption
-	nopts = append(nopts, v3.HandlerEndpoints(HealthServiceServerEndpoints))
-	return s.Handle(s.NewHandler(&HealthService{h}, append(nopts, opts...)...))
+	opts = append(opts, v4.HandlerEndpoints(HealthServiceServerEndpoints))
+	return s.Handle(s.NewHandler(&HealthService{h}, opts...))
 }
--- a/handler/meter/meter.go
+++ b/handler/meter/meter.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"sync"

-	codecpb "go.unistack.org/micro-proto/v3/codec"
-	"go.unistack.org/micro/v3/logger"
-	"go.unistack.org/micro/v3/metadata"
-	"go.unistack.org/micro/v3/meter"
+	codecpb "go.unistack.org/micro-proto/v4/codec"
+	"go.unistack.org/micro/v4/logger"
+	"go.unistack.org/micro/v4/metadata"
+	"go.unistack.org/micro/v4/meter"
 )

 const (
@@ -125,8 +125,11 @@ func gzipAccepted(md metadata.Metadata) bool {
 	if !ok {
 		return false
 	}
-	if strings.Contains(a, "gzip") {
-		return true
+	for i := range a {
+		if strings.Contains(a[i], "gzip") {
+			return true
+		}
 	}
+
 	return false
 }
--- a/handler/meter/meter.proto
+++ b/handler/meter/meter.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";

 package micro.server.http.v3.handler.meter;
-option go_package = "go.unistack.org/micro-server-http/v3/handler/meter;meter_handler";
+option go_package = "go.unistack.org/micro-server-http/v4/handler/meter;meter_handler";

 import "api/annotations.proto";
 import "openapiv3/annotations.proto";
--- a/handler/meter/meter_micro.pb.go
+++ b/handler/meter/meter_micro.pb.go
@@ -1,15 +1,15 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-micro v3.10.4
-// - protoc              v5.28.3
+// - protoc-gen-go-micro v4.1.0
+// - protoc              v5.29.3
 // source: meter/meter.proto

 package meter_handler

 import (
 	context "context"
-	codec "go.unistack.org/micro-proto/v3/codec"
-	client "go.unistack.org/micro/v3/client"
+	codec "go.unistack.org/micro-proto/v4/codec"
+	client "go.unistack.org/micro/v4/client"
 )

 var (
--- a/handler/meter/meter_micro_http.pb.go
+++ b/handler/meter/meter_micro_http.pb.go
@@ -1,21 +1,21 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.10.4
+// protoc-gen-go-micro version: v4.1.0
 // source: meter/meter.proto

 package meter_handler

 import (
 	context "context"
-	v31 "go.unistack.org/micro-client-http/v3"
-	codec "go.unistack.org/micro-proto/v3/codec"
-	v3 "go.unistack.org/micro-server-http/v3"
-	client "go.unistack.org/micro/v3/client"
-	server "go.unistack.org/micro/v3/server"
+	v41 "go.unistack.org/micro-client-http/v4"
+	codec "go.unistack.org/micro-proto/v4/codec"
+	v4 "go.unistack.org/micro-server-http/v4"
+	client "go.unistack.org/micro/v4/client"
+	server "go.unistack.org/micro/v4/server"
 	http "net/http"
 )

 var (
-	MeterServiceServerEndpoints = []v3.EndpointMetadata{
+	MeterServiceServerEndpoints = []v4.EndpointMetadata{
 		{
 			Name:   "MeterService.Metrics",
 			Path:   "/metrics",
@@ -39,11 +39,11 @@ func (c *meterServiceClient) Metrics(ctx context.Context, req *codec.Frame, opts
 	errmap := make(map[string]interface{}, 1)
 	errmap["default"] = &codec.Frame{}
 	opts = append(opts,
-		v31.ErrorMap(errmap),
+		v41.ErrorMap(errmap),
 	)
 	opts = append(opts,
-		v31.Method(http.MethodGet),
-		v31.Path("/metrics"),
+		v41.Method(http.MethodGet),
+		v41.Path("/metrics"),
 	)
 	rsp := &codec.Frame{}
 	err := c.c.Call(ctx, c.c.NewRequest(c.name, "MeterService.Metrics", req), rsp, opts...)
@@ -69,7 +69,6 @@ func RegisterMeterServiceServer(s server.Server, sh MeterServiceServer, opts ...
 		meterService
 	}
 	h := &meterServiceServer{sh}
-	var nopts []server.HandlerOption
-	nopts = append(nopts, v3.HandlerEndpoints(MeterServiceServerEndpoints))
-	return s.Handle(s.NewHandler(&MeterService{h}, append(nopts, opts...)...))
+	opts = append(opts, v4.HandlerEndpoints(MeterServiceServerEndpoints))
+	return s.Handle(s.NewHandler(&MeterService{h}, opts...))
 }
--- a/handler/swagger/swagger.go
+++ b/handler/swagger/swagger.go
@@ -4,8 +4,8 @@ import (
 	"io/fs"
 	"net/http"

-	yamlcodec "go.unistack.org/micro-codec-yaml/v3"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	yamlcodec "go.unistack.org/micro-codec-yaml/v4"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )

 // Handler append to generated swagger data from dst map[string]interface{}