Merge 7777d2e into 3f50b95

README.md

@@ -52,7 +52,7 @@ func (s *HelloServer) SayHello(b *restful.Context) {
 	b.Write([]byte("Hello : Welcome to Go-Chassis."))
 }
 //Specify URL pattern
-func (s *HelloServer) URLPatterns() []restful.RouteSpec {
+func (s *HelloServer) URLPatterns() []restful.Route {
 	return []restful.RouteSpec{
 		{http.MethodGet, "/sayhello", "SayHello"},
 	}

chassis.go

@@ -34,14 +34,15 @@ import (
 	"github.com/ServiceComb/go-chassis/core/server"
 	"github.com/ServiceComb/go-chassis/core/tracing"
 	"github.com/ServiceComb/go-chassis/eventlistener"
-	// aes package handles security related plugins
+	// metric plugin
 	_ "github.com/ServiceComb/go-chassis/metrics/prom"
+	// aes package handles security related plugins
 	_ "github.com/ServiceComb/go-chassis/security/plugins/aes"
 	_ "github.com/ServiceComb/go-chassis/security/plugins/plain"
 	_ "github.com/ServiceComb/go-chassis/server/restful"
 	// highway package register the highway server plugin
 	_ "github.com/ServiceComb/go-chassis/server/highway"
-	// tcp package handles transport related things
+	// import config center plugins
 	_ "github.com/ServiceComb/go-cc-client/apollo-client"
 	_ "github.com/ServiceComb/go-cc-client/configcenter-client"
 	"github.com/ServiceComb/go-chassis/config-center"

chassis_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/config"
 	"github.com/ServiceComb/go-chassis/core/config/model"
 	"github.com/ServiceComb/go-chassis/core/lager"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 
 	"github.com/stretchr/testify/assert"
 )

core/archaius/archaius.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/ServiceComb/go-chassis/core/lager"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 
 	"github.com/ServiceComb/go-archaius"
 	"github.com/ServiceComb/go-archaius/core"

core/archaius/archaius_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/config/schema"
 	"github.com/ServiceComb/go-chassis/core/lager"
 	"github.com/ServiceComb/go-chassis/core/loadbalancer"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 	"github.com/stretchr/testify/assert"
 )
 

core/config/config.go

@@ -11,7 +11,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/config/model"
 	"github.com/ServiceComb/go-chassis/core/config/schema"
 	"github.com/ServiceComb/go-chassis/core/lager"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 
 	"gopkg.in/yaml.v2"
 )

core/config/schema/loader.go

@@ -3,7 +3,7 @@ package schema
 import (
 	"errors"
 	"fmt"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 	"io/ioutil"
 	"os"
 	"path/filepath"

core/config/schema/loader_test.go

@@ -2,7 +2,7 @@ package schema_test
 
 import (
 	"github.com/ServiceComb/go-chassis/core/config/schema"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"path/filepath"

core/goplugin/plugin.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"plugin"
 
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 )
 
 // LookupPlugin lookup plugin

core/registry/file/file_client.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/ServiceComb/go-chassis/core/lager"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 
 	"github.com/ServiceComb/go-sc-client/model"
 )

core/registry/util.go

@@ -12,7 +12,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/config/model"
 	"github.com/ServiceComb/go-chassis/core/lager"
 	chassisTLS "github.com/ServiceComb/go-chassis/core/tls"
-	"github.com/ServiceComb/go-chassis/util/iputil"
+	"github.com/ServiceComb/go-chassis/pkg/util/iputil"
 	"github.com/cenkalti/backoff"
 )
 

core/registry/util_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/config/model"
 	"github.com/ServiceComb/go-chassis/core/lager"
 	"github.com/ServiceComb/go-chassis/core/registry"
-	"github.com/ServiceComb/go-chassis/util/iputil"
+	"github.com/ServiceComb/go-chassis/pkg/util/iputil"
 	"github.com/stretchr/testify/assert"
 )
 

core/router/router_config.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/lager"
 	chassisTLS "github.com/ServiceComb/go-chassis/core/tls"
 	"github.com/ServiceComb/go-chassis/pkg/istio/client"
-	"github.com/ServiceComb/go-chassis/util/iputil"
+	"github.com/ServiceComb/go-chassis/pkg/util/iputil"
 )
 
 // RouterTLS defines tls prefix

core/server/server_manager.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/lager"
 	"github.com/ServiceComb/go-chassis/core/registry"
 	chassisTLS "github.com/ServiceComb/go-chassis/core/tls"
-	"github.com/ServiceComb/go-chassis/util/iputil"
+	"github.com/ServiceComb/go-chassis/pkg/util/iputil"
 )
 
 //NewFunc returns a ProtocolServer

eventlistener/circuit_breaker_event_listener_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/config"
 	"github.com/ServiceComb/go-chassis/core/lager"
 	"github.com/ServiceComb/go-chassis/eventlistener"
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 
 	"github.com/ServiceComb/go-archaius/core"
 	"github.com/stretchr/testify/assert"

util/fileutil/fileutil_test.go → pkg/util/fileutil/fileutil_test.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 
 	"github.com/stretchr/testify/assert"
 )

util/iputil/ip_test.go → pkg/util/iputil/ip_test.go

@@ -2,7 +2,7 @@ package iputil_test
 
 import (
 	"github.com/ServiceComb/go-chassis/core/common"
-	"github.com/ServiceComb/go-chassis/util/iputil"
+	"github.com/ServiceComb/go-chassis/pkg/util/iputil"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )

pkg/util/util.go

@@ -0,0 +1,19 @@
+package util
+
+import (
+	"errors"
+	"strings"
+)
+
+//ErrInvalidPortName happens if your port name is illegal
+var ErrInvalidPortName = errors.New("invalid port name")
+
+//ParsePortName a port name is composite by protocol-name,like http-admin,http-api,grpc-console,grpc-api
+//ParsePortName return two string separately
+func ParsePortName(n string) (string, string, error) {
+	tmp := strings.Split(n, "-")
+	if len(tmp) != 2 {
+		return "", "", ErrInvalidPortName
+	}
+	return tmp[0], tmp[1], nil
+}

pkg/util/util_test.go

@@ -0,0 +1,17 @@
+package util_test
+
+import (
+	"github.com/ServiceComb/go-chassis/pkg/util"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestParsePortName(t *testing.T) {
+	p, n, err := util.ParsePortName("http-admin")
+	assert.Equal(t, "http", p)
+	assert.Equal(t, "admin", n)
+	assert.NoError(t, err)
+
+	_, _, err = util.ParsePortName("httpadmin")
+	assert.Error(t, err)
+}

server/restful/restful_server.go

@@ -19,7 +19,7 @@ import (
 	"github.com/ServiceComb/go-chassis/core/server"
 	"github.com/ServiceComb/go-chassis/metrics"
 
-	"github.com/ServiceComb/go-chassis/util/fileutil"
+	"github.com/ServiceComb/go-chassis/pkg/util/fileutil"
 	"github.com/emicklei/go-restful"
 	"github.com/emicklei/go-restful-swagger12"
 )