go-kit · Nov 11, 2023 · Nov 11, 2023 · Nov 11, 2023 · Nov 11, 2023 · Nov 11, 2023
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,17 +1,17 @@
 blank_issues_enabled: false
 contact_links:
   - name: Ask a question
-    url: https://github.com/go-kit/kit/discussions/new?category=q-a
+    url: https://github.com/openmesh/kit/discussions/new?category=q-a
     about: Questions and discussions with the Go kit community
 
   - name: Website
     url: https://gokit.io/
     about: Project overview, examples, frequently asked questions, etc.
 
   - name: Reference
-    url: https://pkg.go.dev/github.com/go-kit/kit
+    url: https://pkg.go.dev/github.com/openmesh/kit
     about: Go kit package documentation
 
   - name: Slack channel
-    url: https://gophers.slack.com/messages/go-kit
+    url: https://gophers.slack.com/messages/openmesh
     about: Real-time discussions and Q&A
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,8 +61,8 @@ jobs:
           EUREKA_ADDR: http://localhost:${{ job.services.eureka.ports[8761] }}/eureka
         run: go test -v -race -coverprofile=coverage.coverprofile -covermode=atomic -tags integration ./...
 
-      - name: Upload coverage
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          file: coverage.coverprofile
+      # - name: Upload coverage
+      #   uses: codecov/codecov-action@v1
+      #   with:
+      #     token: ${{ secrets.CODECOV_TOKEN }}
+      #     file: coverage.coverprofile
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -11,8 +11,7 @@ Before submitting major changes, here are a few guidelines to follow:
 1. After receiving feedback, [squash your commits][squash] and add a [great commit message][message].
 1. Have fun!
 
