Updated elgohr/Publish-Docker-Github-Action to a supported version (v5)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,9 @@
 ## Pull Request template
 Please, go through these steps before clicking submit on this PR.
 
-1. Make sure this PR targets the `develop` branch. We follow the git-flow branching model.
-2. Give a descriptive title to your PR.
-3. Provide a description of your changes. 
-4. Make sure you have some relevant tests.
-5. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).
+1. Give a descriptive title to your PR.
+2. Provide a description of your changes.
+3. Make sure you have some relevant tests.
+4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).
 
 **PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**

.github/workflows/docker.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      # We want custom per developer branches to be pushed
+      - crufter
     tags:
       - v2.*
       - v3.*
@@ -19,7 +21,7 @@ jobs:
       run: git fetch --prune --unshallow
 
     - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
         name: micro/micro
         username: ${{ secrets.DOCKER_USERNAME }}

.github/workflows/integration-k8s.yml

@@ -20,7 +20,7 @@ jobs:
       uses: engineerd/[email protected]
 
     - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
         name: micro/micro
         username: ${{ secrets.DOCKER_USERNAME }}

.github/workflows/staging.yml

@@ -16,7 +16,7 @@ jobs:
       run: git fetch --prune --unshallow
 
     - name: Publish to Registry
-      uses: elgohr/Publish-Docker-Github-Action@master
+      uses: elgohr/Publish-Docker-Github-Action@v5
       with:
         name: micro/micro
         username: ${{ secrets.DOCKER_USERNAME }}

client/api/api.go

@@ -199,7 +199,7 @@ func Run(ctx *cli.Context, srvOpts ...micro.Option) {
 
 	// resolver options
 	ropts := []resolver.Option{
-		resolver.WithNamespace(nsResolver.ResolveWithType),
+		resolver.WithServicePrefix(Namespace + "." + Type),
 		resolver.WithHandler(Handler),
 	}
 

client/api/auth/wrapper.go

@@ -40,8 +40,12 @@ func (a authWrapper) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	ns := req.Header.Get(namespace.NamespaceKey)
 	if len(ns) == 0 {
 		ns = a.nsResolver.Resolve(req)
-		req.Header.Set(namespace.NamespaceKey, ns)
 	}
+	// todo: replace this once the namespace resolver has been depricated
+	if ns == "go.micro" {
+		ns = "micro"
+	}
+	req.Header.Set(namespace.NamespaceKey, ns)
 
 	// Set the metadata so we can access it in micro api / web
 	req = req.WithContext(ctx.FromRequest(req))

client/cli/new/new.go

@@ -123,11 +123,14 @@ func create(c config) error {
 		}
 	}
 
