metalinter

99designs · Dec 1, 2018 · a13b31e · a13b31e
1 parent 526bef0
commit a13b31e
Show file tree

Hide file tree

Showing 14 changed files with 181 additions and 161 deletions.
diff --git a/codegen/templates/args.gotpl b/codegen/templates/args.gotpl
@@ -1,5 +1,4 @@
 	args := map[string]interface{}{}
-	var err error
 	{{- range $i, $arg := . }}
 		var arg{{$i}} {{$arg.Signature }}
 		if tmp, ok := rawArgs[{{$arg.GQLName|quote}}]; ok {
@@ -30,6 +29,7 @@
 					return nil, errors.New("expect {{$arg.Signature }}")
 				}
 				{{ else }}
+					var err error
 					{{$arg.Unmarshal (print "arg" $i) "tmp" }}
 					if err != nil {
 						return nil, err
@@ -41,6 +41,7 @@
 				{{- end }}
 
 			{{ else }}
+			var err error
 			{{$arg.Unmarshal (print "arg" $i) "tmp" }}
 			if err != nil {
 				return nil, err
@@ -49,4 +50,4 @@
 		}
 		args[{{$arg.GQLName|quote}}] = arg{{$i}}
 	{{- end }}
-	return args, err
+	return args, nil
diff --git a/codegen/templates/data.go b/codegen/templates/data.go
diff --git a/codegen/templates/input.gotpl b/codegen/templates/input.gotpl
@@ -28,7 +28,6 @@
 	{{- end }}
 
 	func (e *executableSchema) {{ .GQLType }}Middleware(ctx context.Context, obj *{{.FullName}}) (*{{.FullName}}, error) {
-		var err error
 		{{ if .Directives }}
 		cObj, err := graphql.ChainFieldMiddleware(
 			[]graphql.FieldMiddleware{
@@ -109,5 +108,5 @@
 				{{ $field.Middleware (print "obj." $field.GoFieldName ) (print "obj." $field.GoFieldName ) }}
 			{{- end }}
 		{{- end }}
-		return obj, err
+		return obj, nil
 	}