update string method

Signed-off-by: nyagamunene <stevenyaga2014@gmail.com>

Author: nyagamunene

clients/operationperm.go

@@ -8,23 +8,49 @@ import "fmt"
 type Operation int
 
 func (op Operation) String() string {
-	if (int(op) < 0) || (int(op) == len(OperationNames)) {
-		return fmt.Sprintf("UnknownOperation(%d)", op)
+	switch op {
+	case OpViewClient:
+		return OpViewClientStr
+	case OpUpdateClient:
+		return OpUpdateClientStr
+	case OpUpdateClientTags:
+		return OpUpdateClientTagsStr
+	case OpUpdateClientSecret:
+		return OpUpdateClientSecretStr
+	case OpEnableClient:
+		return OpEnableClientStr
+	case OpDisableClient:
+		return OpDisableClientStr
+	case OpDeleteClient:
+		return OpDeleteClientStr
+	case OpSetParentGroup:
+		return OpSetParentGroupStr
+	case OpRemoveParentGroup:
+		return OpRemoveParentGroupStr
+	case OpConnectToChannel:
+		return OpConnectToChannelStr
+	case OpDisconnectFromChannel:
+		return OpDisconnectFromChannelStr
+	case OpCreateClient:
+		return OpCreateClientStr
+	case OpListClients:
+		return OpListClientsStr
+	case OpListUserClients:
+		return OpListUserClientsStr
+	default:
+		return fmt.Sprintf("unknown operation: %d", op)
 	}
-	return OperationNames[op]
 }
 
 type OperationPerm struct {
 	opPerm      map[Operation]Permission
 	expectedOps []Operation
-	opNames     []string
 }
 
-func newOperationPerm(expectedOps []Operation, opNames []string) OperationPerm {
+func newOperationPerm(expectedOps []Operation) OperationPerm {
 	return OperationPerm{
 		opPerm:      make(map[Operation]Permission),
 		expectedOps: expectedOps,
-		opNames:     opNames,
 	}
 }
 
@@ -87,24 +113,42 @@ func (p Permission) String() string {
 
 type ExternalOperation int
 
-func (op ExternalOperation) String(operations []string) string {
-	if (int(op) < 0) || (int(op) == len(operations)) {
-		return fmt.Sprintf("UnknownOperation(%d)", op)
+// func (op ExternalOperation) String(operations []string) string {
+// 	if (int(op) < 0) || (int(op) == len(operations)) {
+// 		return fmt.Sprintf("UnknownOperation(%d)", op)
+// 	}
+// 	return operations[op]
+// }
+
+func (op ExternalOperation) String() string {
+	switch op {
+	case DomainOpCreateClient:
+		return DomainOpCreateClientStr
+	case DomainOpListClients:
+		return DomainOpListClientsStr
+	case GroupOpSetChildClient:
+		return GroupOpSetChildClientStr
+	case GroupsOpRemoveChildClient:
+		return GroupsOpRemoveChildClientStr
+	case ChannelsOpConnectChannel:
+		return ChannelsOpConnectChannelStr
+	case ChannelsOpDisconnectChannel:
+		return ChannelsOpDisconnectChannelStr
+	default:
+		return fmt.Sprintf("unknown external operation: %d", op)
 	}
-	return operations[op]
 }
 
 type ExternalOperationPerm struct {
 	opPerm      map[ExternalOperation]Permission
 	expectedOps []ExternalOperation
-	opNames     []string
+	// opNames     []string
 }
 
-func newExternalOperationPerm(expectedOps []ExternalOperation, opNames []string) ExternalOperationPerm {
+func newExternalOperationPerm(expectedOps []ExternalOperation) ExternalOperationPerm {
 	return ExternalOperationPerm{
 		opPerm:      make(map[ExternalOperation]Permission),
 		expectedOps: expectedOps,
-		opNames:     opNames,
 	}
 }
 
@@ -121,7 +165,7 @@ func (eopp ExternalOperationPerm) AddOperationPermissionMap(eopMap map[ExternalO
 	// First iteration check all the keys are valid, If any one key is invalid then no key should be added.
 	for eop := range eopMap {
 		if !eopp.isKeyRequired(eop) {
-			return fmt.Errorf("%v is not a valid external operation", eop.String(eopp.opNames))
+			return fmt.Errorf("%v is not a valid external operation", eop.String())
 		}
 	}
 	for eop, perm := range eopMap {
@@ -133,12 +177,12 @@ func (eopp ExternalOperationPerm) AddOperationPermissionMap(eopMap map[ExternalO
 func (eopp ExternalOperationPerm) Validate() error {
 	for eop := range eopp.opPerm {
 		if !eopp.isKeyRequired(eop) {
-			return fmt.Errorf("ExternalOperationPerm: \"%s\" is not a valid external operation", eop.String(eopp.opNames))
+			return fmt.Errorf("ExternalOperationPerm: \"%s\" is not a valid external operation", eop.String())
 		}
 	}
 	for _, eeo := range eopp.expectedOps {
 		if _, ok := eopp.opPerm[eeo]; !ok {
-			return fmt.Errorf("ExternalOperationPerm: \"%s\" external operation is missing", eeo.String(eopp.opNames))
+			return fmt.Errorf("ExternalOperationPerm: \"%s\" external operation is missing", eeo.String())
 		}
 	}
 	return nil
@@ -148,5 +192,5 @@ func (eopp ExternalOperationPerm) GetPermission(eop ExternalOperation) (Permissi
 	if perm, ok := eopp.opPerm[eop]; ok {
 		return perm, nil
 	}
-	return "", fmt.Errorf("external operation \"%s\" doesn't have any permissions", eop.String(eopp.opNames))
+	return "", fmt.Errorf("external operation \"%s\" doesn't have any permissions", eop.String())
 }

clients/roleoperations.go

@@ -21,6 +21,23 @@ const (
 	OpListUserClients
 )
 
+const (
+	OpViewClientStr            = "OpViewClient"
+	OpUpdateClientStr          = "OpUpdateClient"
+	OpUpdateClientTagsStr      = "OpUpdateClientTags"
+	OpUpdateClientSecretStr    = "OpUpdateClientSecret"
+	OpEnableClientStr          = "OpEnableClient"
+	OpDisableClientStr         = "OpDisableClient"
+	OpDeleteClientStr          = "OpDeleteClient"
+	OpSetParentGroupStr        = "OpSetParentGroup"
+	OpRemoveParentGroupStr     = "OpRemoveParentGroup"
+	OpConnectToChannelStr      = "OpConnectToChannel"
+	OpDisconnectFromChannelStr = "OpDisconnectFromChannel"
+	OpCreateClientStr          = "OpCreateClient"
+	OpListClientsStr           = "OpListClients"
+	OpListUserClientsStr       = "OpListUserClients"
+)
+
 var expectedOperations = []Operation{
 	OpViewClient,
 	OpUpdateClient,
@@ -35,25 +52,8 @@ var expectedOperations = []Operation{
 	OpDisconnectFromChannel,
 }
 
-var OperationNames = []string{
-	"OpViewClient",
-	"OpUpdateClient",
-	"OpUpdateClientTags",
-	"OpUpdateClientSecret",
-	"OpEnableClient",
-	"OpDisableClient",
-	"OpDeleteClient",
-	"OpSetParentGroup",
-	"OpRemoveParentGroup",
-	"OpConnectToChannel",
-	"OpDisconnectFromChannel",
-	"OpCreateClient",
-	"OpListClients",
-	"OpListUserClients",
-}
-
 func NewOperationPerm() OperationPerm {
-	return newOperationPerm(expectedOperations, OperationNames)
+	return newOperationPerm(expectedOperations)
 }
 
 // External Operations.
@@ -66,6 +66,15 @@ const (
 	ChannelsOpDisconnectChannel
 )
 
+const (
+	DomainOpCreateClientStr        = "DomainOpCreateClient"
+	DomainOpListClientsStr         = "DomainOpListClients"
+	GroupOpSetChildClientStr       = "GroupOpSetChildClient"
+	GroupsOpRemoveChildClientStr   = "GroupsOpRemoveChildClient"
+	ChannelsOpConnectChannelStr    = "ChannelsOpConnectChannel"
+	ChannelsOpDisconnectChannelStr = "ChannelsOpDisconnectChannel"
+)
+
 var expectedExternalOperations = []ExternalOperation{
 	DomainOpCreateClient,
 	DomainOpListClients,
@@ -75,17 +84,8 @@ var expectedExternalOperations = []ExternalOperation{
 	ChannelsOpDisconnectChannel,
 }
 
-var externalOperationNames = []string{
-	"DomainOpCreateClient",
-	"DomainOpListClients",
-	"GroupOpSetChildClient",
-	"GroupsOpRemoveChildClient",
-	"ChannelsOpConnectChannel",
-	"ChannelsOpDisconnectChannel",
-}
-
 func NewExternalOperationPerm() ExternalOperationPerm {
-	return newExternalOperationPerm(expectedExternalOperations, externalOperationNames)
+	return newExternalOperationPerm(expectedExternalOperations)
 }
 
 // Below codes should moved out of service, may be can be kept in `cmd/<svc>/main.go`