-	dst, err := copyAPIProto(c)
-	if err != nil {
-		return err
+	if c.Type == "api" {
+		dst, err := copyAPIProto(c)
+		if err != nil {
+			return err
+		}
+		addFileToTree(t, dst)
+
 	}
-	addFileToTree(t, dst)
 	// print tree
 	fmt.Println(t.String())
 

client/cli/util/util.go

@@ -37,25 +37,21 @@ const (
 )
 
 var defaultEnvs = map[string]Env{
-	EnvLocal: Env{
+	EnvLocal: {
 		Name:         EnvLocal,
 		ProxyAddress: localProxyAddress,
 	},
-	EnvServer: Env{
+	EnvServer: {
 		Name:         EnvServer,
 		ProxyAddress: serverProxyAddress,
 	},
-	EnvPlatform: Env{
+	EnvPlatform: {
 		Name:         EnvPlatform,
 		ProxyAddress: platformProxyAddress,
 	},
 }
 
 func isBuiltinService(command string) bool {
-	switch command {
-	case "server", "help":
-		return true
-	}
 	for _, service := range platform.Services {
 		if command == service {
 			return true
@@ -66,13 +62,28 @@ func isBuiltinService(command string) bool {
 
 // SetupCommand includes things that should run for each command.
 func SetupCommand(ctx *ccli.Context) {
+	// This makes `micro [command name] --help` work without a server
+	for _, arg := range os.Args {
+		if arg == "--help" || arg == "-h" {
+			return
+		}
+	}
+	switch ctx.Args().First() {
+	case "new", "server", "help":
+		return
+	}
 	if ctx.Args().Len() == 1 && isBuiltinService(ctx.Args().First()) {
 		return
 	}
 	if ctx.Args().Len() >= 1 && ctx.Args().First() == "env" {
 		return
 	}
 
+	if ctx.App.Command(ctx.Args().First()) == nil {
+		// unrecognised command
+		return
+	}
+
 	toFlag := func(s string) string {
 		return strings.ToLower(strings.ReplaceAll(s, "MICRO_", ""))
 	}

client/proxy/proxy.go

@@ -13,7 +13,6 @@ import (
 	"github.com/micro/go-micro/v2/api/server/acme/certmagic"
 	"github.com/micro/go-micro/v2/auth"
 	bmem "github.com/micro/go-micro/v2/broker/memory"
-	"github.com/micro/go-micro/v2/client"
 	mucli "github.com/micro/go-micro/v2/client"
 	"github.com/micro/go-micro/v2/config/cmd"
 	log "github.com/micro/go-micro/v2/logger"
@@ -22,10 +21,7 @@ import (
 	//"github.com/micro/go-micro/v2/proxy/grpc"
 	"github.com/micro/go-micro/v2/proxy/http"
 	"github.com/micro/go-micro/v2/proxy/mucp"
-	"github.com/micro/go-micro/v2/registry"
 	rmem "github.com/micro/go-micro/v2/registry/memory"
-	"github.com/micro/go-micro/v2/router"
-	rs "github.com/micro/go-micro/v2/router/service"
 	"github.com/micro/go-micro/v2/server"
 	sgrpc "github.com/micro/go-micro/v2/server/grpc"
 	"github.com/micro/go-micro/v2/sync/memory"
@@ -84,42 +80,10 @@ func Run(ctx *cli.Context, srvOpts ...micro.Option) {
 	service := micro.NewService(srvOpts...)
 
 	// set the context
-	var popts []proxy.Option
-
-	// create new router
-	var r router.Router
-
-	routerName := ctx.String("router")
-	routerAddr := ctx.String("router_address")
-
-	ropts := []router.Option{
-		router.Id(server.DefaultId),
-		router.Client(client.DefaultClient),
-		router.Address(routerAddr),
-		router.Registry(registry.DefaultRegistry),
+	popts := []proxy.Option{
+		proxy.WithRouter(service.Options().Router),
 	}
 
-	// check if we need to use the router service
-	switch {
-	case routerName == "go.micro.router":
-		r = rs.NewRouter(ropts...)
-	case routerName == "service":
-		r = rs.NewRouter(ropts...)
-	case len(routerAddr) > 0:
-		r = rs.NewRouter(ropts...)
-	default:
-		r = router.NewRouter(ropts...)
-	}
-
-	// start the router
-	if err := r.Start(); err != nil {
-		log.Errorf("Proxy error starting router: %s", err)
-		os.Exit(1)
-	}
-
-	// append router to proxy opts
-	popts = append(popts, proxy.WithRouter(r))
-
 	// new proxy
 	var p proxy.Proxy
 	// setup the default server
@@ -280,16 +244,6 @@ func Commands(options ...micro.Option) []*cli.Command {
 		Name:  "proxy",
 		Usage: "Run the service proxy",
 		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:    "router",
-				Usage:   "Set the router to use e.g default, go.micro.router",
-				EnvVars: []string{"MICRO_ROUTER"},
-			},
-			&cli.StringFlag{
-				Name:    "router_address",
-				Usage:   "Set the router address",
-				EnvVars: []string{"MICRO_ROUTER_ADDRESS"},
-			},
 			&cli.StringFlag{
 				Name:    "address",
 				Usage:   "Set the proxy http address e.g 0.0.0.0:8081",

client/web/web.go

@@ -156,7 +156,7 @@ func (s *srv) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// check if its a web request
-	if _, _, isWeb := s.resolver.Info(r); isWeb {
+	if _, isWeb := s.resolver.Info(r); isWeb {
 		s.Router.ServeHTTP(w, r)
 		return
 	}
@@ -259,7 +259,7 @@ func (s *srv) indexHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	services, err := s.registry.ListServices(registry.ListContext(r.Context()))
+	services, err := s.registry.ListServices(registry.ListDomain(registry.WildcardDomain))
 	if err != nil {
 		log.Errorf("Error listing services: %v", err)
 	}
@@ -311,7 +311,7 @@ func (s *srv) registryHandler(w http.ResponseWriter, r *http.Request) {
 	svc := vars["name"]
 
 	if len(svc) > 0 {
-		sv, err := s.registry.GetService(svc, registry.GetContext(r.Context()))
+		sv, err := s.registry.GetService(svc, registry.GetDomain(registry.WildcardDomain))
 		if err != nil {
 			http.Error(w, "Error occurred:"+err.Error(), 500)
 			return
@@ -339,7 +339,7 @@ func (s *srv) registryHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	services, err := s.registry.ListServices(registry.ListContext(r.Context()))
+	services, err := s.registry.ListServices(registry.ListDomain(registry.WildcardDomain))
 	if err != nil {
 		log.Errorf("Error listing services: %v", err)
 	}
@@ -363,7 +363,7 @@ func (s *srv) registryHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func (s *srv) callHandler(w http.ResponseWriter, r *http.Request) {
-	services, err := s.registry.ListServices(registry.ListContext(r.Context()))
+	services, err := s.registry.ListServices(registry.ListDomain(registry.WildcardDomain))
 	if err != nil {
 		log.Errorf("Error listing services: %v", err)
 	}
@@ -377,7 +377,7 @@ func (s *srv) callHandler(w http.ResponseWriter, r *http.Request) {
 			continue
 		}
 		// lookup the endpoints otherwise
-		s, err := s.registry.GetService(service.Name, registry.GetContext(r.Context()))
+		s, err := s.registry.GetService(service.Name, registry.GetDomain(registry.WildcardDomain))
 		if err != nil {
 			continue
 		}
@@ -487,10 +487,11 @@ func Run(ctx *cli.Context, srvOpts ...micro.Option) {
 		// our internal resolver
 		resolver: &web.Resolver{
 			// Default to type path
-			Type:      Resolver,
-			Namespace: namespace.NewResolver(Type, Namespace).ResolveWithType,
+			Type:          Resolver,
+			ServicePrefix: Namespace + "." + Type,
 			Selector: selector.NewSelector(
 				selector.Registry(reg),
+				selector.Domain(registry.WildcardDomain),
 			),
 		},
 		auth: *cmd.DefaultOptions().Auth,

cmd/cmd.go

@@ -135,11 +135,6 @@ func setup(app *ccli.App) {
 			Usage:   "Set the micro network address e.g. :9093",
 			EnvVars: []string{"MICRO_NETWORK_ADDRESS"},
 		},
-		&ccli.StringFlag{
-			Name:    "router_address",
-			Usage:   "Set the micro router address e.g. :8084",
-			EnvVars: []string{"MICRO_ROUTER_ADDRESS"},
-		},
 		&ccli.StringFlag{
 			Name:    "gateway_address",
 			Usage:   "Set the micro default gateway address e.g. :9094",
@@ -231,9 +226,6 @@ func setup(app *ccli.App) {
 		if len(ctx.String("network_address")) > 0 {
 			network.Address = ctx.String("network_address")
 		}
-		if len(ctx.String("router_address")) > 0 {
-			router.Address = ctx.String("router_address")
-		}
 		if len(ctx.String("tunnel_address")) > 0 {
 			tunnel.Address = ctx.String("tunnel_address")
 		}

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/gorilla/handlers v1.4.2
 	github.com/gorilla/mux v1.7.3
 	github.com/micro/cli/v2 v2.1.2
-	github.com/micro/go-micro/v2 v2.9.0
+	github.com/micro/go-micro/v2 v2.9.1-0.20200626132818-104b7d8f8dd7
 	github.com/miekg/dns v1.1.27
 	github.com/netdata/go-orchestrator v0.0.0-20190905093727-c793edba0e8f
 	github.com/olekukonko/tablewriter v0.0.4

go.sum

@@ -103,12 +103,14 @@ github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f h1:JOrtw2xFKzlg+cbHpyrpLDmnN1HqhBfnX7WDiW7eG2c=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -235,6 +237,7 @@ github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -322,20 +325,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/micro/cli/v2 v2.1.2 h1:43J1lChg/rZCC1rvdqZNFSQDrGT7qfMrtp6/ztpIkEM=
 github.com/micro/cli/v2 v2.1.2/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg=
-github.com/micro/go-micro/v2 v2.8.0 h1:WKogg6xqJmk3CjTFscrzSKN1fSGtince4sWfaqx9844=
-github.com/micro/go-micro/v2 v2.8.0/go.mod h1:hSdOM6jb6aGswjBpCeB9wJ0yVH+CugevRm/CX7NlSrQ=
-github.com/micro/go-micro/v2 v2.8.1-0.20200603084508-7b379bf1f16e h1:WIRnyfUjlUfJV82OtG18er0F90svTwzmZGKGOMJyPmw=
-github.com/micro/go-micro/v2 v2.8.1-0.20200603084508-7b379bf1f16e/go.mod h1:hSdOM6jb6aGswjBpCeB9wJ0yVH+CugevRm/CX7NlSrQ=
-github.com/micro/go-micro/v2 v2.8.1-0.20200608094725-47bdd5c99383/go.mod h1:x55ZM3Puy0FyvvkR3e0ha0xsE9DFwfPSUMWAIbFY0SY=
-github.com/micro/go-micro/v2 v2.8.1-0.20200609104731-cdd8f9fd82c5 h1:IUUXIV3yqMcJi3vOKrKKdRa3IILfS5n1ov7ywPvRqRc=
-github.com/micro/go-micro/v2 v2.8.1-0.20200609104731-cdd8f9fd82c5/go.mod h1:x55ZM3Puy0FyvvkR3e0ha0xsE9DFwfPSUMWAIbFY0SY=
-github.com/micro/go-micro/v2 v2.9.0-rc1 h1:JzuwVr6gcP7yRT/ftkZ7bn6jbv+8iAJPL1VWNSaBceM=
-github.com/micro/go-micro/v2 v2.9.0-rc1/go.mod h1:x55ZM3Puy0FyvvkR3e0ha0xsE9DFwfPSUMWAIbFY0SY=
-github.com/micro/go-micro/v2 v2.9.0 h1:SeQ3ba02jqcl51mtkGPcZjxpIRrBXxUel8PFG4Z9QSU=
-github.com/micro/go-micro/v2 v2.9.0/go.mod h1:x55ZM3Puy0FyvvkR3e0ha0xsE9DFwfPSUMWAIbFY0SY=
-github.com/micro/mdns v0.3.0/go.mod h1:KJ0dW7KmicXU2BV++qkLlmHYcVv7/hHnbtguSWt9Aoc=
-github.com/micro/protoc-gen-micro v1.0.0/go.mod h1:C8ij4DJhapBmypcT00AXdb0cZ675/3PqUO02buWWqbE=
-github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/micro/go-micro/v2 v2.9.1-0.20200626132818-104b7d8f8dd7 h1:llsSvLaZgS3F7eEzwM2krRnPXvG2V5J2yruDz1n0UQk=
+github.com/micro/go-micro/v2 v2.9.1-0.20200626132818-104b7d8f8dd7/go.mod h1:hSdOM6jb6aGswjBpCeB9wJ0yVH+CugevRm/CX7NlSrQ=
 github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
 github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
@@ -479,7 +470,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=