Upstep Go dependencies (#340)

* Upstep Go dependencies

* tiny linter fix

* Tidy

vendor/github.com/go-xmlfmt/xmlfmt/README.md

@@ -15,9 +15,19 @@ package main
 import "github.com/go-xmlfmt/xmlfmt"
 
 func main() {
-	xml1 := `<root><this><is>a</is><test /><message><org><cn>Some org-or-other</cn><ph>Wouldnt you like to know</ph></org><contact><fn>Pat</fn><ln>Califia</ln></contact></message></this></root>`
+	xmlfmt.NL = "\n"
+	xml1 := `<root><this><is>a</is><test /><message><!-- with comment --><org><cn>Some org-or-other</cn><ph>Wouldnt you like to know</ph></org><contact><fn>Pat</fn><ln>Califia</ln></contact></message></this></root>`
 	x := xmlfmt.FormatXML(xml1, "\t", "  ")
 	print(x)
+
+	// If the XML Comments have nested tags in them
+	xml1 = `<book> <author>Fred</author>
+<!--
+<price>20</price><currency>USD</currency>
+-->
+ <isbn>23456</isbn> </book>`
+	x = xmlfmt.FormatXML(xml1, "", "  ", true)
+	print(x)
 }
 
 ```
@@ -47,10 +57,25 @@ Output:
 	    </message>
 	  </this>
 	</root>
+
+
+<book>
+  <author>Fred
+  </author>
+  <!-- <price>20</price><currency>USD</currency> -->
+  <isbn>23456
+  </isbn>
+</book>
 ```
 
 There is no XML decoding and encoding involved, only pure regular expression matching and replacing. So it is much faster than going through decoding and encoding procedures. Moreover, the exact XML source string is preserved, instead of being changed by the encoder. This is why this package exists in the first place. 
 
+Note that 
+
+- the XML is mainly used in Windows environments, thus the default line ending is in Windows' `CRLF` format. To change the default line ending, see the above sample code (first line).
+- the case of XML comments nested within XML comments is ***not*** supported. Please avoid them or use any other tools to correct them before using this package.
+- don't turn on the `nestedTagsInComments` parameter blindly, as the code has become 10+ times more complicated because of it.
+
 ## Command
 
 To use it on command line, check out [xmlfmt](https://github.com/AntonioSun/xmlfmt):
@@ -59,7 +84,8 @@ To use it on command line, check out [xmlfmt](https://github.com/AntonioSun/xmlf
 ```
 $ xmlfmt 
 XML Formatter
-built on 2019-12-08
+Version 1.1.0 built on 2021-12-06
+Copyright (C) 2021, Antonio Sun
 
 The xmlfmt will format the XML string without rewriting the document
 
@@ -69,6 +95,42 @@ Options:
   -f, --file         *The xml file to read from (or stdin)
   -p, --prefix        each element begins on a new line and this prefix
   -i, --indent[=  ]   indent string for nested elements
+  -n, --nested        nested tags in comments
+
+$ xmlfmt -f https://pastebin.com/raw/z3euQ5PR
+
+<root>
+  <this>
+    <is>a
+    </is>
+    <test />
+    <message>
+      <!-- with comment -->
+      <org>
+        <cn>Some org-or-other
+        </cn>
+        <ph>Wouldnt you like to know
+        </ph>
+      </org>
+      <contact>
+        <fn>Pat
+        </fn>
+        <ln>Califia
+        </ln>
+      </contact>
+    </message>
+  </this>
+</root>
+
+$ xmlfmt -f https://pastebin.com/raw/Zs0qy0qz -n
+
+<book>
+  <author>Fred
+  </author>
+  <!-- <price>20</price><currency>USD</currency> -->
+  <isbn>23456
+  </isbn>
+</book>
 ```
 
 

vendor/github.com/go-xmlfmt/xmlfmt/xmlfmt.go

@@ -1,12 +1,13 @@
 ////////////////////////////////////////////////////////////////////////////
 // Porgram: xmlfmt.go
 // Purpose: Go XML Beautify from XML string using pure string manipulation
-// Authors: Antonio Sun (c) 2016-2019, All rights reserved
+// Authors: Antonio Sun (c) 2016-2021, All rights reserved
 ////////////////////////////////////////////////////////////////////////////
 
 package xmlfmt
 
 import (
+	"html"
 	"regexp"
 	"strings"
 )
@@ -17,12 +18,32 @@ var (
 	NL = "\r\n"
 )
 
-// FormatXML will (purly) reformat the XML string in a readable way, without any rewriting/altering the structure
-func FormatXML(xmls, prefix, indent string) string {
+// FormatXML will (purly) reformat the XML string in a readable way, without any rewriting/altering the structure.
+// If your XML Comments have nested tags in them, or you're not 100% sure otherwise, pass `true` as the third parameter to this function. But don't turn it on blindly, as the code has become ten times more complicated because of it.
+func FormatXML(xmls, prefix, indent string, nestedTagsInComments ...bool) string {
+	nestedTagsInComment := false
+	if len(nestedTagsInComments) > 0 {
+		nestedTagsInComment = nestedTagsInComments[0]
+	}
+	reXmlComments := regexp.MustCompile(`(?s)(<!--)(.*?)(-->)`)
 	src := regexp.MustCompile(`(?s)>\s+<`).ReplaceAllString(xmls, "><")
-
+	if nestedTagsInComment {
+		src = reXmlComments.ReplaceAllStringFunc(src, func(m string) string {
+			parts := reXmlComments.FindStringSubmatch(m)
+			p2 := regexp.MustCompile(`\r*\n`).ReplaceAllString(parts[2], " ")
+			return parts[1] + html.EscapeString(p2) + parts[3]
+		})
+	}
 	rf := replaceTag(prefix, indent)
-	return (prefix + reg.ReplaceAllStringFunc(src, rf))
+	r := prefix + reg.ReplaceAllStringFunc(src, rf)
+	if nestedTagsInComment {
+		r = reXmlComments.ReplaceAllStringFunc(r, func(m string) string {
+			parts := reXmlComments.FindStringSubmatch(m)
+			return parts[1] + html.UnescapeString(parts[2]) + parts[3]
+		})
+	}
+
+	return r
 }
 
 // replaceTag returns a closure function to do 's/(?<=>)\s+(?=<)//g; s(<(/?)([^>]+?)(/?)>)($indent+=$3?0:$1?-1:1;"<$1$2$3>"."\n".("  "x$indent))ge' as in Perl

vendor/github.com/jackc/pgtype/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.9.1 (November 28, 2021)
+
+* Fix: binary timestamp is assumed to be in UTC (restored behavior changed in v1.9.0)
+
 # 1.9.0 (November 20, 2021)
 
 * Fix binary hstore null decoding

vendor/github.com/jackc/pgtype/timestamp.go

@@ -144,7 +144,7 @@ func (dst *Timestamp) DecodeBinary(ci *ConnInfo, src []byte) error {
 		tim := time.Unix(
 			microsecFromUnixEpochToY2K/1000000+microsecSinceY2K/1000000,
 			(microsecFromUnixEpochToY2K%1000000*1000)+(microsecSinceY2K%1000000*1000),
-		)
+		).UTC()
 		*dst = Timestamp{Time: tim, Status: Present}
 	}
 

vendor/github.com/jackc/pgx/v4/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.14.1 (November 28, 2021)
+
+* Upgrade pgtype to v1.9.1 (fixes unintentional change to timestamp binary decoding)
+* Start pgxpool background health check after initial connections
+
 # 4.14.0 (November 20, 2021)
 
 * Upgrade pgconn to v1.10.1

vendor/github.com/jackc/pgx/v4/tx.go

@@ -15,10 +15,10 @@ type TxIsoLevel string
 
 // Transaction isolation levels
 const (
-	Serializable    = TxIsoLevel("serializable")
-	RepeatableRead  = TxIsoLevel("repeatable read")
-	ReadCommitted   = TxIsoLevel("read committed")
-	ReadUncommitted = TxIsoLevel("read uncommitted")
+	Serializable    TxIsoLevel = "serializable"
+	RepeatableRead  TxIsoLevel = "repeatable read"
+	ReadCommitted   TxIsoLevel = "read committed"
+	ReadUncommitted TxIsoLevel = "read uncommitted"
 )
 
 // TxAccessMode is the transaction access mode (read write or read only)
@@ -26,8 +26,8 @@ type TxAccessMode string
 
 // Transaction access modes
 const (
-	ReadWrite = TxAccessMode("read write")
-	ReadOnly  = TxAccessMode("read only")
+	ReadWrite TxAccessMode = "read write"
+	ReadOnly  TxAccessMode = "read only"
 )
 
 // TxDeferrableMode is the transaction deferrable mode (deferrable or not deferrable)
@@ -35,8 +35,8 @@ type TxDeferrableMode string
 
 // Transaction deferrable modes
 const (
-	Deferrable    = TxDeferrableMode("deferrable")
-	NotDeferrable = TxDeferrableMode("not deferrable")
+	Deferrable    TxDeferrableMode = "deferrable"
+	NotDeferrable TxDeferrableMode = "not deferrable"
 )
 
 // TxOptions are transaction modes within a transaction block

vendor/github.com/mitchellh/mapstructure/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.3
+
+* Fix cases where `json.Number` didn't decode properly [GH-261]
+
 ## 1.4.2
 
 * Custom name matchers to support any sort of casing, formatting, etc. for

vendor/github.com/mitchellh/mapstructure/mapstructure.go

@@ -684,16 +684,12 @@ func (d *Decoder) decodeUint(name string, data interface{}, val reflect.Value) e
 		}
 	case dataType.PkgPath() == "encoding/json" && dataType.Name() == "Number":
 		jn := data.(json.Number)
-		i, err := jn.Int64()
+		i, err := strconv.ParseUint(string(jn), 0, 64)
 		if err != nil {
 			return fmt.Errorf(
 				"error decoding json.Number into %s: %s", name, err)
 		}
-		if i < 0 && !d.config.WeaklyTypedInput {
-			return fmt.Errorf("cannot parse '%s', %d overflows uint",
-				name, i)
-		}
-		val.SetUint(uint64(i))
+		val.SetUint(i)
 	default:
 		return fmt.Errorf(
 			"'%s' expected type '%s', got unconvertible type '%s', value: '%v'",

vendor/github.com/spf13/viper/.golangci.yml

@@ -20,7 +20,6 @@ linters:
         - exhaustive
         - exportloopref
         - gci
-        - goconst
         - gofmt
         - gofumpt
         - goimports
@@ -62,6 +61,7 @@ linters:
         # - gochecknoglobals
         # - gochecknoinits
         # - gocognit
+        # - goconst
         # - gocritic
         # - gocyclo
         # - godot

vendor/github.com/spf13/viper/Makefile

@@ -15,8 +15,8 @@ TEST_FORMAT = short-verbose
 endif
 
 # Dependency versions
-GOTESTSUM_VERSION = 1.6.4
-GOLANGCI_VERSION = 1.40.1
+GOTESTSUM_VERSION = 1.7.0
+GOLANGCI_VERSION = 1.43.0
 
 # Add the ability to override some variables
 # Use with care

vendor/github.com/spf13/viper/fs.go

@@ -0,0 +1,65 @@
+//go:build go1.16 && finder
+// +build go1.16,finder
+
+package viper
+
+import (
+	"errors"
+	"io/fs"
+	"path"
+)
+
+type finder struct {
+	paths      []string
+	fileNames  []string
+	extensions []string
+
+	withoutExtension bool
+}
+
+func (f finder) Find(fsys fs.FS) (string, error) {
+	for _, searchPath := range f.paths {
+		for _, fileName := range f.fileNames {
+			for _, extension := range f.extensions {
+				filePath := path.Join(searchPath, fileName+"."+extension)
+
+				ok, err := fileExists(fsys, filePath)
+				if err != nil {
+					return "", err
+				}
+
+				if ok {
+					return filePath, nil
+				}
+			}
+
+			if f.withoutExtension {
+				filePath := path.Join(searchPath, fileName)
+
+				ok, err := fileExists(fsys, filePath)
+				if err != nil {
+					return "", err
+				}
+
+				if ok {
+					return filePath, nil
+				}
+			}
+		}
+	}
+
+	return "", nil
+}
+
+func fileExists(fsys fs.FS, filePath string) (bool, error) {
+	fileInfo, err := fs.Stat(fsys, filePath)
+	if err == nil {
+		return !fileInfo.IsDir(), nil
+	}
+
+	if errors.Is(err, fs.ErrNotExist) {
+		return false, nil
+	}
+
+	return false, err
+}

vendor/github.com/spf13/viper/logger.go

@@ -0,0 +1,77 @@
+package viper
+
+import (
+	"fmt"
+
+	jww "github.com/spf13/jwalterweatherman"
+)
+
+// Logger is a unified interface for various logging use cases and practices, including:
+// 		- leveled logging
+// 		- structured logging
+type Logger interface {
+	// Trace logs a Trace event.
+	//
+	// Even more fine-grained information than Debug events.
+	// Loggers not supporting this level should fall back to Debug.
+	Trace(msg string, keyvals ...interface{})
+
+	// Debug logs a Debug event.
+	//
+	// A verbose series of information events.
+	// They are useful when debugging the system.
+	Debug(msg string, keyvals ...interface{})
+
+	// Info logs an Info event.
+	//
+	// General information about what's happening inside the system.
+	Info(msg string, keyvals ...interface{})
+
+	// Warn logs a Warn(ing) event.
+	//
+	// Non-critical events that should be looked at.
+	Warn(msg string, keyvals ...interface{})
+
+	// Error logs an Error event.
+	//
+	// Critical events that require immediate attention.
+	// Loggers commonly provide Fatal and Panic levels above Error level,
+	// but exiting and panicing is out of scope for a logging library.
+	Error(msg string, keyvals ...interface{})
+}
+
+type jwwLogger struct{}
+
+func (jwwLogger) Trace(msg string, keyvals ...interface{}) {
+	jww.TRACE.Printf(jwwLogMessage(msg, keyvals...))
+}
+
+func (jwwLogger) Debug(msg string, keyvals ...interface{}) {
+	jww.DEBUG.Printf(jwwLogMessage(msg, keyvals...))
+}
+
+func (jwwLogger) Info(msg string, keyvals ...interface{}) {
+	jww.INFO.Printf(jwwLogMessage(msg, keyvals...))
+}
+
+func (jwwLogger) Warn(msg string, keyvals ...interface{}) {
+	jww.WARN.Printf(jwwLogMessage(msg, keyvals...))
+}
+
+func (jwwLogger) Error(msg string, keyvals ...interface{}) {
+	jww.ERROR.Printf(jwwLogMessage(msg, keyvals...))
+}
+
+func jwwLogMessage(msg string, keyvals ...interface{}) string {
+	out := msg
+
+	if len(keyvals) > 0 && len(keyvals)%2 == 1 {
+		keyvals = append(keyvals, nil)
+	}
+
+	for i := 0; i <= len(keyvals)-2; i += 2 {
+		out = fmt.Sprintf("%s %v=%v", out, keyvals[i], keyvals[i+1])
+	}
+
+	return out
+}

vendor/github.com/spf13/viper/util.go

@@ -18,9 +18,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/spf13/afero"
 	"github.com/spf13/cast"
-	jww "github.com/spf13/jwalterweatherman"
 )
 
 // ConfigParseError denotes failing to parse configuration file.
@@ -88,8 +86,8 @@ func insensitiviseMap(m map[string]interface{}) {
 	}
 }
 
-func absPathify(inPath string) string {
-	jww.INFO.Println("Trying to resolve absolute path to", inPath)
+func absPathify(logger Logger, inPath string) string {
+	logger.Info("trying to resolve absolute path", "path", inPath)
 
 	if inPath == "$HOME" || strings.HasPrefix(inPath, "$HOME"+string(os.PathSeparator)) {
 		inPath = userHomeDir() + inPath[5:]
@@ -106,21 +104,9 @@ func absPathify(inPath string) string {
 		return filepath.Clean(p)
 	}
 
-	jww.ERROR.Println("Couldn't discover absolute path")
-	jww.ERROR.Println(err)
-	return ""
-}
+	logger.Error(fmt.Errorf("could not discover absolute path: %w", err).Error())
 
-// Check if file Exists
-func exists(fs afero.Fs, path string) (bool, error) {
-	stat, err := fs.Stat(path)
-	if err == nil {
-		return !stat.IsDir(), nil
-	}
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return false, err
+	return ""
 }
 
 func stringInSlice(a string, list []string) bool {

vendor/github.com/spf13/viper/viper.go

@@ -39,7 +39,6 @@ import (
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
-	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/pflag"
 	"github.com/subosito/gotenv"
 	"gopkg.in/ini.v1"
@@ -260,6 +259,8 @@ type Viper struct {
 	properties *properties.Properties
 
 	onConfigChange func(fsnotify.Event)
+
+	logger Logger
 }
 
 // New returns an initialized Viper instance.
@@ -267,7 +268,7 @@ func New() *Viper {
 	v := new(Viper)
 	v.keyDelim = "."
 	v.configName = "config"
-	v.configPermissions = os.FileMode(0644)
+	v.configPermissions = os.FileMode(0o644)
 	v.fs = afero.NewOsFs()
 	v.config = make(map[string]interface{})
 	v.override = make(map[string]interface{})
@@ -277,6 +278,7 @@ func New() *Viper {
 	v.env = make(map[string][]string)
 	v.aliases = make(map[string]string)
 	v.typeByDefValue = false
+	v.logger = jwwLogger{}
 
 	return v
 }
@@ -517,8 +519,9 @@ func AddConfigPath(in string) { v.AddConfigPath(in) }
 
 func (v *Viper) AddConfigPath(in string) {
 	if in != "" {
-		absin := absPathify(in)
-		jww.INFO.Println("adding", absin, "to paths to search")
+		absin := absPathify(v.logger, in)
+
+		v.logger.Info("adding path to search paths", "path", absin)
 		if !stringInSlice(absin, v.configPaths) {
 			v.configPaths = append(v.configPaths, absin)
 		}
@@ -542,7 +545,8 @@ func (v *Viper) AddRemoteProvider(provider, endpoint, path string) error {
 		return UnsupportedRemoteProviderError(provider)
 	}
 	if provider != "" && endpoint != "" {
-		jww.INFO.Printf("adding %s:%s to remote provider list", provider, endpoint)
+		v.logger.Info("adding remote provider", "provider", provider, "endpoint", endpoint)
+
 		rp := &defaultRemoteProvider{
 			endpoint: endpoint,
 			provider: provider,
@@ -574,7 +578,8 @@ func (v *Viper) AddSecureRemoteProvider(provider, endpoint, path, secretkeyring
 		return UnsupportedRemoteProviderError(provider)
 	}
 	if provider != "" && endpoint != "" {
-		jww.INFO.Printf("adding %s:%s to remote provider list", provider, endpoint)
+		v.logger.Info("adding remote provider", "provider", provider, "endpoint", endpoint)
+
 		rp := &defaultRemoteProvider{
 			endpoint:      endpoint,
 			provider:      provider,
@@ -1390,14 +1395,15 @@ func (v *Viper) registerAlias(alias string, key string) {
 			v.aliases[alias] = key
 		}
 	} else {
-		jww.WARN.Println("Creating circular reference alias", alias, key, v.realKey(key))
+		v.logger.Warn("creating circular reference alias", "alias", alias, "key", key, "real_key", v.realKey(key))
 	}
 }
 
 func (v *Viper) realKey(key string) string {
 	newkey, exists := v.aliases[key]
 	if exists {
-		jww.DEBUG.Println("Alias", key, "to", newkey)
+		v.logger.Debug("key is an alias", "alias", key, "to", newkey)
+
 		return v.realKey(newkey)
 	}
 	return key
@@ -1458,7 +1464,7 @@ func (v *Viper) Set(key string, value interface{}) {
 func ReadInConfig() error { return v.ReadInConfig() }
 
 func (v *Viper) ReadInConfig() error {
-	jww.INFO.Println("Attempting to read in config file")
+	v.logger.Info("attempting to read in config file")
 	filename, err := v.getConfigFile()
 	if err != nil {
 		return err
@@ -1468,7 +1474,7 @@ func (v *Viper) ReadInConfig() error {
 		return UnsupportedConfigError(v.getConfigType())
 	}
 
-	jww.DEBUG.Println("Reading file: ", filename)
+	v.logger.Debug("reading file", "file", filename)
 	file, err := afero.ReadFile(v.fs, filename)
 	if err != nil {
 		return err
@@ -1489,7 +1495,7 @@ func (v *Viper) ReadInConfig() error {
 func MergeInConfig() error { return v.MergeInConfig() }
 
 func (v *Viper) MergeInConfig() error {
-	jww.INFO.Println("Attempting to merge in config file")
+	v.logger.Info("attempting to merge in config file")
 	filename, err := v.getConfigFile()
 	if err != nil {
 		return err
@@ -1580,7 +1586,8 @@ func (v *Viper) SafeWriteConfigAs(filename string) error {
 }
 
 func (v *Viper) writeConfig(filename string, force bool) error {
-	jww.INFO.Println("Attempting to write configuration to file.")
+	v.logger.Info("attempting to write configuration to file")
+
 	var configType string
 
 	ext := filepath.Ext(filename)
@@ -1796,7 +1803,7 @@ func mergeMaps(
 	for sk, sv := range src {
 		tk := keyExists(sk, tgt)
 		if tk == "" {
-			jww.TRACE.Printf("tk=\"\", tgt[%s]=%v", sk, sv)
+			v.logger.Trace("", "tk", "\"\"", fmt.Sprintf("tgt[%s]", sk), sv)
 			tgt[sk] = sv
 			if itgt != nil {
 				itgt[sk] = sv
@@ -1806,7 +1813,7 @@ func mergeMaps(
 
 		tv, ok := tgt[tk]
 		if !ok {
-			jww.TRACE.Printf("tgt[%s] != ok, tgt[%s]=%v", tk, sk, sv)
+			v.logger.Trace("", fmt.Sprintf("ok[%s]", tk), false, fmt.Sprintf("tgt[%s]", sk), sv)
 			tgt[sk] = sv
 			if itgt != nil {
 				itgt[sk] = sv
@@ -1817,27 +1824,38 @@ func mergeMaps(
 		svType := reflect.TypeOf(sv)
 		tvType := reflect.TypeOf(tv)
 		if tvType != nil && svType != tvType { // Allow for the target to be nil
-			jww.ERROR.Printf(
-				"svType != tvType; key=%s, st=%v, tt=%v, sv=%v, tv=%v",
-				sk, svType, tvType, sv, tv)
+			v.logger.Error(
+				"svType != tvType",
+				"key", sk,
+				"st", svType,
+				"tt", tvType,
+				"sv", sv,
+				"tv", tv,
+			)
 			continue
 		}
 
-		jww.TRACE.Printf("processing key=%s, st=%v, tt=%v, sv=%v, tv=%v",
-			sk, svType, tvType, sv, tv)
+		v.logger.Trace(
+			"processing",
+			"key", sk,
+			"st", svType,
+			"tt", tvType,
+			"sv", sv,
+			"tv", tv,
+		)
 
 		switch ttv := tv.(type) {
 		case map[interface{}]interface{}:
-			jww.TRACE.Printf("merging maps (must convert)")
+			v.logger.Trace("merging maps (must convert)")
 			tsv := sv.(map[interface{}]interface{})
 			ssv := castToMapStringInterface(tsv)
 			stv := castToMapStringInterface(ttv)
 			mergeMaps(ssv, stv, ttv)
 		case map[string]interface{}:
-			jww.TRACE.Printf("merging maps")
+			v.logger.Trace("merging maps")
 			mergeMaps(sv.(map[string]interface{}), ttv, nil)
 		default:
-			jww.TRACE.Printf("setting value")
+			v.logger.Trace("setting value")
 			tgt[tk] = sv
 			if itgt != nil {
 				itgt[tk] = sv
@@ -1872,7 +1890,7 @@ func (v *Viper) getKeyValueConfig() error {
 	for _, rp := range v.remoteProviders {
 		val, err := v.getRemoteConfig(rp)
 		if err != nil {
-			jww.ERROR.Printf("get remote config: %s", err)
+			v.logger.Error(fmt.Errorf("get remote config: %w", err).Error())
 
 			continue
 		}
@@ -2108,39 +2126,6 @@ func (v *Viper) getConfigFile() (string, error) {
 	return v.configFile, nil
 }
 
-func (v *Viper) searchInPath(in string) (filename string) {
-	jww.DEBUG.Println("Searching for config in ", in)
-	for _, ext := range SupportedExts {
-		jww.DEBUG.Println("Checking for", filepath.Join(in, v.configName+"."+ext))
-		if b, _ := exists(v.fs, filepath.Join(in, v.configName+"."+ext)); b {
-			jww.DEBUG.Println("Found: ", filepath.Join(in, v.configName+"."+ext))
-			return filepath.Join(in, v.configName+"."+ext)
-		}
-	}
-
-	if v.configType != "" {
-		if b, _ := exists(v.fs, filepath.Join(in, v.configName)); b {
-			return filepath.Join(in, v.configName)
-		}
-	}
-
-	return ""
-}
-
-// Search all configPaths for any config file.
-// Returns the first path that exists (and is a config file).
-func (v *Viper) findConfigFile() (string, error) {
-	jww.INFO.Println("Searching for config in ", v.configPaths)
-
-	for _, cp := range v.configPaths {
-		file := v.searchInPath(cp)
-		if file != "" {
-			return file, nil
-		}
-	}
-	return "", ConfigFileNotFoundError{v.configName, fmt.Sprintf("%s", v.configPaths)}
-}
-
 // Debug prints all configuration registries for debugging
 // purposes.
 func Debug() { v.Debug() }

vendor/github.com/spf13/viper/viper_go1_15.go

@@ -0,0 +1,57 @@
+//go:build !go1.16 || !finder
+// +build !go1.16 !finder
+
+package viper
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+
+	"github.com/spf13/afero"
+)
+
+// Search all configPaths for any config file.
+// Returns the first path that exists (and is a config file).
+func (v *Viper) findConfigFile() (string, error) {
+	v.logger.Info("searching for config in paths", "paths", v.configPaths)
+
+	for _, cp := range v.configPaths {
+		file := v.searchInPath(cp)
+		if file != "" {
+			return file, nil
+		}
+	}
+	return "", ConfigFileNotFoundError{v.configName, fmt.Sprintf("%s", v.configPaths)}
+}
+
+func (v *Viper) searchInPath(in string) (filename string) {
+	v.logger.Debug("searching for config in path", "path", in)
+	for _, ext := range SupportedExts {
+		v.logger.Debug("checking if file exists", "file", filepath.Join(in, v.configName+"."+ext))
+		if b, _ := exists(v.fs, filepath.Join(in, v.configName+"."+ext)); b {
+			v.logger.Debug("found file", "file", filepath.Join(in, v.configName+"."+ext))
+			return filepath.Join(in, v.configName+"."+ext)
+		}
+	}
+
+	if v.configType != "" {
+		if b, _ := exists(v.fs, filepath.Join(in, v.configName)); b {
+			return filepath.Join(in, v.configName)
+		}
+	}
+
+	return ""
+}
+
+// Check if file Exists
+func exists(fs afero.Fs, path string) (bool, error) {
+	stat, err := fs.Stat(path)
+	if err == nil {
+		return !stat.IsDir(), nil
+	}
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	return false, err
+}

vendor/github.com/spf13/viper/viper_go1_16.go

@@ -0,0 +1,32 @@
+//go:build go1.16 && finder
+// +build go1.16,finder
+
+package viper
+
+import (
+	"fmt"
+
+	"github.com/spf13/afero"
+)
+
+// Search all configPaths for any config file.
+// Returns the first path that exists (and is a config file).
+func (v *Viper) findConfigFile() (string, error) {
+	finder := finder{
+		paths:            v.configPaths,
+		fileNames:        []string{v.configName},
+		extensions:       SupportedExts,
+		withoutExtension: v.configType != "",
+	}
+
+	file, err := finder.Find(afero.NewIOFS(v.fs))
+	if err != nil {
+		return "", err
+	}
+
+	if file == "" {
+		return "", ConfigFileNotFoundError{v.configName, fmt.Sprintf("%s", v.configPaths)}
+	}
+
+	return file, nil
+}

vendor/github.com/spf13/viper/watch.go

@@ -1,3 +1,4 @@
+//go:build !js
 // +build !js
 
 package viper

vendor/github.com/tdewolff/parse/v2/html/util.go

@@ -5,7 +5,7 @@ var (
 	doubleQuoteEntityBytes = []byte(""")
 )
 
-// EscapeAttrVal returns the escaped attribute value bytes without quotes.
+// EscapeAttrVal returns the escaped attribute value bytes with quotes. Either single or double quotes are used, whichever is shorter. If there are no quotes present in the value and the value is in HTML (not XML), it will return the value without quotes.
 func EscapeAttrVal(buf *[]byte, orig, b []byte, isXML bool) []byte {
 	singles := 0
 	doubles := 0

vendor/github.com/uptrace/bun/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.0.19](https://github.com/uptrace/bun/compare/v1.0.18...v1.0.19) (2021-11-30)
+
+
+### Features
+
+* add support for column:name to specify column name ([e37b460](https://github.com/uptrace/bun/commit/e37b4602823babc8221970e086cfed90c6ad4cf4))
+
+
+
 ## [1.0.18](https://github.com/uptrace/bun/compare/v1.0.17...v1.0.18) (2021-11-24)
 
 

vendor/github.com/uptrace/bun/README.md

@@ -29,10 +29,10 @@ Main features are:
 
 Resources:
 
-- [Discussions](https://github.com/uptrace/bun/discussions).
-- [Newsletter](https://blog.uptrace.dev/pages/newsletter.html) to get latest updates.
+- [**Get started**](https://bun.uptrace.dev/guide/getting-started.html)
 - [Examples](https://github.com/uptrace/bun/tree/master/example)
-- [Documentation](https://bun.uptrace.dev/)
+- [Discussions](https://github.com/uptrace/bun/discussions)
+- [Newsletter](https://blog.uptrace.dev/pages/newsletter.html) to get latest updates.
 - [Reference](https://pkg.go.dev/github.com/uptrace/bun)
 - [Starter kit](https://github.com/go-bun/bun-starter-kit)
 
@@ -156,147 +156,8 @@ go get github.com/uptrace/bun
 You also need to install a database/sql driver and the corresponding Bun
 [dialect](https://bun.uptrace.dev/guide/drivers.html).
 
-## Quickstart
-
-First you need to create a `sql.DB`. Here we are using the
-[sqliteshim](https://pkg.go.dev/github.com/uptrace/bun/driver/sqliteshim) driver which chooses
-between [modernc.org/sqlite](https://modernc.org/sqlite/) and
-[mattn/go-sqlite3](https://github.com/mattn/go-sqlite3) depending on your platform.
-
-```go
-import "github.com/uptrace/bun/driver/sqliteshim"
-
-sqldb, err := sql.Open(sqliteshim.ShimName, "file::memory:?cache=shared")
-if err != nil {
-	panic(err)
-}
-```
-
-And then create a `bun.DB` on top of it using the corresponding SQLite
-[dialect](https://bun.uptrace.dev/guide/drivers.html) that comes with Bun:
-
-```go
-import (
-	"github.com/uptrace/bun"
-	"github.com/uptrace/bun/dialect/sqlitedialect"
-)
-
-db := bun.NewDB(sqldb, sqlitedialect.New())
-```
-
-Now you are ready to issue some queries:
-
-```go
-type User struct {
-	ID   int64
-	Name string
-}
-
-user := new(User)
-err := db.NewSelect().
-	Model(user).
-	Where("name != ?", "").
-	OrderExpr("id ASC").
-	Limit(1).
-	Scan(ctx)
-```
-
-## Basic example
-
-To provide initial data for our [example](/example/basic/), we will use Bun
-[fixtures](https://bun.uptrace.dev/guide/fixtures.html):
-
-```go
-import "github.com/uptrace/bun/dbfixture"
-
-// Register models for the fixture.
-db.RegisterModel((*User)(nil), (*Story)(nil))
-
-// WithRecreateTables tells Bun to drop existing tables and create new ones.
-fixture := dbfixture.New(db, dbfixture.WithRecreateTables())
-
-// Load fixture.yml which contains data for User and Story models.
-if err := fixture.Load(ctx, os.DirFS("."), "fixture.yml"); err != nil {
-	panic(err)
-}
-```
-
-The `fixture.yml` looks like this:
-
-```yaml
-- model: User
-  rows:
-    - _id: admin
-      name: admin
-      emails: ['admin1@admin', 'admin2@admin']
-    - _id: root
-      name: root
-      emails: ['root1@root', 'root2@root']
-
-- model: Story
-  rows:
-    - title: Cool story
-      author_id: '{{ $.User.admin.ID }}'
-```
-
-To select all users:
-
-```go
-users := make([]User, 0)
-if err := db.NewSelect().Model(&users).OrderExpr("id ASC").Scan(ctx); err != nil {
-	panic(err)
-}
-```
-
-To select a single user by id:
-
-```go
-user1 := new(User)
-if err := db.NewSelect().Model(user1).Where("id = ?", 1).Scan(ctx); err != nil {
-	panic(err)
-}
-```
-
-To select a story and the associated author in a single query:
-
-```go
-story := new(Story)
-if err := db.NewSelect().
-	Model(story).
-	Relation("Author").
-	Limit(1).
-	Scan(ctx); err != nil {
-	panic(err)
-}
-```
-
-To select a user into a map:
-
-```go
-m := make(map[string]interface{})
-if err := db.NewSelect().
-	Model((*User)(nil)).
-	Limit(1).
-	Scan(ctx, &m); err != nil {
-	panic(err)
-}
-```
-
-To select all users scanning each column into a separate slice:
-
-```go
-var ids []int64
-var names []string
-if err := db.NewSelect().
-	ColumnExpr("id, name").
-	Model((*User)(nil)).
-	OrderExpr("id ASC").
-	Scan(ctx, &ids, &names); err != nil {
-	panic(err)
-}
-```
-
-For more details, please consult [docs](https://bun.uptrace.dev/) and check [examples](example).
+See [**Getting started**](https://bun.uptrace.dev/guide/getting-started.html) guide and check
+[examples](example).
 
 ## Contributors
 

vendor/github.com/uptrace/bun/db.go

@@ -203,6 +203,15 @@ func (db *DB) Formatter() schema.Formatter {
 	return db.fmter
 }
 
+// UpdateFQN returns a fully qualified column name. For MySQL, it returns the column name with
+// the table alias. For other RDBMS, it returns just the column name.
+func (db *DB) UpdateFQN(alias, column string) Ident {
+	if db.HasFeature(feature.UpdateMultiTable) {
+		return Ident(alias + "." + column)
+	}
+	return Ident(column)
+}
+
 // HasFeature uses feature package to report whether the underlying DBMS supports this feature.
 func (db *DB) HasFeature(feat feature.Feature) bool {
 	return db.fmter.HasFeature(feat)

vendor/github.com/uptrace/bun/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bun",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "main": "index.js",
   "repository": "git@github.com:uptrace/bun.git",
   "author": "Vladimir Mihailenco <vladimir.webdev@gmail.com>",

vendor/github.com/uptrace/bun/query_update.go

@@ -452,9 +452,12 @@ func (q *UpdateQuery) afterUpdateHook(ctx context.Context) error {
 
 // FQN returns a fully qualified column name. For MySQL, it returns the column name with
 // the table alias. For other RDBMS, it returns just the column name.
-func (q *UpdateQuery) FQN(name string) Ident {
-	if q.db.fmter.HasFeature(feature.UpdateMultiTable) {
-		return Ident(q.table.Alias + "." + name)
+func (q *UpdateQuery) FQN(column string) Ident {
+	if q.table == nil {
+		panic("UpdateQuery.FQN requires a model")
 	}
-	return Ident(name)
+	if q.db.HasFeature(feature.UpdateMultiTable) {
+		return Ident(q.table.Alias + "." + column)
+	}
+	return Ident(column)
 }

vendor/github.com/uptrace/bun/schema/table.go

@@ -285,8 +285,8 @@ func (t *Table) processBaseModelField(f reflect.StructField) {
 
 	if isKnownTableOption(tag.Name) {
 		internal.Warn.Printf(
-			"%s.%s tag name %q is also an option name; is it a mistake?",
-			t.TypeName, f.Name, tag.Name,
+			"%s.%s tag name %q is also an option name, is it a mistake? Try table:%s.",
+			t.TypeName, f.Name, tag.Name, tag.Name,
 		)
 	}
 
@@ -300,6 +300,10 @@ func (t *Table) processBaseModelField(f reflect.StructField) {
 		t.setName(tag.Name)
 	}
 
+	if s, ok := tag.Option("table"); ok {
+		t.setName(s)
+	}
+
 	if s, ok := tag.Option("select"); ok {
 		t.SQLNameForSelects = t.quoteTableName(s)
 	}
@@ -312,19 +316,23 @@ func (t *Table) processBaseModelField(f reflect.StructField) {
 
 //nolint
 func (t *Table) newField(f reflect.StructField, index []int) *Field {
+	sqlName := internal.Underscore(f.Name)
 	tag := tagparser.Parse(f.Tag.Get("bun"))
 
-	sqlName := internal.Underscore(f.Name)
 	if tag.Name != "" && tag.Name != sqlName {
 		if isKnownFieldOption(tag.Name) {
 			internal.Warn.Printf(
-				"%s.%s tag name %q is also an option name; is it a mistake?",
-				t.TypeName, f.Name, tag.Name,
+				"%s.%s tag name %q is also an option name, is it a mistake? Try column:%s.",
+				t.TypeName, f.Name, tag.Name, tag.Name,
 			)
 		}
 		sqlName = tag.Name
 	}
 
+	if s, ok := tag.Option("column"); ok {
+		sqlName = s
+	}
+
 	for name := range tag.Options {
 		if !isKnownFieldOption(name) {
 			internal.Warn.Printf("%s.%s has unknown tag option: %q", t.TypeName, f.Name, name)
@@ -854,7 +862,7 @@ func appendNew(dst []int, src ...int) []int {
 
 func isKnownTableOption(name string) bool {
 	switch name {
-	case "alias", "select":
+	case "table", "alias", "select":
 		return true
 	}
 	return false
@@ -862,7 +870,8 @@ func isKnownTableOption(name string) bool {
 
 func isKnownFieldOption(name string) bool {
 	switch name {
-	case "alias",
+	case "column",
+		"alias",
 		"type",
 		"array",
 		"hstore",

vendor/github.com/uptrace/bun/version.go

@@ -2,5 +2,5 @@ package bun
 
 // Version is the current release version.
 func Version() string {
-	return "1.0.18"
+	return "1.0.19"
 }