-[issues]: https://github.com/go-kit/kit/issues
-[prs]: https://github.com/go-kit/kit/pulls
+[issues]: https://github.com/openmesh/kit/issues
+[prs]: https://github.com/openmesh/kit/pulls
 [squash]: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
 [message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-
diff --git a/README.md b/README.md
@@ -1,19 +1,19 @@
 # Go kit
 
-![GitHub Workflow Status](https://github.com/go-kit/kit/workflows/CI/badge.svg)
-[![GoDev](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/go-kit/kit?tab=doc)
-[![codecov](https://codecov.io/gh/go-kit/kit/branch/master/graph/badge.svg)](https://codecov.io/gh/go-kit/kit)
-[![Go Report Card](https://goreportcard.com/badge/go-kit/kit)](https://goreportcard.com/report/go-kit/kit)
-[![Sourcegraph](https://sourcegraph.com/github.com/go-kit/kit/-/badge.svg)](https://sourcegraph.com/github.com/go-kit/kit?badge)
+![GitHub Workflow Status](https://github.com/openmesh/kit/workflows/CI/badge.svg)
+[![GoDev](https://img.shields.io/badge/go.dev-reference-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/openmesh/kit?tab=doc)
+[![codecov](https://codecov.io/gh/openmesh/kit/branch/master/graph/badge.svg)](https://codecov.io/gh/openmesh/kit)
+[![Go Report Card](https://goreportcard.com/badge/openmesh/kit)](https://goreportcard.com/report/openmesh/kit)
+[![Sourcegraph](https://sourcegraph.com/github.com/openmesh/kit/-/badge.svg)](https://sourcegraph.com/github.com/openmesh/kit?badge)
 
 **Go kit** is a **programming toolkit** for building microservices
 (or elegant monoliths) in Go. We solve common problems in distributed
 systems and application architecture so you can focus on delivering
 business value.
 
 - Website: [gokit.io](https://gokit.io)
-- Mailing list: [go-kit](https://groups.google.com/forum/#!forum/go-kit)
-- Slack: [gophers.slack.com](https://gophers.slack.com) **#go-kit** ([invite](https://gophersinvite.herokuapp.com/))
+- Mailing list: [openmesh](https://groups.google.com/forum/#!forum/openmesh)
+- Slack: [gophers.slack.com](https://gophers.slack.com) **#openmesh** ([invite](https://gophersinvite.herokuapp.com/))
 
 ## Sponsors
 
@@ -34,15 +34,15 @@ comprehensive, robust, and trustable way of building microservices for
 organizations of any size.
 
 For more details, see
- [the website](https://gokit.io),
- [the motivating blog post](http://peter.bourgon.org/go-kit/) and
- [the video of the talk](https://www.youtube.com/watch?v=iFR_7AKkJFU).
+[the website](https://gokit.io),
+[the motivating blog post](http://peter.bourgon.org/openmesh/) and
+[the video of the talk](https://www.youtube.com/watch?v=iFR_7AKkJFU).
 See also the
- [Go kit talk at GopherCon 2015](https://www.youtube.com/watch?v=1AjaZi4QuGo).
+[Go kit talk at GopherCon 2015](https://www.youtube.com/watch?v=1AjaZi4QuGo).
 
 ## Goals
 
-- Operate in a heterogeneous SOA — expect to interact with mostly non-Go-kit services
+- Operate in a heterogeneous SOA — expect to interact with mostly non-openmesh services
 - RPC as the primary messaging pattern
 - Pluggable serialization and transport — not just JSON over HTTP
 - Operate within existing infrastructures — no mandates for specific tools or technologies
@@ -56,7 +56,7 @@ See also the
 ## Contributing
 
 Please see [CONTRIBUTING.md](/CONTRIBUTING.md).
-Thank you, [contributors](https://github.com/go-kit/kit/graphs/contributors)!
+Thank you, [contributors](https://github.com/openmesh/kit/graphs/contributors)!
 
 ## Dependency management
 
@@ -74,7 +74,7 @@ different starting assumptions.
 - [kujtimiihoxha/kit](https://github.com/kujtimiihoxha/kit) (unmaintained)
 - [nytimes/marvin](https://github.com/nytimes/marvin)
 - [sagikazarmark/mga](https://github.com/sagikazarmark/mga)
-- [sagikazarmark/protoc-gen-go-kit](https://github.com/sagikazarmark/protoc-gen-go-kit)
+- [sagikazarmark/protoc-gen-openmesh](https://github.com/sagikazarmark/protoc-gen-openmesh)
 - [metaverse/truss](https://github.com/metaverse/truss)
 
 ## Related projects
@@ -117,7 +117,7 @@ Projects with a ★ have had particular influence on Go kit's design (or vice-ve
 - [Goji](https://github.com/zenazn/goji)
 - [Martini](https://github.com/go-martini/martini)
 - [Beego](https://beego.vip/)
-- [Revel](https://revel.github.io/) (considered [harmful](https://github.com/go-kit/kit/issues/350))
+- [Revel](https://revel.github.io/) (considered [harmful](https://github.com/openmesh/kit/issues/350))
 - [GoBuffalo](https://gobuffalo.io/)
 
 ## Additional reading

diff --git a/auth/basic/README.md b/auth/basic/README.md
@@ -7,7 +7,7 @@ More details about this type of authentication can be found in [Mozilla article]
 ## Usage
 
 ```go
-import httptransport "github.com/go-kit/kit/transport/http"
+import httptransport "github.com/openmesh/kit/transport/http"
 
 httptransport.NewServer(
 		AuthMiddleware(cfg.auth.user, cfg.auth.password, "Example Realm")(makeUppercaseEndpoint()),
@@ -17,4 +17,4 @@ httptransport.NewServer(
 	)
 ```
 
-For AuthMiddleware to be able to pick up the Authentication header from an HTTP request we need to pass it through the context with something like ```httptransport.ServerBefore(httptransport.PopulateRequestContext)```.
+For AuthMiddleware to be able to pick up the Authentication header from an HTTP request we need to pass it through the context with something like `httptransport.ServerBefore(httptransport.PopulateRequestContext)`.
diff --git a/auth/basic/middleware.go b/auth/basic/middleware.go
@@ -10,16 +10,16 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/go-kit/kit/endpoint"
-	httptransport "github.com/go-kit/kit/transport/http"
+	"github.com/openmesh/kit/endpoint"
+	httptransport "github.com/openmesh/kit/transport/http"
 )
 
 // AuthError represents an authorization error.
 type AuthError struct {
 	Realm string
 }
 
-// StatusCode is an implementation of the StatusCoder interface in go-kit/http.
+// StatusCode is an implementation of the StatusCoder interface in openmeshsh/http.
 func (AuthError) StatusCode() int {
 	return http.StatusUnauthorized
 }
@@ -29,7 +29,7 @@ func (AuthError) Error() string {
 	return http.StatusText(http.StatusUnauthorized)
 }
 
-// Headers is an implementation of the Headerer interface in go-kit/http.
+// Headers is an implementation of the Headerer interface in openmesh/http.
 func (e AuthError) Headers() http.Header {
 	return http.Header{
 		"Content-Type":           []string{"text/plain; charset=utf-8"},
@@ -64,28 +64,28 @@ func toHashSlice(s []byte) []byte {
 }
 
 // AuthMiddleware returns a Basic Authentication middleware for a particular user and password.
-func AuthMiddleware(requiredUser, requiredPassword, realm string) endpoint.Middleware {
+func AuthMiddleware[Request, Response any](requiredUser, requiredPassword, realm string) endpoint.Middleware[Request, Response] {
 	requiredUserBytes := toHashSlice([]byte(requiredUser))
 	requiredPasswordBytes := toHashSlice([]byte(requiredPassword))
 
-	return func(next endpoint.Endpoint) endpoint.Endpoint {
-		return func(ctx context.Context, request interface{}) (interface{}, error) {
+	return func(next endpoint.Endpoint[Request, Response]) endpoint.Endpoint[Request, Response] {
+		return func(ctx context.Context, request Request) (Response, error) {
 			auth, ok := ctx.Value(httptransport.ContextKeyRequestAuthorization).(string)
 			if !ok {
-				return nil, AuthError{realm}
+				return *new(Response), AuthError{realm}
 			}
 
 			givenUser, givenPassword, ok := parseBasicAuth(auth)
 			if !ok {
-				return nil, AuthError{realm}
+				return *new(Response), AuthError{realm}
 			}
 
 			givenUserBytes := toHashSlice(givenUser)
 			givenPasswordBytes := toHashSlice(givenPassword)
 
 			if subtle.ConstantTimeCompare(givenUserBytes, requiredUserBytes) == 0 ||
 				subtle.ConstantTimeCompare(givenPasswordBytes, requiredPasswordBytes) == 0 {
-				return nil, AuthError{realm}
+				return *new(Response), AuthError{realm}
 			}
 
 			return next(ctx, request)

diff --git a/auth/basic/middleware_test.go b/auth/basic/middleware_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	httptransport "github.com/go-kit/kit/transport/http"
+	httptransport "github.com/openmesh/kit/transport/http"
 )
 
 func TestWithBasicAuth(t *testing.T) {
@@ -34,7 +34,7 @@ func TestWithBasicAuth(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			ctx := context.WithValue(context.TODO(), httptransport.ContextKeyRequestAuthorization, tt.authHeader)
 
-			result, err := AuthMiddleware(requiredUser, requiredPassword, realm)(passedValidation)(ctx, nil)
+			result, err := AuthMiddleware[interface{}, interface{}](requiredUser, requiredPassword, realm)(passedValidation)(ctx, nil)
 			if result != tt.want.result || err != tt.want.err {
 				t.Errorf("WithBasicAuth() = result: %v, err: %v, want result: %v, want error: %v", result, err, tt.want.result, tt.want.err)
 			}

diff --git a/auth/casbin/middleware.go b/auth/casbin/middleware.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	stdcasbin "github.com/casbin/casbin/v2"
-	"github.com/go-kit/kit/endpoint"
+	"github.com/openmesh/kit/endpoint"
 )
 
 type contextKey string
@@ -44,25 +44,25 @@ var (
 // action on the given object. If a valid access control model and policy
 // is given, then the generated casbin Enforcer is stored in the context
 // with CasbinEnforcer as the key.
-func NewEnforcer(
+func NewEnforcer[Request, Response any](
 	subject string, object interface{}, action string,
-) endpoint.Middleware {
-	return func(next endpoint.Endpoint) endpoint.Endpoint {
-		return func(ctx context.Context, request interface{}) (response interface{}, err error) {
+) endpoint.Middleware[Request, Response] {
+	return func(next endpoint.Endpoint[Request, Response]) endpoint.Endpoint[Request, Response] {
+		return func(ctx context.Context, request Request) (response Response, err error) {
 			casbinModel := ctx.Value(CasbinModelContextKey)
 			casbinPolicy := ctx.Value(CasbinPolicyContextKey)
 			enforcer, err := stdcasbin.NewEnforcer(casbinModel, casbinPolicy)
 			if err != nil {
-				return nil, err
+				return *new(Response), err
 			}
 
 			ctx = context.WithValue(ctx, CasbinEnforcerContextKey, enforcer)
 			ok, err := enforcer.Enforce(subject, object, action)
 			if err != nil {
-				return nil, err
+				return *new(Response), err
 			}
 			if !ok {
-				return nil, ErrUnauthorized
+				return *new(Response), ErrUnauthorized
 			}
 
 			return next(ctx, request)

diff --git a/auth/casbin/middleware_test.go b/auth/casbin/middleware_test.go
@@ -24,7 +24,7 @@ func TestStructBaseContext(t *testing.T) {
 	ctx = context.WithValue(ctx, CasbinPolicyContextKey, a)
 
 	// positive case
-	middleware := NewEnforcer("alice", "/alice_data/resource1", "GET")(e)
+	middleware := NewEnforcer[interface{}, interface{}]("alice", "/alice_data/resource1", "GET")(e)
 	ctx1, err := middleware(ctx, struct{}{})
 	if err != nil {
 		t.Fatalf("Enforcer returned error: %s", err)
@@ -35,7 +35,7 @@ func TestStructBaseContext(t *testing.T) {
 	}
 
 	// negative case
-	middleware = NewEnforcer("alice", "/alice_data/resource2", "POST")(e)
+	middleware = NewEnforcer[interface{}, interface{}]("alice", "/alice_data/resource2", "POST")(e)
 	_, err = middleware(ctx, struct{}{})
 	if err == nil {
 		t.Fatalf("Enforcer should return error")
@@ -48,7 +48,7 @@ func TestFileBaseContext(t *testing.T) {
 	ctx = context.WithValue(ctx, CasbinPolicyContextKey, "testdata/basic_policy.csv")
 
 	// positive case
-	middleware := NewEnforcer("alice", "data1", "read")(e)
+	middleware := NewEnforcer[interface{}, interface{}]("alice", "data1", "read")(e)
 	_, err := middleware(ctx, struct{}{})
 	if err != nil {
 		t.Fatalf("Enforcer returned error: %s", err)

diff --git a/auth/jwt/README.md b/auth/jwt/README.md
@@ -14,8 +14,8 @@ will be added to the context via the `jwt.JWTClaimsContextKey`.
 import (
 	stdjwt "github.com/golang-jwt/jwt/v4"
 
-	"github.com/go-kit/kit/auth/jwt"
-	"github.com/go-kit/kit/endpoint"
+	"github.com/openmesh/kit/auth/jwt"
+	"github.com/openmesh/kit/endpoint"
 )
 
 func main() {
@@ -36,8 +36,8 @@ the token string and add it to the context via the `jwt.JWTContextKey`.
 import (
 	stdjwt "github.com/golang-jwt/jwt/v4"
 
-	"github.com/go-kit/kit/auth/jwt"
-	"github.com/go-kit/kit/endpoint"
+	"github.com/openmesh/kit/auth/jwt"
+	"github.com/openmesh/kit/endpoint"
 )
 
 func main() {
@@ -67,9 +67,9 @@ Example of use in a client:
 import (
 	stdjwt "github.com/golang-jwt/jwt/v4"
 
-	grpctransport "github.com/go-kit/kit/transport/grpc"
-	"github.com/go-kit/kit/auth/jwt"
-	"github.com/go-kit/kit/endpoint"
+	grpctransport "github.com/openmesh/kit/transport/grpc"
+	"github.com/openmesh/kit/auth/jwt"
+	"github.com/openmesh/kit/endpoint"
 )
 
 func main() {
@@ -94,9 +94,9 @@ Example of use in a server:
 import (
 	"context"
 
-	"github.com/go-kit/kit/auth/jwt"
+	"github.com/openmesh/kit/auth/jwt"
 	"github.com/go-kit/log"
-	grpctransport "github.com/go-kit/kit/transport/grpc"
+	grpctransport "github.com/openmesh/kit/transport/grpc"
 )
 
 func MakeGRPCServer(ctx context.Context, endpoints Endpoints, logger log.Logger) pb.ExampleServer {