roles: deprecate type Role

api/v1/lib/resources.go

@@ -9,6 +9,8 @@ import (
 	"github.com/mesos/mesos-go/api/v1/lib/roles"
 )
 
+const DefaultRole = "*"
+
 type (
 	Resources         []Resource
 	resourceErrorType int

api/v1/lib/resources/aggregate.go

@@ -2,7 +2,6 @@ package resources
 
 import (
 	"github.com/mesos/mesos-go/api/v1/lib"
-	"github.com/mesos/mesos-go/api/v1/lib/roles"
 )
 
 func (n Name) Sum(resources ...mesos.Resource) (*mesos.Resource, bool) {
@@ -135,7 +134,7 @@ func Flatten(resources []mesos.Resource, opts ...FlattenOpt) []mesos.Resource {
 		f(fc)
 	}
 	if fc.role == "" {
-		fc.role = string(roles.Default)
+		fc.role = mesos.DefaultRole
 	}
 	// we intentionally manipulate a copy 'r' of the item in resources
 	for _, r := range resources {

api/v1/lib/roles/role.go

@@ -6,12 +6,13 @@ import (
 	"unicode"
 )
 
+// Role is a deprecated type.
 type Role string
 
-const Default = Role("*")
+const defaultRole = Role("*")
 
 func (r Role) IsDefault() bool {
-	return r == Default
+	return r == defaultRole
 }
 
 func (r Role) Assign() func(interface{}) {
@@ -41,9 +42,9 @@ var illegalComponents = map[string]struct{}{
 	"*":  struct{}{},
 }
 
-func Parse(s string) (Role, error) {
-	if s == string(Default) {
-		return Default, nil
+func Parse(s string) (string, error) {
+	if s == string(defaultRole) {
+		return s, nil
 	}
 	if strings.HasPrefix(s, "/") {
 		return "", fmt.Errorf("role %q cannot start with a slash", s)
@@ -67,7 +68,7 @@ func Parse(s string) (Role, error) {
 			return "", fmt.Errorf("role component %q is invalid because it contains backspace or whitespace", part)
 		}
 	}
-	return Role(s), nil
+	return s, nil
 }
 
 func Validate(roles ...string) error {