Fix issues found by golangci v1.22.2 (#13568)

store/layer_generators/main.go

@@ -10,11 +10,11 @@ import (
 	"go/format"
 	"go/parser"
 	"go/token"
-	"html/template"
 	"io/ioutil"
 	"os"
 	"path"
 	"strings"
+	"text/template"
 )
 
 func main() {
@@ -253,8 +253,12 @@ func (s *{{$.Name}}{{$substoreName}}Store) {{$index}}({{$element.Params | joinPa
 			success = "true"
 		}
 		s.Root.Metrics.ObserveStoreMethodDuration("{{$substoreName}}Store.{{$index}}", success, elapsed)
+	{{ with ($element.Results | genResultsVars) -}}
 	}
-	return {{$element.Results | genResultsVars}}
+	return {{ . }}
+	{{- else -}}
+	}
+	{{- end }}
 }
 {{end}}
 {{end}}