Need to define metrics setter for validator

xmidt-org · Jan 25, 2018 · 6f985ec · 6f985ec
1 parent 8d56143
commit 6f985ec
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/src/glide.lock b/src/glide.lock
diff --git a/src/glide.yaml b/src/glide.yaml
@@ -2,6 +2,6 @@ package: .
 homepage: https://github.com/Comcast/tr1d1um
 import:
 - package: github.com/Comcast/webpa-common
-  version: ff81f093033bfdf7c8d71b36697f9895026dc78b
+  version: f61a77521d8fbad863a4700fab405d688f979e3b 
 - package: github.com/go-ozzo/ozzo-validation
   version: v3.3
diff --git a/src/tr1d1um/tr1d1um.go b/src/tr1d1um/tr1d1um.go
@@ -275,23 +275,23 @@ func GetValidator(v *viper.Viper, m *secure.JWTValidationMeasures) (validator se
 	validators := make(secure.Validators, 0, len(jwtVals))
 
 	for _, validatorDescriptor := range jwtVals {
+		validatorDescriptor.Custom.DefineMeasures(m)
+
 		var keyResolver key.Resolver
 		keyResolver, err = validatorDescriptor.Keys.NewResolver()
 		if err != nil {
 			validator = validators
 			return
 		}
 
-		validatorDescriptor.Custom.DefineMeasures(m)
+		validator := secure.JWSValidator{
+			DefaultKeyId:  DefaultKeyID,
+			Resolver:      keyResolver,
+			JWTValidators: []*jwt.Validator{validatorDescriptor.Custom.New()},
+		}
 
-		validators = append(
-			validators,
-			secure.JWSValidator{
-				DefaultKeyId:  DefaultKeyID,
-				Resolver:      keyResolver,
-				JWTValidators: []*jwt.Validator{validatorDescriptor.Custom.New()},
-			},
-		)
+		validator.DefineMeasures(m)
+		validators = append(validators, validator)
 	}
 
 	basicAuth := v.GetStringSlice("authHeader")