diff --git a/cmd/run-stage.go b/cmd/run-stage.go
index 9dd687792a..0519d35a0c 100644
--- a/cmd/run-stage.go
+++ b/cmd/run-stage.go
@@ -38,6 +38,8 @@ func NewRunStage(root *cobra.Command) *cobra.Command {
return elementalError.NewFromError(err, elementalError.ReadingRunConfig)
}
+ cmd.SilenceUsage = true
+
err = utils.RunStage(&cfg.Config, args[0], cfg.Strict, cfg.CloudInitPaths...)
return elementalError.NewFromError(err, elementalError.CloudInitRunStage)
},
diff --git a/go.mod b/go.mod
index 8a59b91223..e70a3ebcf9 100644
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
github.com/onsi/ginkgo/v2 v2.20.2
github.com/onsi/gomega v1.34.2
github.com/pkg/errors v0.9.1
- github.com/rancher/yip v1.9.3
+ github.com/rancher/yip v1.9.5
github.com/sanity-io/litter v1.5.5
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af
github.com/spf13/cobra v1.8.1
@@ -31,11 +31,7 @@ require (
)
require (
- dario.cat/mergo v1.0.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
- github.com/Masterminds/goutils v1.1.1 // indirect
- github.com/Masterminds/semver/v3 v3.3.0 // indirect
- github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -52,13 +48,10 @@ require (
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
- github.com/huandu/xstrings v1.5.0 // indirect
github.com/itchyny/gojq v0.12.16 // indirect
github.com/itchyny/timefmt-go v0.1.6 // indirect
github.com/kendru/darwin/go/depgraph v0.0.0-20230809052043-4d1c7e9d1767 // indirect
github.com/mauromorales/xpasswd v0.4.0 // indirect
- github.com/mitchellh/copystructure v1.2.0 // indirect
- github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/mudler/entities v0.8.1 // indirect
@@ -72,14 +65,13 @@ require (
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/satori/go.uuid v1.2.0 // indirect
- github.com/shopspring/decimal v1.4.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/tredoe/osutil v1.5.0 // indirect
github.com/ulikunitz/xz v0.5.12 // indirect
github.com/vishvananda/netlink v1.3.0 // indirect
github.com/vishvananda/netns v0.0.4 // indirect
github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 // indirect
- github.com/zcalusic/sysinfo v1.1.0 // indirect
+ github.com/zcalusic/sysinfo v1.1.2 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
@@ -130,11 +122,11 @@ require (
github.com/twpayne/go-vfs/v4 v4.3.0
github.com/vbatts/tar-split v0.11.3 // indirect
go.opencensus.io v0.24.0 // indirect
- golang.org/x/net v0.28.0 // indirect
+ golang.org/x/net v0.29.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
- golang.org/x/tools v0.24.0 // indirect
+ golang.org/x/tools v0.25.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index eb55eb8e5f..56269725c3 100644
--- a/go.sum
+++ b/go.sum
@@ -1,16 +1,8 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
-github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
-github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
-github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
-github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
-github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim v0.11.7 h1:vl/nj3Bar/CvJSYo7gIQPyRWc9f3c6IeSNavBTSZNZQ=
@@ -155,8 +147,6 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
-github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/itchyny/gojq v0.12.16 h1:yLfgLxhIr/6sJNVmYfQjTIv0jGctu6/DgDoivmxTr7g=
@@ -184,14 +174,10 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
github.com/mauromorales/xpasswd v0.4.0 h1:Jf6mfA8lwQsYzwgfQADPDGV7l/liAvRrnG+nQTPy0j8=
github.com/mauromorales/xpasswd v0.4.0/go.mod h1:Z3+aY19mhNfcGi3st0+RAVSz2vC+pyoju2S/FPN8kEg=
-github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
-github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
-github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
@@ -238,8 +224,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/rancher-sandbox/linuxkit v1.0.2 h1:mUFPL2Mgl1XZ5H82ABR57t5H2G2Qd+lu3gMYvUGmeZo=
github.com/rancher-sandbox/linuxkit v1.0.2/go.mod h1:n6Fkjc5qoMeWrnLSA5oqUF8ZzFKMrM960CtBwfvH1ZM=
-github.com/rancher/yip v1.9.3 h1:0+k3kWZPV8bg5wsTEYG1qNyD69/rTDYRMlABSMLI4+U=
-github.com/rancher/yip v1.9.3/go.mod h1:UFoCEbbxsQXZ59G5xbQBlQuJSfyELzDzrB8es7/VWLY=
+github.com/rancher/yip v1.9.5 h1:ahmwkItnpgiIpg5pIcIEwTDT557dMUmc9vJr7OK6kGc=
+github.com/rancher/yip v1.9.5/go.mod h1:a8qGuQfa2TSR5R8/L8HuxoMlX/Vqp7piFtQj2Q0yH/4=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
@@ -252,8 +238,6 @@ github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQ
github.com/sanity-io/litter v1.5.5/go.mod h1:9gzJgR2i4ZpjZHsKvUXIRQVk7P+yM3e+jAF7bU2UI5U=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
-github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af h1:Sp5TG9f7K39yfB+If0vjp97vuT74F72r8hfRpP8jLU0=
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -302,8 +286,8 @@ github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O
github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zcalusic/sysinfo v1.1.0 h1:79Hqn8h4poVz6T57/4ezXbT5ZkZbZm7u1YU1C4paMyk=
-github.com/zcalusic/sysinfo v1.1.0/go.mod h1:NX+qYnWGtJVPV0yWldff9uppNKU4h40hJIRPf/pGLv4=
+github.com/zcalusic/sysinfo v1.1.2 h1:38KUgZQmCxlN9vUTt4miis4rU5ISJXGXOJ2rY7bMC8g=
+github.com/zcalusic/sysinfo v1.1.2/go.mod h1:NX+qYnWGtJVPV0yWldff9uppNKU4h40hJIRPf/pGLv4=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
@@ -349,8 +333,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -390,8 +374,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
-golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
+golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
+golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-boot.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-boot.service
index fb0d5c9c52..a94643d411 100644
--- a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-boot.service
+++ b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-boot.service
@@ -5,7 +5,7 @@ Before=getty.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage boot
+ExecStart=/usr/bin/elemental run-stage --strict boot
[Install]
WantedBy=multi-user.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-fs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-fs.service
index 70b4163b92..077e5878e7 100644
--- a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-fs.service
+++ b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-fs.service
@@ -8,7 +8,7 @@ Before=sysinit.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage fs
+ExecStart=/usr/bin/elemental run-stage --strict fs
[Install]
WantedBy=sysinit.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-initramfs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-initramfs.service
index 2372997e9d..3c023c5d42 100644
--- a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-initramfs.service
+++ b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-initramfs.service
@@ -10,7 +10,7 @@ RootDirectory=/sysroot
BindPaths=/proc /sys /dev /run /tmp
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage initramfs
+ExecStart=/usr/bin/elemental run-stage --strict initramfs
[Install]
WantedBy=initrd.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-network.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-network.service
index 37a3245b19..4cd16411f1 100644
--- a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-network.service
+++ b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-network.service
@@ -8,7 +8,7 @@ Nice=19
IOSchedulingClass=2
IOSchedulingPriority=7
Type=oneshot
-ExecStart=/usr/bin/elemental run-stage network
+ExecStart=/usr/bin/elemental run-stage --strict network
TimeoutStopSec=180
KillMode=process
KillSignal=SIGINT
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-pre-rootfs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-pre-rootfs.service
index 4b68ee88df..96111e8da0 100644
--- a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-pre-rootfs.service
+++ b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-pre-rootfs.service
@@ -11,7 +11,7 @@ Conflicts=initrd-switch-root.target
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/bin/elemental run-stage pre-rootfs
+ExecStart=/usr/bin/elemental run-stage --strict pre-rootfs
[Install]
-WantedBy=initrd-root-device.target
\ No newline at end of file
+WantedBy=initrd-root-device.target
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-reconcile.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-reconcile.service
index a5dc97b2b3..5e82999b2e 100644
--- a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-reconcile.service
+++ b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-reconcile.service
@@ -6,7 +6,7 @@ Nice=19
IOSchedulingClass=2
IOSchedulingPriority=7
Type=oneshot
-ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/elemental run-stage reconcile"
+ExecStart=/bin/bash -c "systemd-inhibit /usr/bin/elemental run-stage --strict reconcile"
TimeoutStopSec=180
KillMode=process
KillSignal=SIGINT
diff --git a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-rootfs.service b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-rootfs.service
index 225f356818..1a38cde14d 100644
--- a/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-rootfs.service
+++ b/pkg/features/embedded/elemental-setup/etc/systemd/system/elemental-setup-rootfs.service
@@ -10,7 +10,7 @@ Conflicts=initrd-switch-root.target
Type=oneshot
RemainAfterExit=yes
ExecStartPre=/usr/bin/ln -sf -t / /sysroot/system
-ExecStart=/usr/bin/elemental run-stage rootfs
+ExecStart=/usr/bin/elemental run-stage --strict rootfs
[Install]
WantedBy=initrd-root-fs.target
diff --git a/vendor/dario.cat/mergo/.deepsource.toml b/vendor/dario.cat/mergo/.deepsource.toml
deleted file mode 100644
index a8bc979e02..0000000000
--- a/vendor/dario.cat/mergo/.deepsource.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-version = 1
-
-test_patterns = [
- "*_test.go"
-]
-
-[[analyzers]]
-name = "go"
-enabled = true
-
- [analyzers.meta]
- import_path = "dario.cat/mergo"
\ No newline at end of file
diff --git a/vendor/dario.cat/mergo/.gitignore b/vendor/dario.cat/mergo/.gitignore
deleted file mode 100644
index 45ad0f1ae3..0000000000
--- a/vendor/dario.cat/mergo/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-#### joe made this: http://goel.io/joe
-
-#### go ####
-# Binaries for programs and plugins
-*.exe
-*.dll
-*.so
-*.dylib
-
-# Test binary, build with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Golang/Intellij
-.idea
-
-# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
-.glide/
-
-#### vim ####
-# Swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-v][a-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-
-# Temporary
-.netrwhist
-*~
-# Auto-generated tag files
-tags
diff --git a/vendor/dario.cat/mergo/.travis.yml b/vendor/dario.cat/mergo/.travis.yml
deleted file mode 100644
index d324c43ba4..0000000000
--- a/vendor/dario.cat/mergo/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-language: go
-arch:
- - amd64
- - ppc64le
-install:
- - go get -t
- - go get golang.org/x/tools/cmd/cover
- - go get github.com/mattn/goveralls
-script:
- - go test -race -v ./...
-after_script:
- - $HOME/gopath/bin/goveralls -service=travis-ci -repotoken $COVERALLS_TOKEN
diff --git a/vendor/dario.cat/mergo/CODE_OF_CONDUCT.md b/vendor/dario.cat/mergo/CODE_OF_CONDUCT.md
deleted file mode 100644
index 469b44907a..0000000000
--- a/vendor/dario.cat/mergo/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at i@dario.im. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/dario.cat/mergo/CONTRIBUTING.md b/vendor/dario.cat/mergo/CONTRIBUTING.md
deleted file mode 100644
index 0a1ff9f94d..0000000000
--- a/vendor/dario.cat/mergo/CONTRIBUTING.md
+++ /dev/null
@@ -1,112 +0,0 @@
-
-# Contributing to mergo
-
-First off, thanks for taking the time to contribute! ❤️
-
-All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
-
-> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
-> - Star the project
-> - Tweet about it
-> - Refer this project in your project's readme
-> - Mention the project at local meetups and tell your friends/colleagues
-
-
-## Table of Contents
-
-- [Code of Conduct](#code-of-conduct)
-- [I Have a Question](#i-have-a-question)
-- [I Want To Contribute](#i-want-to-contribute)
-- [Reporting Bugs](#reporting-bugs)
-- [Suggesting Enhancements](#suggesting-enhancements)
-
-## Code of Conduct
-
-This project and everyone participating in it is governed by the
-[mergo Code of Conduct](https://github.com/imdario/mergoblob/master/CODE_OF_CONDUCT.md).
-By participating, you are expected to uphold this code. Please report unacceptable behavior
-to <>.
-
-
-## I Have a Question
-
-> If you want to ask a question, we assume that you have read the available [Documentation](https://pkg.go.dev/github.com/imdario/mergo).
-
-Before you ask a question, it is best to search for existing [Issues](https://github.com/imdario/mergo/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
-
-If you then still feel the need to ask a question and need clarification, we recommend the following:
-
-- Open an [Issue](https://github.com/imdario/mergo/issues/new).
-- Provide as much context as you can about what you're running into.
-- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.
-
-We will then take care of the issue as soon as possible.
-
-## I Want To Contribute
-
-> ### Legal Notice
-> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
-
-### Reporting Bugs
-
-
-#### Before Submitting a Bug Report
-
-A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
-
-- Make sure that you are using the latest version.
-- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](). If you are looking for support, you might want to check [this section](#i-have-a-question)).
-- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/imdario/mergoissues?q=label%3Abug).
-- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
-- Collect information about the bug:
-- Stack trace (Traceback)
-- OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
-- Version of the interpreter, compiler, SDK, runtime environment, package manager, depending on what seems relevant.
-- Possibly your input and the output
-- Can you reliably reproduce the issue? And can you also reproduce it with older versions?
-
-
-#### How Do I Submit a Good Bug Report?
-
-> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to .
-
-
-We use GitHub issues to track bugs and errors. If you run into an issue with the project:
-
-- Open an [Issue](https://github.com/imdario/mergo/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
-- Explain the behavior you would expect and the actual behavior.
-- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
-- Provide the information you collected in the previous section.
-
-Once it's filed:
-
-- The project team will label the issue accordingly.
-- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
-- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be implemented by someone.
-
-### Suggesting Enhancements
-
-This section guides you through submitting an enhancement suggestion for mergo, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
-
-
-#### Before Submitting an Enhancement
-
-- Make sure that you are using the latest version.
-- Read the [documentation]() carefully and find out if the functionality is already covered, maybe by an individual configuration.
-- Perform a [search](https://github.com/imdario/mergo/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
-- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
-
-
-#### How Do I Submit a Good Enhancement Suggestion?
-
-Enhancement suggestions are tracked as [GitHub issues](https://github.com/imdario/mergo/issues).
-
-- Use a **clear and descriptive title** for the issue to identify the suggestion.
-- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
-- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
-- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux.
-- **Explain why this enhancement would be useful** to most mergo users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
-
-
-## Attribution
-This guide is based on the **contributing-gen**. [Make your own](https://github.com/bttger/contributing-gen)!
diff --git a/vendor/dario.cat/mergo/LICENSE b/vendor/dario.cat/mergo/LICENSE
deleted file mode 100644
index 686680298d..0000000000
--- a/vendor/dario.cat/mergo/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2013 Dario Castañé. All rights reserved.
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/dario.cat/mergo/README.md b/vendor/dario.cat/mergo/README.md
deleted file mode 100644
index 0b3c488893..0000000000
--- a/vendor/dario.cat/mergo/README.md
+++ /dev/null
@@ -1,258 +0,0 @@
-# Mergo
-
-[![GitHub release][5]][6]
-[![GoCard][7]][8]
-[![Test status][1]][2]
-[![OpenSSF Scorecard][21]][22]
-[![OpenSSF Best Practices][19]][20]
-[![Coverage status][9]][10]
-[![Sourcegraph][11]][12]
-[![FOSSA status][13]][14]
-
-[![GoDoc][3]][4]
-[![Become my sponsor][15]][16]
-[![Tidelift][17]][18]
-
-[1]: https://github.com/imdario/mergo/workflows/tests/badge.svg?branch=master
-[2]: https://github.com/imdario/mergo/actions/workflows/tests.yml
-[3]: https://godoc.org/github.com/imdario/mergo?status.svg
-[4]: https://godoc.org/github.com/imdario/mergo
-[5]: https://img.shields.io/github/release/imdario/mergo.svg
-[6]: https://github.com/imdario/mergo/releases
-[7]: https://goreportcard.com/badge/imdario/mergo
-[8]: https://goreportcard.com/report/github.com/imdario/mergo
-[9]: https://coveralls.io/repos/github/imdario/mergo/badge.svg?branch=master
-[10]: https://coveralls.io/github/imdario/mergo?branch=master
-[11]: https://sourcegraph.com/github.com/imdario/mergo/-/badge.svg
-[12]: https://sourcegraph.com/github.com/imdario/mergo?badge
-[13]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fimdario%2Fmergo.svg?type=shield
-[14]: https://app.fossa.io/projects/git%2Bgithub.com%2Fimdario%2Fmergo?ref=badge_shield
-[15]: https://img.shields.io/github/sponsors/imdario
-[16]: https://github.com/sponsors/imdario
-[17]: https://tidelift.com/badges/package/go/github.com%2Fimdario%2Fmergo
-[18]: https://tidelift.com/subscription/pkg/go-github.com-imdario-mergo
-[19]: https://bestpractices.coreinfrastructure.org/projects/7177/badge
-[20]: https://bestpractices.coreinfrastructure.org/projects/7177
-[21]: https://api.securityscorecards.dev/projects/github.com/imdario/mergo/badge
-[22]: https://api.securityscorecards.dev/projects/github.com/imdario/mergo
-
-A helper to merge structs and maps in Golang. Useful for configuration default values, avoiding messy if-statements.
-
-Mergo merges same-type structs and maps by setting default values in zero-value fields. Mergo won't merge unexported (private) fields. It will do recursively any exported one. It also won't merge structs inside maps (because they are not addressable using Go reflection).
-
-Also a lovely [comune](http://en.wikipedia.org/wiki/Mergo) (municipality) in the Province of Ancona in the Italian region of Marche.
-
-## Status
-
-Mergo is stable and frozen, ready for production. Check a short list of the projects using at large scale it [here](https://github.com/imdario/mergo#mergo-in-the-wild).
-
-No new features are accepted. They will be considered for a future v2 that improves the implementation and fixes bugs for corner cases.
-
-### Important notes
-
-#### 1.0.0
-
-In [1.0.0](//github.com/imdario/mergo/releases/tag/1.0.0) Mergo moves to a vanity URL `dario.cat/mergo`. No more v1 versions will be released.
-
-If the vanity URL is causing issues in your project due to a dependency pulling Mergo - it isn't a direct dependency in your project - it is recommended to use [replace](https://github.com/golang/go/wiki/Modules#when-should-i-use-the-replace-directive) to pin the version to the last one with the old import URL:
-
-```
-replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
-```
-
-#### 0.3.9
-
-Please keep in mind that a problematic PR broke [0.3.9](//github.com/imdario/mergo/releases/tag/0.3.9). I reverted it in [0.3.10](//github.com/imdario/mergo/releases/tag/0.3.10), and I consider it stable but not bug-free. Also, this version adds support for go modules.
-
-Keep in mind that in [0.3.2](//github.com/imdario/mergo/releases/tag/0.3.2), Mergo changed `Merge()`and `Map()` signatures to support [transformers](#transformers). I added an optional/variadic argument so that it won't break the existing code.
-
-If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with ```go get -u dario.cat/mergo```. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
-
-### Donations
-
-If Mergo is useful to you, consider buying me a coffee, a beer, or making a monthly donation to allow me to keep building great free software. :heart_eyes:
-
-
-
-
-### Mergo in the wild
-
-Mergo is used by [thousands](https://deps.dev/go/dario.cat%2Fmergo/v1.0.0/dependents) [of](https://deps.dev/go/github.com%2Fimdario%2Fmergo/v0.3.16/dependents) [projects](https://deps.dev/go/github.com%2Fimdario%2Fmergo/v0.3.12), including:
-
-* [containerd/containerd](https://github.com/containerd/containerd)
-* [datadog/datadog-agent](https://github.com/datadog/datadog-agent)
-* [docker/cli/](https://github.com/docker/cli/)
-* [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser)
-* [go-micro/go-micro](https://github.com/go-micro/go-micro)
-* [grafana/loki](https://github.com/grafana/loki)
-* [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
-* [masterminds/sprig](github.com/Masterminds/sprig)
-* [moby/moby](https://github.com/moby/moby)
-* [slackhq/nebula](https://github.com/slackhq/nebula)
-* [volcano-sh/volcano](https://github.com/volcano-sh/volcano)
-
-## Install
-
- go get dario.cat/mergo
-
- // use in your .go code
- import (
- "dario.cat/mergo"
- )
-
-## Usage
-
-You can only merge same-type structs with exported fields initialized as zero value of their type and same-types maps. Mergo won't merge unexported (private) fields but will do recursively any exported one. It won't merge empty structs value as [they are zero values](https://golang.org/ref/spec#The_zero_value) too. Also, maps will be merged recursively except for structs inside maps (because they are not addressable using Go reflection).
-
-```go
-if err := mergo.Merge(&dst, src); err != nil {
- // ...
-}
-```
-
-Also, you can merge overwriting values using the transformer `WithOverride`.
-
-```go
-if err := mergo.Merge(&dst, src, mergo.WithOverride); err != nil {
- // ...
-}
-```
-
-If you need to override pointers, so the source pointer's value is assigned to the destination's pointer, you must use `WithoutDereference`:
-
-```go
-package main
-
-import (
- "fmt"
-
- "dario.cat/mergo"
-)
-
-type Foo struct {
- A *string
- B int64
-}
-
-func main() {
- first := "first"
- second := "second"
- src := Foo{
- A: &first,
- B: 2,
- }
-
- dest := Foo{
- A: &second,
- B: 1,
- }
-
- mergo.Merge(&dest, src, mergo.WithOverride, mergo.WithoutDereference)
-}
-```
-
-Additionally, you can map a `map[string]interface{}` to a struct (and otherwise, from struct to map), following the same restrictions as in `Merge()`. Keys are capitalized to find each corresponding exported field.
-
-```go
-if err := mergo.Map(&dst, srcMap); err != nil {
- // ...
-}
-```
-
-Warning: if you map a struct to map, it won't do it recursively. Don't expect Mergo to map struct members of your struct as `map[string]interface{}`. They will be just assigned as values.
-
-Here is a nice example:
-
-```go
-package main
-
-import (
- "fmt"
- "dario.cat/mergo"
-)
-
-type Foo struct {
- A string
- B int64
-}
-
-func main() {
- src := Foo{
- A: "one",
- B: 2,
- }
- dest := Foo{
- A: "two",
- }
- mergo.Merge(&dest, src)
- fmt.Println(dest)
- // Will print
- // {two 2}
-}
-```
-
-Note: if test are failing due missing package, please execute:
-
- go get gopkg.in/yaml.v3
-
-### Transformers
-
-Transformers allow to merge specific types differently than in the default behavior. In other words, now you can customize how some types are merged. For example, `time.Time` is a struct; it doesn't have zero value but IsZero can return true because it has fields with zero value. How can we merge a non-zero `time.Time`?
-
-```go
-package main
-
-import (
- "fmt"
- "dario.cat/mergo"
- "reflect"
- "time"
-)
-
-type timeTransformer struct {
-}
-
-func (t timeTransformer) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
- if typ == reflect.TypeOf(time.Time{}) {
- return func(dst, src reflect.Value) error {
- if dst.CanSet() {
- isZero := dst.MethodByName("IsZero")
- result := isZero.Call([]reflect.Value{})
- if result[0].Bool() {
- dst.Set(src)
- }
- }
- return nil
- }
- }
- return nil
-}
-
-type Snapshot struct {
- Time time.Time
- // ...
-}
-
-func main() {
- src := Snapshot{time.Now()}
- dest := Snapshot{}
- mergo.Merge(&dest, src, mergo.WithTransformers(timeTransformer{}))
- fmt.Println(dest)
- // Will print
- // { 2018-01-12 01:15:00 +0000 UTC m=+0.000000001 }
-}
-```
-
-## Contact me
-
-If I can help you, you have an idea or you are using Mergo in your projects, don't hesitate to drop me a line (or a pull request): [@im_dario](https://twitter.com/im_dario)
-
-## About
-
-Written by [Dario Castañé](http://dario.im).
-
-## License
-
-[BSD 3-Clause](http://opensource.org/licenses/BSD-3-Clause) license, as [Go language](http://golang.org/LICENSE).
-
-[](https://app.fossa.io/projects/git%2Bgithub.com%2Fimdario%2Fmergo?ref=badge_large)
diff --git a/vendor/dario.cat/mergo/SECURITY.md b/vendor/dario.cat/mergo/SECURITY.md
deleted file mode 100644
index a5de61f77b..0000000000
--- a/vendor/dario.cat/mergo/SECURITY.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported |
-| ------- | ------------------ |
-| 0.3.x | :white_check_mark: |
-| < 0.3 | :x: |
-
-## Security contact information
-
-To report a security vulnerability, please use the
-[Tidelift security contact](https://tidelift.com/security).
-Tidelift will coordinate the fix and disclosure.
diff --git a/vendor/dario.cat/mergo/doc.go b/vendor/dario.cat/mergo/doc.go
deleted file mode 100644
index 7d96ec0546..0000000000
--- a/vendor/dario.cat/mergo/doc.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2013 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-A helper to merge structs and maps in Golang. Useful for configuration default values, avoiding messy if-statements.
-
-Mergo merges same-type structs and maps by setting default values in zero-value fields. Mergo won't merge unexported (private) fields. It will do recursively any exported one. It also won't merge structs inside maps (because they are not addressable using Go reflection).
-
-# Status
-
-It is ready for production use. It is used in several projects by Docker, Google, The Linux Foundation, VMWare, Shopify, etc.
-
-# Important notes
-
-1.0.0
-
-In 1.0.0 Mergo moves to a vanity URL `dario.cat/mergo`.
-
-0.3.9
-
-Please keep in mind that a problematic PR broke 0.3.9. We reverted it in 0.3.10. We consider 0.3.10 as stable but not bug-free. . Also, this version adds suppot for go modules.
-
-Keep in mind that in 0.3.2, Mergo changed Merge() and Map() signatures to support transformers. We added an optional/variadic argument so that it won't break the existing code.
-
-If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with go get -u dario.cat/mergo. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
-
-# Install
-
-Do your usual installation procedure:
-
- go get dario.cat/mergo
-
- // use in your .go code
- import (
- "dario.cat/mergo"
- )
-
-# Usage
-
-You can only merge same-type structs with exported fields initialized as zero value of their type and same-types maps. Mergo won't merge unexported (private) fields but will do recursively any exported one. It won't merge empty structs value as they are zero values too. Also, maps will be merged recursively except for structs inside maps (because they are not addressable using Go reflection).
-
- if err := mergo.Merge(&dst, src); err != nil {
- // ...
- }
-
-Also, you can merge overwriting values using the transformer WithOverride.
-
- if err := mergo.Merge(&dst, src, mergo.WithOverride); err != nil {
- // ...
- }
-
-Additionally, you can map a map[string]interface{} to a struct (and otherwise, from struct to map), following the same restrictions as in Merge(). Keys are capitalized to find each corresponding exported field.
-
- if err := mergo.Map(&dst, srcMap); err != nil {
- // ...
- }
-
-Warning: if you map a struct to map, it won't do it recursively. Don't expect Mergo to map struct members of your struct as map[string]interface{}. They will be just assigned as values.
-
-Here is a nice example:
-
- package main
-
- import (
- "fmt"
- "dario.cat/mergo"
- )
-
- type Foo struct {
- A string
- B int64
- }
-
- func main() {
- src := Foo{
- A: "one",
- B: 2,
- }
- dest := Foo{
- A: "two",
- }
- mergo.Merge(&dest, src)
- fmt.Println(dest)
- // Will print
- // {two 2}
- }
-
-# Transformers
-
-Transformers allow to merge specific types differently than in the default behavior. In other words, now you can customize how some types are merged. For example, time.Time is a struct; it doesn't have zero value but IsZero can return true because it has fields with zero value. How can we merge a non-zero time.Time?
-
- package main
-
- import (
- "fmt"
- "dario.cat/mergo"
- "reflect"
- "time"
- )
-
- type timeTransformer struct {
- }
-
- func (t timeTransformer) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
- if typ == reflect.TypeOf(time.Time{}) {
- return func(dst, src reflect.Value) error {
- if dst.CanSet() {
- isZero := dst.MethodByName("IsZero")
- result := isZero.Call([]reflect.Value{})
- if result[0].Bool() {
- dst.Set(src)
- }
- }
- return nil
- }
- }
- return nil
- }
-
- type Snapshot struct {
- Time time.Time
- // ...
- }
-
- func main() {
- src := Snapshot{time.Now()}
- dest := Snapshot{}
- mergo.Merge(&dest, src, mergo.WithTransformers(timeTransformer{}))
- fmt.Println(dest)
- // Will print
- // { 2018-01-12 01:15:00 +0000 UTC m=+0.000000001 }
- }
-
-# Contact me
-
-If I can help you, you have an idea or you are using Mergo in your projects, don't hesitate to drop me a line (or a pull request): https://twitter.com/im_dario
-
-# About
-
-Written by Dario Castañé: https://da.rio.hn
-
-# License
-
-BSD 3-Clause license, as Go language.
-*/
-package mergo
diff --git a/vendor/dario.cat/mergo/map.go b/vendor/dario.cat/mergo/map.go
deleted file mode 100644
index 759b4f74fd..0000000000
--- a/vendor/dario.cat/mergo/map.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2014 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Based on src/pkg/reflect/deepequal.go from official
-// golang's stdlib.
-
-package mergo
-
-import (
- "fmt"
- "reflect"
- "unicode"
- "unicode/utf8"
-)
-
-func changeInitialCase(s string, mapper func(rune) rune) string {
- if s == "" {
- return s
- }
- r, n := utf8.DecodeRuneInString(s)
- return string(mapper(r)) + s[n:]
-}
-
-func isExported(field reflect.StructField) bool {
- r, _ := utf8.DecodeRuneInString(field.Name)
- return r >= 'A' && r <= 'Z'
-}
-
-// Traverses recursively both values, assigning src's fields values to dst.
-// The map argument tracks comparisons that have already been seen, which allows
-// short circuiting on recursive types.
-func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int, config *Config) (err error) {
- overwrite := config.Overwrite
- if dst.CanAddr() {
- addr := dst.UnsafeAddr()
- h := 17 * addr
- seen := visited[h]
- typ := dst.Type()
- for p := seen; p != nil; p = p.next {
- if p.ptr == addr && p.typ == typ {
- return nil
- }
- }
- // Remember, remember...
- visited[h] = &visit{typ, seen, addr}
- }
- zeroValue := reflect.Value{}
- switch dst.Kind() {
- case reflect.Map:
- dstMap := dst.Interface().(map[string]interface{})
- for i, n := 0, src.NumField(); i < n; i++ {
- srcType := src.Type()
- field := srcType.Field(i)
- if !isExported(field) {
- continue
- }
- fieldName := field.Name
- fieldName = changeInitialCase(fieldName, unicode.ToLower)
- if _, ok := dstMap[fieldName]; !ok || (!isEmptyValue(reflect.ValueOf(src.Field(i).Interface()), !config.ShouldNotDereference) && overwrite) || config.overwriteWithEmptyValue {
- dstMap[fieldName] = src.Field(i).Interface()
- }
- }
- case reflect.Ptr:
- if dst.IsNil() {
- v := reflect.New(dst.Type().Elem())
- dst.Set(v)
- }
- dst = dst.Elem()
- fallthrough
- case reflect.Struct:
- srcMap := src.Interface().(map[string]interface{})
- for key := range srcMap {
- config.overwriteWithEmptyValue = true
- srcValue := srcMap[key]
- fieldName := changeInitialCase(key, unicode.ToUpper)
- dstElement := dst.FieldByName(fieldName)
- if dstElement == zeroValue {
- // We discard it because the field doesn't exist.
- continue
- }
- srcElement := reflect.ValueOf(srcValue)
- dstKind := dstElement.Kind()
- srcKind := srcElement.Kind()
- if srcKind == reflect.Ptr && dstKind != reflect.Ptr {
- srcElement = srcElement.Elem()
- srcKind = reflect.TypeOf(srcElement.Interface()).Kind()
- } else if dstKind == reflect.Ptr {
- // Can this work? I guess it can't.
- if srcKind != reflect.Ptr && srcElement.CanAddr() {
- srcPtr := srcElement.Addr()
- srcElement = reflect.ValueOf(srcPtr)
- srcKind = reflect.Ptr
- }
- }
-
- if !srcElement.IsValid() {
- continue
- }
- if srcKind == dstKind {
- if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
- return
- }
- } else if dstKind == reflect.Interface && dstElement.Kind() == reflect.Interface {
- if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
- return
- }
- } else if srcKind == reflect.Map {
- if err = deepMap(dstElement, srcElement, visited, depth+1, config); err != nil {
- return
- }
- } else {
- return fmt.Errorf("type mismatch on %s field: found %v, expected %v", fieldName, srcKind, dstKind)
- }
- }
- }
- return
-}
-
-// Map sets fields' values in dst from src.
-// src can be a map with string keys or a struct. dst must be the opposite:
-// if src is a map, dst must be a valid pointer to struct. If src is a struct,
-// dst must be map[string]interface{}.
-// It won't merge unexported (private) fields and will do recursively
-// any exported field.
-// If dst is a map, keys will be src fields' names in lower camel case.
-// Missing key in src that doesn't match a field in dst will be skipped. This
-// doesn't apply if dst is a map.
-// This is separated method from Merge because it is cleaner and it keeps sane
-// semantics: merging equal types, mapping different (restricted) types.
-func Map(dst, src interface{}, opts ...func(*Config)) error {
- return _map(dst, src, opts...)
-}
-
-// MapWithOverwrite will do the same as Map except that non-empty dst attributes will be overridden by
-// non-empty src attribute values.
-// Deprecated: Use Map(…) with WithOverride
-func MapWithOverwrite(dst, src interface{}, opts ...func(*Config)) error {
- return _map(dst, src, append(opts, WithOverride)...)
-}
-
-func _map(dst, src interface{}, opts ...func(*Config)) error {
- if dst != nil && reflect.ValueOf(dst).Kind() != reflect.Ptr {
- return ErrNonPointerArgument
- }
- var (
- vDst, vSrc reflect.Value
- err error
- )
- config := &Config{}
-
- for _, opt := range opts {
- opt(config)
- }
-
- if vDst, vSrc, err = resolveValues(dst, src); err != nil {
- return err
- }
- // To be friction-less, we redirect equal-type arguments
- // to deepMerge. Only because arguments can be anything.
- if vSrc.Kind() == vDst.Kind() {
- return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, config)
- }
- switch vSrc.Kind() {
- case reflect.Struct:
- if vDst.Kind() != reflect.Map {
- return ErrExpectedMapAsDestination
- }
- case reflect.Map:
- if vDst.Kind() != reflect.Struct {
- return ErrExpectedStructAsDestination
- }
- default:
- return ErrNotSupported
- }
- return deepMap(vDst, vSrc, make(map[uintptr]*visit), 0, config)
-}
diff --git a/vendor/dario.cat/mergo/merge.go b/vendor/dario.cat/mergo/merge.go
deleted file mode 100644
index fd47c95b2b..0000000000
--- a/vendor/dario.cat/mergo/merge.go
+++ /dev/null
@@ -1,409 +0,0 @@
-// Copyright 2013 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Based on src/pkg/reflect/deepequal.go from official
-// golang's stdlib.
-
-package mergo
-
-import (
- "fmt"
- "reflect"
-)
-
-func hasMergeableFields(dst reflect.Value) (exported bool) {
- for i, n := 0, dst.NumField(); i < n; i++ {
- field := dst.Type().Field(i)
- if field.Anonymous && dst.Field(i).Kind() == reflect.Struct {
- exported = exported || hasMergeableFields(dst.Field(i))
- } else if isExportedComponent(&field) {
- exported = exported || len(field.PkgPath) == 0
- }
- }
- return
-}
-
-func isExportedComponent(field *reflect.StructField) bool {
- pkgPath := field.PkgPath
- if len(pkgPath) > 0 {
- return false
- }
- c := field.Name[0]
- if 'a' <= c && c <= 'z' || c == '_' {
- return false
- }
- return true
-}
-
-type Config struct {
- Transformers Transformers
- Overwrite bool
- ShouldNotDereference bool
- AppendSlice bool
- TypeCheck bool
- overwriteWithEmptyValue bool
- overwriteSliceWithEmptyValue bool
- sliceDeepCopy bool
- debug bool
-}
-
-type Transformers interface {
- Transformer(reflect.Type) func(dst, src reflect.Value) error
-}
-
-// Traverses recursively both values, assigning src's fields values to dst.
-// The map argument tracks comparisons that have already been seen, which allows
-// short circuiting on recursive types.
-func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, config *Config) (err error) {
- overwrite := config.Overwrite
- typeCheck := config.TypeCheck
- overwriteWithEmptySrc := config.overwriteWithEmptyValue
- overwriteSliceWithEmptySrc := config.overwriteSliceWithEmptyValue
- sliceDeepCopy := config.sliceDeepCopy
-
- if !src.IsValid() {
- return
- }
- if dst.CanAddr() {
- addr := dst.UnsafeAddr()
- h := 17 * addr
- seen := visited[h]
- typ := dst.Type()
- for p := seen; p != nil; p = p.next {
- if p.ptr == addr && p.typ == typ {
- return nil
- }
- }
- // Remember, remember...
- visited[h] = &visit{typ, seen, addr}
- }
-
- if config.Transformers != nil && !isReflectNil(dst) && dst.IsValid() {
- if fn := config.Transformers.Transformer(dst.Type()); fn != nil {
- err = fn(dst, src)
- return
- }
- }
-
- switch dst.Kind() {
- case reflect.Struct:
- if hasMergeableFields(dst) {
- for i, n := 0, dst.NumField(); i < n; i++ {
- if err = deepMerge(dst.Field(i), src.Field(i), visited, depth+1, config); err != nil {
- return
- }
- }
- } else {
- if dst.CanSet() && (isReflectNil(dst) || overwrite) && (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc) {
- dst.Set(src)
- }
- }
- case reflect.Map:
- if dst.IsNil() && !src.IsNil() {
- if dst.CanSet() {
- dst.Set(reflect.MakeMap(dst.Type()))
- } else {
- dst = src
- return
- }
- }
-
- if src.Kind() != reflect.Map {
- if overwrite && dst.CanSet() {
- dst.Set(src)
- }
- return
- }
-
- for _, key := range src.MapKeys() {
- srcElement := src.MapIndex(key)
- if !srcElement.IsValid() {
- continue
- }
- dstElement := dst.MapIndex(key)
- switch srcElement.Kind() {
- case reflect.Chan, reflect.Func, reflect.Map, reflect.Interface, reflect.Slice:
- if srcElement.IsNil() {
- if overwrite {
- dst.SetMapIndex(key, srcElement)
- }
- continue
- }
- fallthrough
- default:
- if !srcElement.CanInterface() {
- continue
- }
- switch reflect.TypeOf(srcElement.Interface()).Kind() {
- case reflect.Struct:
- fallthrough
- case reflect.Ptr:
- fallthrough
- case reflect.Map:
- srcMapElm := srcElement
- dstMapElm := dstElement
- if srcMapElm.CanInterface() {
- srcMapElm = reflect.ValueOf(srcMapElm.Interface())
- if dstMapElm.IsValid() {
- dstMapElm = reflect.ValueOf(dstMapElm.Interface())
- }
- }
- if err = deepMerge(dstMapElm, srcMapElm, visited, depth+1, config); err != nil {
- return
- }
- case reflect.Slice:
- srcSlice := reflect.ValueOf(srcElement.Interface())
-
- var dstSlice reflect.Value
- if !dstElement.IsValid() || dstElement.IsNil() {
- dstSlice = reflect.MakeSlice(srcSlice.Type(), 0, srcSlice.Len())
- } else {
- dstSlice = reflect.ValueOf(dstElement.Interface())
- }
-
- if (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc || overwriteSliceWithEmptySrc) && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) && !config.AppendSlice && !sliceDeepCopy {
- if typeCheck && srcSlice.Type() != dstSlice.Type() {
- return fmt.Errorf("cannot override two slices with different type (%s, %s)", srcSlice.Type(), dstSlice.Type())
- }
- dstSlice = srcSlice
- } else if config.AppendSlice {
- if srcSlice.Type() != dstSlice.Type() {
- return fmt.Errorf("cannot append two slices with different type (%s, %s)", srcSlice.Type(), dstSlice.Type())
- }
- dstSlice = reflect.AppendSlice(dstSlice, srcSlice)
- } else if sliceDeepCopy {
- i := 0
- for ; i < srcSlice.Len() && i < dstSlice.Len(); i++ {
- srcElement := srcSlice.Index(i)
- dstElement := dstSlice.Index(i)
-
- if srcElement.CanInterface() {
- srcElement = reflect.ValueOf(srcElement.Interface())
- }
- if dstElement.CanInterface() {
- dstElement = reflect.ValueOf(dstElement.Interface())
- }
-
- if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
- return
- }
- }
-
- }
- dst.SetMapIndex(key, dstSlice)
- }
- }
-
- if dstElement.IsValid() && !isEmptyValue(dstElement, !config.ShouldNotDereference) {
- if reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Slice {
- continue
- }
- if reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Map && reflect.TypeOf(dstElement.Interface()).Kind() == reflect.Map {
- continue
- }
- }
-
- if srcElement.IsValid() && ((srcElement.Kind() != reflect.Ptr && overwrite) || !dstElement.IsValid() || isEmptyValue(dstElement, !config.ShouldNotDereference)) {
- if dst.IsNil() {
- dst.Set(reflect.MakeMap(dst.Type()))
- }
- dst.SetMapIndex(key, srcElement)
- }
- }
-
- // Ensure that all keys in dst are deleted if they are not in src.
- if overwriteWithEmptySrc {
- for _, key := range dst.MapKeys() {
- srcElement := src.MapIndex(key)
- if !srcElement.IsValid() {
- dst.SetMapIndex(key, reflect.Value{})
- }
- }
- }
- case reflect.Slice:
- if !dst.CanSet() {
- break
- }
- if (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc || overwriteSliceWithEmptySrc) && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) && !config.AppendSlice && !sliceDeepCopy {
- dst.Set(src)
- } else if config.AppendSlice {
- if src.Type() != dst.Type() {
- return fmt.Errorf("cannot append two slice with different type (%s, %s)", src.Type(), dst.Type())
- }
- dst.Set(reflect.AppendSlice(dst, src))
- } else if sliceDeepCopy {
- for i := 0; i < src.Len() && i < dst.Len(); i++ {
- srcElement := src.Index(i)
- dstElement := dst.Index(i)
- if srcElement.CanInterface() {
- srcElement = reflect.ValueOf(srcElement.Interface())
- }
- if dstElement.CanInterface() {
- dstElement = reflect.ValueOf(dstElement.Interface())
- }
-
- if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
- return
- }
- }
- }
- case reflect.Ptr:
- fallthrough
- case reflect.Interface:
- if isReflectNil(src) {
- if overwriteWithEmptySrc && dst.CanSet() && src.Type().AssignableTo(dst.Type()) {
- dst.Set(src)
- }
- break
- }
-
- if src.Kind() != reflect.Interface {
- if dst.IsNil() || (src.Kind() != reflect.Ptr && overwrite) {
- if dst.CanSet() && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) {
- dst.Set(src)
- }
- } else if src.Kind() == reflect.Ptr {
- if !config.ShouldNotDereference {
- if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1, config); err != nil {
- return
- }
- } else if src.Elem().Kind() != reflect.Struct {
- if overwriteWithEmptySrc || (overwrite && !src.IsNil()) || dst.IsNil() {
- dst.Set(src)
- }
- }
- } else if dst.Elem().Type() == src.Type() {
- if err = deepMerge(dst.Elem(), src, visited, depth+1, config); err != nil {
- return
- }
- } else {
- return ErrDifferentArgumentsTypes
- }
- break
- }
-
- if dst.IsNil() || overwrite {
- if dst.CanSet() && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) {
- dst.Set(src)
- }
- break
- }
-
- if dst.Elem().Kind() == src.Elem().Kind() {
- if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1, config); err != nil {
- return
- }
- break
- }
- default:
- mustSet := (isEmptyValue(dst, !config.ShouldNotDereference) || overwrite) && (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc)
- if mustSet {
- if dst.CanSet() {
- dst.Set(src)
- } else {
- dst = src
- }
- }
- }
-
- return
-}
-
-// Merge will fill any empty for value type attributes on the dst struct using corresponding
-// src attributes if they themselves are not empty. dst and src must be valid same-type structs
-// and dst must be a pointer to struct.
-// It won't merge unexported (private) fields and will do recursively any exported field.
-func Merge(dst, src interface{}, opts ...func(*Config)) error {
- return merge(dst, src, opts...)
-}
-
-// MergeWithOverwrite will do the same as Merge except that non-empty dst attributes will be overridden by
-// non-empty src attribute values.
-// Deprecated: use Merge(…) with WithOverride
-func MergeWithOverwrite(dst, src interface{}, opts ...func(*Config)) error {
- return merge(dst, src, append(opts, WithOverride)...)
-}
-
-// WithTransformers adds transformers to merge, allowing to customize the merging of some types.
-func WithTransformers(transformers Transformers) func(*Config) {
- return func(config *Config) {
- config.Transformers = transformers
- }
-}
-
-// WithOverride will make merge override non-empty dst attributes with non-empty src attributes values.
-func WithOverride(config *Config) {
- config.Overwrite = true
-}
-
-// WithOverwriteWithEmptyValue will make merge override non empty dst attributes with empty src attributes values.
-func WithOverwriteWithEmptyValue(config *Config) {
- config.Overwrite = true
- config.overwriteWithEmptyValue = true
-}
-
-// WithOverrideEmptySlice will make merge override empty dst slice with empty src slice.
-func WithOverrideEmptySlice(config *Config) {
- config.overwriteSliceWithEmptyValue = true
-}
-
-// WithoutDereference prevents dereferencing pointers when evaluating whether they are empty
-// (i.e. a non-nil pointer is never considered empty).
-func WithoutDereference(config *Config) {
- config.ShouldNotDereference = true
-}
-
-// WithAppendSlice will make merge append slices instead of overwriting it.
-func WithAppendSlice(config *Config) {
- config.AppendSlice = true
-}
-
-// WithTypeCheck will make merge check types while overwriting it (must be used with WithOverride).
-func WithTypeCheck(config *Config) {
- config.TypeCheck = true
-}
-
-// WithSliceDeepCopy will merge slice element one by one with Overwrite flag.
-func WithSliceDeepCopy(config *Config) {
- config.sliceDeepCopy = true
- config.Overwrite = true
-}
-
-func merge(dst, src interface{}, opts ...func(*Config)) error {
- if dst != nil && reflect.ValueOf(dst).Kind() != reflect.Ptr {
- return ErrNonPointerArgument
- }
- var (
- vDst, vSrc reflect.Value
- err error
- )
-
- config := &Config{}
-
- for _, opt := range opts {
- opt(config)
- }
-
- if vDst, vSrc, err = resolveValues(dst, src); err != nil {
- return err
- }
- if vDst.Type() != vSrc.Type() {
- return ErrDifferentArgumentsTypes
- }
- return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, config)
-}
-
-// IsReflectNil is the reflect value provided nil
-func isReflectNil(v reflect.Value) bool {
- k := v.Kind()
- switch k {
- case reflect.Interface, reflect.Slice, reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr:
- // Both interface and slice are nil if first word is 0.
- // Both are always bigger than a word; assume flagIndir.
- return v.IsNil()
- default:
- return false
- }
-}
diff --git a/vendor/dario.cat/mergo/mergo.go b/vendor/dario.cat/mergo/mergo.go
deleted file mode 100644
index 0a721e2d85..0000000000
--- a/vendor/dario.cat/mergo/mergo.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 Dario Castañé. All rights reserved.
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Based on src/pkg/reflect/deepequal.go from official
-// golang's stdlib.
-
-package mergo
-
-import (
- "errors"
- "reflect"
-)
-
-// Errors reported by Mergo when it finds invalid arguments.
-var (
- ErrNilArguments = errors.New("src and dst must not be nil")
- ErrDifferentArgumentsTypes = errors.New("src and dst must be of same type")
- ErrNotSupported = errors.New("only structs, maps, and slices are supported")
- ErrExpectedMapAsDestination = errors.New("dst was expected to be a map")
- ErrExpectedStructAsDestination = errors.New("dst was expected to be a struct")
- ErrNonPointerArgument = errors.New("dst must be a pointer")
-)
-
-// During deepMerge, must keep track of checks that are
-// in progress. The comparison algorithm assumes that all
-// checks in progress are true when it reencounters them.
-// Visited are stored in a map indexed by 17 * a1 + a2;
-type visit struct {
- typ reflect.Type
- next *visit
- ptr uintptr
-}
-
-// From src/pkg/encoding/json/encode.go.
-func isEmptyValue(v reflect.Value, shouldDereference bool) bool {
- switch v.Kind() {
- case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
- return v.Len() == 0
- case reflect.Bool:
- return !v.Bool()
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- return v.Int() == 0
- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
- return v.Uint() == 0
- case reflect.Float32, reflect.Float64:
- return v.Float() == 0
- case reflect.Interface, reflect.Ptr:
- if v.IsNil() {
- return true
- }
- if shouldDereference {
- return isEmptyValue(v.Elem(), shouldDereference)
- }
- return false
- case reflect.Func:
- return v.IsNil()
- case reflect.Invalid:
- return true
- }
- return false
-}
-
-func resolveValues(dst, src interface{}) (vDst, vSrc reflect.Value, err error) {
- if dst == nil || src == nil {
- err = ErrNilArguments
- return
- }
- vDst = reflect.ValueOf(dst).Elem()
- if vDst.Kind() != reflect.Struct && vDst.Kind() != reflect.Map && vDst.Kind() != reflect.Slice {
- err = ErrNotSupported
- return
- }
- vSrc = reflect.ValueOf(src)
- // We check if vSrc is a pointer to dereference it.
- if vSrc.Kind() == reflect.Ptr {
- vSrc = vSrc.Elem()
- }
- return
-}
diff --git a/vendor/github.com/Masterminds/goutils/.travis.yml b/vendor/github.com/Masterminds/goutils/.travis.yml
deleted file mode 100644
index 4025e01ec4..0000000000
--- a/vendor/github.com/Masterminds/goutils/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-language: go
-
-go:
- - 1.6
- - 1.7
- - 1.8
- - tip
-
-script:
- - go test -v
-
-notifications:
- webhooks:
- urls:
- - https://webhooks.gitter.im/e/06e3328629952dabe3e0
- on_success: change # options: [always|never|change] default: always
- on_failure: always # options: [always|never|change] default: always
- on_start: never # options: [always|never|change] default: always
diff --git a/vendor/github.com/Masterminds/goutils/CHANGELOG.md b/vendor/github.com/Masterminds/goutils/CHANGELOG.md
deleted file mode 100644
index d700ec47f2..0000000000
--- a/vendor/github.com/Masterminds/goutils/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# 1.0.1 (2017-05-31)
-
-## Fixed
-- #21: Fix generation of alphanumeric strings (thanks @dbarranco)
-
-# 1.0.0 (2014-04-30)
-
-- Initial release.
diff --git a/vendor/github.com/Masterminds/goutils/LICENSE.txt b/vendor/github.com/Masterminds/goutils/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/vendor/github.com/Masterminds/goutils/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/vendor/github.com/Masterminds/goutils/README.md b/vendor/github.com/Masterminds/goutils/README.md
deleted file mode 100644
index 163ffe72a8..0000000000
--- a/vendor/github.com/Masterminds/goutils/README.md
+++ /dev/null
@@ -1,70 +0,0 @@
-GoUtils
-===========
-[](https://masterminds.github.io/stability/maintenance.html)
-[](https://godoc.org/github.com/Masterminds/goutils) [](https://travis-ci.org/Masterminds/goutils) [](https://ci.appveyor.com/project/mattfarina/goutils)
-
-
-GoUtils provides users with utility functions to manipulate strings in various ways. It is a Go implementation of some
-string manipulation libraries of Java Apache Commons. GoUtils includes the following Java Apache Commons classes:
-* WordUtils
-* RandomStringUtils
-* StringUtils (partial implementation)
-
-## Installation
-If you have Go set up on your system, from the GOPATH directory within the command line/terminal, enter this:
-
- go get github.com/Masterminds/goutils
-
-If you do not have Go set up on your system, please follow the [Go installation directions from the documenation](http://golang.org/doc/install), and then follow the instructions above to install GoUtils.
-
-
-## Documentation
-GoUtils doc is available here: [](https://godoc.org/github.com/Masterminds/goutils)
-
-
-## Usage
-The code snippets below show examples of how to use GoUtils. Some functions return errors while others do not. The first instance below, which does not return an error, is the `Initials` function (located within the `wordutils.go` file).
-
- package main
-
- import (
- "fmt"
- "github.com/Masterminds/goutils"
- )
-
- func main() {
-
- // EXAMPLE 1: A goutils function which returns no errors
- fmt.Println (goutils.Initials("John Doe Foo")) // Prints out "JDF"
-
- }
-Some functions return errors mainly due to illegal arguements used as parameters. The code example below illustrates how to deal with function that returns an error. In this instance, the function is the `Random` function (located within the `randomstringutils.go` file).
-
- package main
-
- import (
- "fmt"
- "github.com/Masterminds/goutils"
- )
-
- func main() {
-
- // EXAMPLE 2: A goutils function which returns an error
- rand1, err1 := goutils.Random (-1, 0, 0, true, true)
-
- if err1 != nil {
- fmt.Println(err1) // Prints out error message because -1 was entered as the first parameter in goutils.Random(...)
- } else {
- fmt.Println(rand1)
- }
-
- }
-
-## License
-GoUtils is licensed under the Apache License, Version 2.0. Please check the LICENSE.txt file or visit http://www.apache.org/licenses/LICENSE-2.0 for a copy of the license.
-
-## Issue Reporting
-Make suggestions or report issues using the Git issue tracker: https://github.com/Masterminds/goutils/issues
-
-## Website
-* [GoUtils webpage](http://Masterminds.github.io/goutils/)
diff --git a/vendor/github.com/Masterminds/goutils/appveyor.yml b/vendor/github.com/Masterminds/goutils/appveyor.yml
deleted file mode 100644
index 657564a847..0000000000
--- a/vendor/github.com/Masterminds/goutils/appveyor.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: build-{build}.{branch}
-
-clone_folder: C:\gopath\src\github.com\Masterminds\goutils
-shallow_clone: true
-
-environment:
- GOPATH: C:\gopath
-
-platform:
- - x64
-
-build: off
-
-install:
- - go version
- - go env
-
-test_script:
- - go test -v
-
-deploy: off
diff --git a/vendor/github.com/Masterminds/goutils/cryptorandomstringutils.go b/vendor/github.com/Masterminds/goutils/cryptorandomstringutils.go
deleted file mode 100644
index 8dbd924858..0000000000
--- a/vendor/github.com/Masterminds/goutils/cryptorandomstringutils.go
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-Copyright 2014 Alexander Okoli
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package goutils
-
-import (
- "crypto/rand"
- "fmt"
- "math"
- "math/big"
- "unicode"
-)
-
-/*
-CryptoRandomNonAlphaNumeric creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of all characters (ASCII/Unicode values between 0 to 2,147,483,647 (math.MaxInt32)).
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, CryptoRandom(...)
-*/
-func CryptoRandomNonAlphaNumeric(count int) (string, error) {
- return CryptoRandomAlphaNumericCustom(count, false, false)
-}
-
-/*
-CryptoRandomAscii creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of characters whose ASCII value is between 32 and 126 (inclusive).
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, CryptoRandom(...)
-*/
-func CryptoRandomAscii(count int) (string, error) {
- return CryptoRandom(count, 32, 127, false, false)
-}
-
-/*
-CryptoRandomNumeric creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of numeric characters.
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, CryptoRandom(...)
-*/
-func CryptoRandomNumeric(count int) (string, error) {
- return CryptoRandom(count, 0, 0, false, true)
-}
-
-/*
-CryptoRandomAlphabetic creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of alpha-numeric characters as indicated by the arguments.
-
-Parameters:
- count - the length of random string to create
- letters - if true, generated string may include alphabetic characters
- numbers - if true, generated string may include numeric characters
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, CryptoRandom(...)
-*/
-func CryptoRandomAlphabetic(count int) (string, error) {
- return CryptoRandom(count, 0, 0, true, false)
-}
-
-/*
-CryptoRandomAlphaNumeric creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of alpha-numeric characters.
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, CryptoRandom(...)
-*/
-func CryptoRandomAlphaNumeric(count int) (string, error) {
- return CryptoRandom(count, 0, 0, true, true)
-}
-
-/*
-CryptoRandomAlphaNumericCustom creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of alpha-numeric characters as indicated by the arguments.
-
-Parameters:
- count - the length of random string to create
- letters - if true, generated string may include alphabetic characters
- numbers - if true, generated string may include numeric characters
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, CryptoRandom(...)
-*/
-func CryptoRandomAlphaNumericCustom(count int, letters bool, numbers bool) (string, error) {
- return CryptoRandom(count, 0, 0, letters, numbers)
-}
-
-/*
-CryptoRandom creates a random string based on a variety of options, using using golang's crypto/rand source of randomness.
-If the parameters start and end are both 0, start and end are set to ' ' and 'z', the ASCII printable characters, will be used,
-unless letters and numbers are both false, in which case, start and end are set to 0 and math.MaxInt32, respectively.
-If chars is not nil, characters stored in chars that are between start and end are chosen.
-
-Parameters:
- count - the length of random string to create
- start - the position in set of chars (ASCII/Unicode int) to start at
- end - the position in set of chars (ASCII/Unicode int) to end before
- letters - if true, generated string may include alphabetic characters
- numbers - if true, generated string may include numeric characters
- chars - the set of chars to choose randoms from. If nil, then it will use the set of all chars.
-
-Returns:
- string - the random string
- error - an error stemming from invalid parameters: if count < 0; or the provided chars array is empty; or end <= start; or end > len(chars)
-*/
-func CryptoRandom(count int, start int, end int, letters bool, numbers bool, chars ...rune) (string, error) {
- if count == 0 {
- return "", nil
- } else if count < 0 {
- err := fmt.Errorf("randomstringutils illegal argument: Requested random string length %v is less than 0.", count) // equiv to err := errors.New("...")
- return "", err
- }
- if chars != nil && len(chars) == 0 {
- err := fmt.Errorf("randomstringutils illegal argument: The chars array must not be empty")
- return "", err
- }
-
- if start == 0 && end == 0 {
- if chars != nil {
- end = len(chars)
- } else {
- if !letters && !numbers {
- end = math.MaxInt32
- } else {
- end = 'z' + 1
- start = ' '
- }
- }
- } else {
- if end <= start {
- err := fmt.Errorf("randomstringutils illegal argument: Parameter end (%v) must be greater than start (%v)", end, start)
- return "", err
- }
-
- if chars != nil && end > len(chars) {
- err := fmt.Errorf("randomstringutils illegal argument: Parameter end (%v) cannot be greater than len(chars) (%v)", end, len(chars))
- return "", err
- }
- }
-
- buffer := make([]rune, count)
- gap := end - start
-
- // high-surrogates range, (\uD800-\uDBFF) = 55296 - 56319
- // low-surrogates range, (\uDC00-\uDFFF) = 56320 - 57343
-
- for count != 0 {
- count--
- var ch rune
- if chars == nil {
- ch = rune(getCryptoRandomInt(gap) + int64(start))
- } else {
- ch = chars[getCryptoRandomInt(gap)+int64(start)]
- }
-
- if letters && unicode.IsLetter(ch) || numbers && unicode.IsDigit(ch) || !letters && !numbers {
- if ch >= 56320 && ch <= 57343 { // low surrogate range
- if count == 0 {
- count++
- } else {
- // Insert low surrogate
- buffer[count] = ch
- count--
- // Insert high surrogate
- buffer[count] = rune(55296 + getCryptoRandomInt(128))
- }
- } else if ch >= 55296 && ch <= 56191 { // High surrogates range (Partial)
- if count == 0 {
- count++
- } else {
- // Insert low surrogate
- buffer[count] = rune(56320 + getCryptoRandomInt(128))
- count--
- // Insert high surrogate
- buffer[count] = ch
- }
- } else if ch >= 56192 && ch <= 56319 {
- // private high surrogate, skip it
- count++
- } else {
- // not one of the surrogates*
- buffer[count] = ch
- }
- } else {
- count++
- }
- }
- return string(buffer), nil
-}
-
-func getCryptoRandomInt(count int) int64 {
- nBig, err := rand.Int(rand.Reader, big.NewInt(int64(count)))
- if err != nil {
- panic(err)
- }
- return nBig.Int64()
-}
diff --git a/vendor/github.com/Masterminds/goutils/randomstringutils.go b/vendor/github.com/Masterminds/goutils/randomstringutils.go
deleted file mode 100644
index 272670231a..0000000000
--- a/vendor/github.com/Masterminds/goutils/randomstringutils.go
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-Copyright 2014 Alexander Okoli
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package goutils
-
-import (
- "fmt"
- "math"
- "math/rand"
- "time"
- "unicode"
-)
-
-// RANDOM provides the time-based seed used to generate random numbers
-var RANDOM = rand.New(rand.NewSource(time.Now().UnixNano()))
-
-/*
-RandomNonAlphaNumeric creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of all characters (ASCII/Unicode values between 0 to 2,147,483,647 (math.MaxInt32)).
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, RandomSeed(...)
-*/
-func RandomNonAlphaNumeric(count int) (string, error) {
- return RandomAlphaNumericCustom(count, false, false)
-}
-
-/*
-RandomAscii creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of characters whose ASCII value is between 32 and 126 (inclusive).
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, RandomSeed(...)
-*/
-func RandomAscii(count int) (string, error) {
- return Random(count, 32, 127, false, false)
-}
-
-/*
-RandomNumeric creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of numeric characters.
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, RandomSeed(...)
-*/
-func RandomNumeric(count int) (string, error) {
- return Random(count, 0, 0, false, true)
-}
-
-/*
-RandomAlphabetic creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of alphabetic characters.
-
-Parameters:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, RandomSeed(...)
-*/
-func RandomAlphabetic(count int) (string, error) {
- return Random(count, 0, 0, true, false)
-}
-
-/*
-RandomAlphaNumeric creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of alpha-numeric characters.
-
-Parameter:
- count - the length of random string to create
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, RandomSeed(...)
-*/
-func RandomAlphaNumeric(count int) (string, error) {
- return Random(count, 0, 0, true, true)
-}
-
-/*
-RandomAlphaNumericCustom creates a random string whose length is the number of characters specified.
-Characters will be chosen from the set of alpha-numeric characters as indicated by the arguments.
-
-Parameters:
- count - the length of random string to create
- letters - if true, generated string may include alphabetic characters
- numbers - if true, generated string may include numeric characters
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, RandomSeed(...)
-*/
-func RandomAlphaNumericCustom(count int, letters bool, numbers bool) (string, error) {
- return Random(count, 0, 0, letters, numbers)
-}
-
-/*
-Random creates a random string based on a variety of options, using default source of randomness.
-This method has exactly the same semantics as RandomSeed(int, int, int, bool, bool, []char, *rand.Rand), but
-instead of using an externally supplied source of randomness, it uses the internal *rand.Rand instance.
-
-Parameters:
- count - the length of random string to create
- start - the position in set of chars (ASCII/Unicode int) to start at
- end - the position in set of chars (ASCII/Unicode int) to end before
- letters - if true, generated string may include alphabetic characters
- numbers - if true, generated string may include numeric characters
- chars - the set of chars to choose randoms from. If nil, then it will use the set of all chars.
-
-Returns:
- string - the random string
- error - an error stemming from an invalid parameter within underlying function, RandomSeed(...)
-*/
-func Random(count int, start int, end int, letters bool, numbers bool, chars ...rune) (string, error) {
- return RandomSeed(count, start, end, letters, numbers, chars, RANDOM)
-}
-
-/*
-RandomSeed creates a random string based on a variety of options, using supplied source of randomness.
-If the parameters start and end are both 0, start and end are set to ' ' and 'z', the ASCII printable characters, will be used,
-unless letters and numbers are both false, in which case, start and end are set to 0 and math.MaxInt32, respectively.
-If chars is not nil, characters stored in chars that are between start and end are chosen.
-This method accepts a user-supplied *rand.Rand instance to use as a source of randomness. By seeding a single *rand.Rand instance
-with a fixed seed and using it for each call, the same random sequence of strings can be generated repeatedly and predictably.
-
-Parameters:
- count - the length of random string to create
- start - the position in set of chars (ASCII/Unicode decimals) to start at
- end - the position in set of chars (ASCII/Unicode decimals) to end before
- letters - if true, generated string may include alphabetic characters
- numbers - if true, generated string may include numeric characters
- chars - the set of chars to choose randoms from. If nil, then it will use the set of all chars.
- random - a source of randomness.
-
-Returns:
- string - the random string
- error - an error stemming from invalid parameters: if count < 0; or the provided chars array is empty; or end <= start; or end > len(chars)
-*/
-func RandomSeed(count int, start int, end int, letters bool, numbers bool, chars []rune, random *rand.Rand) (string, error) {
-
- if count == 0 {
- return "", nil
- } else if count < 0 {
- err := fmt.Errorf("randomstringutils illegal argument: Requested random string length %v is less than 0.", count) // equiv to err := errors.New("...")
- return "", err
- }
- if chars != nil && len(chars) == 0 {
- err := fmt.Errorf("randomstringutils illegal argument: The chars array must not be empty")
- return "", err
- }
-
- if start == 0 && end == 0 {
- if chars != nil {
- end = len(chars)
- } else {
- if !letters && !numbers {
- end = math.MaxInt32
- } else {
- end = 'z' + 1
- start = ' '
- }
- }
- } else {
- if end <= start {
- err := fmt.Errorf("randomstringutils illegal argument: Parameter end (%v) must be greater than start (%v)", end, start)
- return "", err
- }
-
- if chars != nil && end > len(chars) {
- err := fmt.Errorf("randomstringutils illegal argument: Parameter end (%v) cannot be greater than len(chars) (%v)", end, len(chars))
- return "", err
- }
- }
-
- buffer := make([]rune, count)
- gap := end - start
-
- // high-surrogates range, (\uD800-\uDBFF) = 55296 - 56319
- // low-surrogates range, (\uDC00-\uDFFF) = 56320 - 57343
-
- for count != 0 {
- count--
- var ch rune
- if chars == nil {
- ch = rune(random.Intn(gap) + start)
- } else {
- ch = chars[random.Intn(gap)+start]
- }
-
- if letters && unicode.IsLetter(ch) || numbers && unicode.IsDigit(ch) || !letters && !numbers {
- if ch >= 56320 && ch <= 57343 { // low surrogate range
- if count == 0 {
- count++
- } else {
- // Insert low surrogate
- buffer[count] = ch
- count--
- // Insert high surrogate
- buffer[count] = rune(55296 + random.Intn(128))
- }
- } else if ch >= 55296 && ch <= 56191 { // High surrogates range (Partial)
- if count == 0 {
- count++
- } else {
- // Insert low surrogate
- buffer[count] = rune(56320 + random.Intn(128))
- count--
- // Insert high surrogate
- buffer[count] = ch
- }
- } else if ch >= 56192 && ch <= 56319 {
- // private high surrogate, skip it
- count++
- } else {
- // not one of the surrogates*
- buffer[count] = ch
- }
- } else {
- count++
- }
- }
- return string(buffer), nil
-}
diff --git a/vendor/github.com/Masterminds/goutils/stringutils.go b/vendor/github.com/Masterminds/goutils/stringutils.go
deleted file mode 100644
index 741bb530e8..0000000000
--- a/vendor/github.com/Masterminds/goutils/stringutils.go
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-Copyright 2014 Alexander Okoli
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package goutils
-
-import (
- "bytes"
- "fmt"
- "strings"
- "unicode"
-)
-
-// Typically returned by functions where a searched item cannot be found
-const INDEX_NOT_FOUND = -1
-
-/*
-Abbreviate abbreviates a string using ellipses. This will turn the string "Now is the time for all good men" into "Now is the time for..."
-
-Specifically, the algorithm is as follows:
-
- - If str is less than maxWidth characters long, return it.
- - Else abbreviate it to (str[0:maxWidth - 3] + "...").
- - If maxWidth is less than 4, return an illegal argument error.
- - In no case will it return a string of length greater than maxWidth.
-
-Parameters:
- str - the string to check
- maxWidth - maximum length of result string, must be at least 4
-
-Returns:
- string - abbreviated string
- error - if the width is too small
-*/
-func Abbreviate(str string, maxWidth int) (string, error) {
- return AbbreviateFull(str, 0, maxWidth)
-}
-
-/*
-AbbreviateFull abbreviates a string using ellipses. This will turn the string "Now is the time for all good men" into "...is the time for..."
-This function works like Abbreviate(string, int), but allows you to specify a "left edge" offset. Note that this left edge is not
-necessarily going to be the leftmost character in the result, or the first character following the ellipses, but it will appear
-somewhere in the result.
-In no case will it return a string of length greater than maxWidth.
-
-Parameters:
- str - the string to check
- offset - left edge of source string
- maxWidth - maximum length of result string, must be at least 4
-
-Returns:
- string - abbreviated string
- error - if the width is too small
-*/
-func AbbreviateFull(str string, offset int, maxWidth int) (string, error) {
- if str == "" {
- return "", nil
- }
- if maxWidth < 4 {
- err := fmt.Errorf("stringutils illegal argument: Minimum abbreviation width is 4")
- return "", err
- }
- if len(str) <= maxWidth {
- return str, nil
- }
- if offset > len(str) {
- offset = len(str)
- }
- if len(str)-offset < (maxWidth - 3) { // 15 - 5 < 10 - 3 = 10 < 7
- offset = len(str) - (maxWidth - 3)
- }
- abrevMarker := "..."
- if offset <= 4 {
- return str[0:maxWidth-3] + abrevMarker, nil // str.substring(0, maxWidth - 3) + abrevMarker;
- }
- if maxWidth < 7 {
- err := fmt.Errorf("stringutils illegal argument: Minimum abbreviation width with offset is 7")
- return "", err
- }
- if (offset + maxWidth - 3) < len(str) { // 5 + (10-3) < 15 = 12 < 15
- abrevStr, _ := Abbreviate(str[offset:len(str)], (maxWidth - 3))
- return abrevMarker + abrevStr, nil // abrevMarker + abbreviate(str.substring(offset), maxWidth - 3);
- }
- return abrevMarker + str[(len(str)-(maxWidth-3)):len(str)], nil // abrevMarker + str.substring(str.length() - (maxWidth - 3));
-}
-
-/*
-DeleteWhiteSpace deletes all whitespaces from a string as defined by unicode.IsSpace(rune).
-It returns the string without whitespaces.
-
-Parameter:
- str - the string to delete whitespace from, may be nil
-
-Returns:
- the string without whitespaces
-*/
-func DeleteWhiteSpace(str string) string {
- if str == "" {
- return str
- }
- sz := len(str)
- var chs bytes.Buffer
- count := 0
- for i := 0; i < sz; i++ {
- ch := rune(str[i])
- if !unicode.IsSpace(ch) {
- chs.WriteRune(ch)
- count++
- }
- }
- if count == sz {
- return str
- }
- return chs.String()
-}
-
-/*
-IndexOfDifference compares two strings, and returns the index at which the strings begin to differ.
-
-Parameters:
- str1 - the first string
- str2 - the second string
-
-Returns:
- the index where str1 and str2 begin to differ; -1 if they are equal
-*/
-func IndexOfDifference(str1 string, str2 string) int {
- if str1 == str2 {
- return INDEX_NOT_FOUND
- }
- if IsEmpty(str1) || IsEmpty(str2) {
- return 0
- }
- var i int
- for i = 0; i < len(str1) && i < len(str2); i++ {
- if rune(str1[i]) != rune(str2[i]) {
- break
- }
- }
- if i < len(str2) || i < len(str1) {
- return i
- }
- return INDEX_NOT_FOUND
-}
-
-/*
-IsBlank checks if a string is whitespace or empty (""). Observe the following behavior:
-
- goutils.IsBlank("") = true
- goutils.IsBlank(" ") = true
- goutils.IsBlank("bob") = false
- goutils.IsBlank(" bob ") = false
-
-Parameter:
- str - the string to check
-
-Returns:
- true - if the string is whitespace or empty ("")
-*/
-func IsBlank(str string) bool {
- strLen := len(str)
- if str == "" || strLen == 0 {
- return true
- }
- for i := 0; i < strLen; i++ {
- if unicode.IsSpace(rune(str[i])) == false {
- return false
- }
- }
- return true
-}
-
-/*
-IndexOf returns the index of the first instance of sub in str, with the search beginning from the
-index start point specified. -1 is returned if sub is not present in str.
-
-An empty string ("") will return -1 (INDEX_NOT_FOUND). A negative start position is treated as zero.
-A start position greater than the string length returns -1.
-
-Parameters:
- str - the string to check
- sub - the substring to find
- start - the start position; negative treated as zero
-
-Returns:
- the first index where the sub string was found (always >= start)
-*/
-func IndexOf(str string, sub string, start int) int {
-
- if start < 0 {
- start = 0
- }
-
- if len(str) < start {
- return INDEX_NOT_FOUND
- }
-
- if IsEmpty(str) || IsEmpty(sub) {
- return INDEX_NOT_FOUND
- }
-
- partialIndex := strings.Index(str[start:len(str)], sub)
- if partialIndex == -1 {
- return INDEX_NOT_FOUND
- }
- return partialIndex + start
-}
-
-// IsEmpty checks if a string is empty (""). Returns true if empty, and false otherwise.
-func IsEmpty(str string) bool {
- return len(str) == 0
-}
-
-// Returns either the passed in string, or if the string is empty, the value of defaultStr.
-func DefaultString(str string, defaultStr string) string {
- if IsEmpty(str) {
- return defaultStr
- }
- return str
-}
-
-// Returns either the passed in string, or if the string is whitespace, empty (""), the value of defaultStr.
-func DefaultIfBlank(str string, defaultStr string) string {
- if IsBlank(str) {
- return defaultStr
- }
- return str
-}
diff --git a/vendor/github.com/Masterminds/goutils/wordutils.go b/vendor/github.com/Masterminds/goutils/wordutils.go
deleted file mode 100644
index 034cad8e21..0000000000
--- a/vendor/github.com/Masterminds/goutils/wordutils.go
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-Copyright 2014 Alexander Okoli
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Package goutils provides utility functions to manipulate strings in various ways.
-The code snippets below show examples of how to use goutils. Some functions return
-errors while others do not, so usage would vary as a result.
-
-Example:
-
- package main
-
- import (
- "fmt"
- "github.com/aokoli/goutils"
- )
-
- func main() {
-
- // EXAMPLE 1: A goutils function which returns no errors
- fmt.Println (goutils.Initials("John Doe Foo")) // Prints out "JDF"
-
-
-
- // EXAMPLE 2: A goutils function which returns an error
- rand1, err1 := goutils.Random (-1, 0, 0, true, true)
-
- if err1 != nil {
- fmt.Println(err1) // Prints out error message because -1 was entered as the first parameter in goutils.Random(...)
- } else {
- fmt.Println(rand1)
- }
- }
-*/
-package goutils
-
-import (
- "bytes"
- "strings"
- "unicode"
-)
-
-// VERSION indicates the current version of goutils
-const VERSION = "1.0.0"
-
-/*
-Wrap wraps a single line of text, identifying words by ' '.
-New lines will be separated by '\n'. Very long words, such as URLs will not be wrapped.
-Leading spaces on a new line are stripped. Trailing spaces are not stripped.
-
-Parameters:
- str - the string to be word wrapped
- wrapLength - the column (a column can fit only one character) to wrap the words at, less than 1 is treated as 1
-
-Returns:
- a line with newlines inserted
-*/
-func Wrap(str string, wrapLength int) string {
- return WrapCustom(str, wrapLength, "", false)
-}
-
-/*
-WrapCustom wraps a single line of text, identifying words by ' '.
-Leading spaces on a new line are stripped. Trailing spaces are not stripped.
-
-Parameters:
- str - the string to be word wrapped
- wrapLength - the column number (a column can fit only one character) to wrap the words at, less than 1 is treated as 1
- newLineStr - the string to insert for a new line, "" uses '\n'
- wrapLongWords - true if long words (such as URLs) should be wrapped
-
-Returns:
- a line with newlines inserted
-*/
-func WrapCustom(str string, wrapLength int, newLineStr string, wrapLongWords bool) string {
-
- if str == "" {
- return ""
- }
- if newLineStr == "" {
- newLineStr = "\n" // TODO Assumes "\n" is seperator. Explore SystemUtils.LINE_SEPARATOR from Apache Commons
- }
- if wrapLength < 1 {
- wrapLength = 1
- }
-
- inputLineLength := len(str)
- offset := 0
-
- var wrappedLine bytes.Buffer
-
- for inputLineLength-offset > wrapLength {
-
- if rune(str[offset]) == ' ' {
- offset++
- continue
- }
-
- end := wrapLength + offset + 1
- spaceToWrapAt := strings.LastIndex(str[offset:end], " ") + offset
-
- if spaceToWrapAt >= offset {
- // normal word (not longer than wrapLength)
- wrappedLine.WriteString(str[offset:spaceToWrapAt])
- wrappedLine.WriteString(newLineStr)
- offset = spaceToWrapAt + 1
-
- } else {
- // long word or URL
- if wrapLongWords {
- end := wrapLength + offset
- // long words are wrapped one line at a time
- wrappedLine.WriteString(str[offset:end])
- wrappedLine.WriteString(newLineStr)
- offset += wrapLength
- } else {
- // long words aren't wrapped, just extended beyond limit
- end := wrapLength + offset
- index := strings.IndexRune(str[end:len(str)], ' ')
- if index == -1 {
- wrappedLine.WriteString(str[offset:len(str)])
- offset = inputLineLength
- } else {
- spaceToWrapAt = index + end
- wrappedLine.WriteString(str[offset:spaceToWrapAt])
- wrappedLine.WriteString(newLineStr)
- offset = spaceToWrapAt + 1
- }
- }
- }
- }
-
- wrappedLine.WriteString(str[offset:len(str)])
-
- return wrappedLine.String()
-
-}
-
-/*
-Capitalize capitalizes all the delimiter separated words in a string. Only the first letter of each word is changed.
-To convert the rest of each word to lowercase at the same time, use CapitalizeFully(str string, delimiters ...rune).
-The delimiters represent a set of characters understood to separate words. The first string character
-and the first non-delimiter character after a delimiter will be capitalized. A "" input string returns "".
-Capitalization uses the Unicode title case, normally equivalent to upper case.
-
-Parameters:
- str - the string to capitalize
- delimiters - set of characters to determine capitalization, exclusion of this parameter means whitespace would be delimeter
-
-Returns:
- capitalized string
-*/
-func Capitalize(str string, delimiters ...rune) string {
-
- var delimLen int
-
- if delimiters == nil {
- delimLen = -1
- } else {
- delimLen = len(delimiters)
- }
-
- if str == "" || delimLen == 0 {
- return str
- }
-
- buffer := []rune(str)
- capitalizeNext := true
- for i := 0; i < len(buffer); i++ {
- ch := buffer[i]
- if isDelimiter(ch, delimiters...) {
- capitalizeNext = true
- } else if capitalizeNext {
- buffer[i] = unicode.ToTitle(ch)
- capitalizeNext = false
- }
- }
- return string(buffer)
-
-}
-
-/*
-CapitalizeFully converts all the delimiter separated words in a string into capitalized words, that is each word is made up of a
-titlecase character and then a series of lowercase characters. The delimiters represent a set of characters understood
-to separate words. The first string character and the first non-delimiter character after a delimiter will be capitalized.
-Capitalization uses the Unicode title case, normally equivalent to upper case.
-
-Parameters:
- str - the string to capitalize fully
- delimiters - set of characters to determine capitalization, exclusion of this parameter means whitespace would be delimeter
-
-Returns:
- capitalized string
-*/
-func CapitalizeFully(str string, delimiters ...rune) string {
-
- var delimLen int
-
- if delimiters == nil {
- delimLen = -1
- } else {
- delimLen = len(delimiters)
- }
-
- if str == "" || delimLen == 0 {
- return str
- }
- str = strings.ToLower(str)
- return Capitalize(str, delimiters...)
-}
-
-/*
-Uncapitalize uncapitalizes all the whitespace separated words in a string. Only the first letter of each word is changed.
-The delimiters represent a set of characters understood to separate words. The first string character and the first non-delimiter
-character after a delimiter will be uncapitalized. Whitespace is defined by unicode.IsSpace(char).
-
-Parameters:
- str - the string to uncapitalize fully
- delimiters - set of characters to determine capitalization, exclusion of this parameter means whitespace would be delimeter
-
-Returns:
- uncapitalized string
-*/
-func Uncapitalize(str string, delimiters ...rune) string {
-
- var delimLen int
-
- if delimiters == nil {
- delimLen = -1
- } else {
- delimLen = len(delimiters)
- }
-
- if str == "" || delimLen == 0 {
- return str
- }
-
- buffer := []rune(str)
- uncapitalizeNext := true // TODO Always makes capitalize/un apply to first char.
- for i := 0; i < len(buffer); i++ {
- ch := buffer[i]
- if isDelimiter(ch, delimiters...) {
- uncapitalizeNext = true
- } else if uncapitalizeNext {
- buffer[i] = unicode.ToLower(ch)
- uncapitalizeNext = false
- }
- }
- return string(buffer)
-}
-
-/*
-SwapCase swaps the case of a string using a word based algorithm.
-
-Conversion algorithm:
-
- Upper case character converts to Lower case
- Title case character converts to Lower case
- Lower case character after Whitespace or at start converts to Title case
- Other Lower case character converts to Upper case
- Whitespace is defined by unicode.IsSpace(char).
-
-Parameters:
- str - the string to swap case
-
-Returns:
- the changed string
-*/
-func SwapCase(str string) string {
- if str == "" {
- return str
- }
- buffer := []rune(str)
-
- whitespace := true
-
- for i := 0; i < len(buffer); i++ {
- ch := buffer[i]
- if unicode.IsUpper(ch) {
- buffer[i] = unicode.ToLower(ch)
- whitespace = false
- } else if unicode.IsTitle(ch) {
- buffer[i] = unicode.ToLower(ch)
- whitespace = false
- } else if unicode.IsLower(ch) {
- if whitespace {
- buffer[i] = unicode.ToTitle(ch)
- whitespace = false
- } else {
- buffer[i] = unicode.ToUpper(ch)
- }
- } else {
- whitespace = unicode.IsSpace(ch)
- }
- }
- return string(buffer)
-}
-
-/*
-Initials extracts the initial letters from each word in the string. The first letter of the string and all first
-letters after the defined delimiters are returned as a new string. Their case is not changed. If the delimiters
-parameter is excluded, then Whitespace is used. Whitespace is defined by unicode.IsSpacea(char). An empty delimiter array returns an empty string.
-
-Parameters:
- str - the string to get initials from
- delimiters - set of characters to determine words, exclusion of this parameter means whitespace would be delimeter
-Returns:
- string of initial letters
-*/
-func Initials(str string, delimiters ...rune) string {
- if str == "" {
- return str
- }
- if delimiters != nil && len(delimiters) == 0 {
- return ""
- }
- strLen := len(str)
- var buf bytes.Buffer
- lastWasGap := true
- for i := 0; i < strLen; i++ {
- ch := rune(str[i])
-
- if isDelimiter(ch, delimiters...) {
- lastWasGap = true
- } else if lastWasGap {
- buf.WriteRune(ch)
- lastWasGap = false
- }
- }
- return buf.String()
-}
-
-// private function (lower case func name)
-func isDelimiter(ch rune, delimiters ...rune) bool {
- if delimiters == nil {
- return unicode.IsSpace(ch)
- }
- for _, delimiter := range delimiters {
- if ch == delimiter {
- return true
- }
- }
- return false
-}
diff --git a/vendor/github.com/Masterminds/semver/v3/.gitignore b/vendor/github.com/Masterminds/semver/v3/.gitignore
deleted file mode 100644
index 6b061e6174..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_fuzz/
\ No newline at end of file
diff --git a/vendor/github.com/Masterminds/semver/v3/.golangci.yml b/vendor/github.com/Masterminds/semver/v3/.golangci.yml
deleted file mode 100644
index fbc6332592..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/.golangci.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-run:
- deadline: 2m
-
-linters:
- disable-all: true
- enable:
- - misspell
- - govet
- - staticcheck
- - errcheck
- - unparam
- - ineffassign
- - nakedret
- - gocyclo
- - dupl
- - goimports
- - revive
- - gosec
- - gosimple
- - typecheck
- - unused
-
-linters-settings:
- gofmt:
- simplify: true
- dupl:
- threshold: 600
diff --git a/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md b/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md
deleted file mode 100644
index f95a504fe7..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md
+++ /dev/null
@@ -1,242 +0,0 @@
-# Changelog
-
-## 3.3.0 (2024-08-27)
-
-### Added
-
-- #238: Add LessThanEqual and GreaterThanEqual functions (thanks @grosser)
-- #213: nil version equality checking (thanks @KnutZuidema)
-
-### Changed
-
-- #241: Simplify StrictNewVersion parsing (thanks @grosser)
-- Testing support up through Go 1.23
-- Minimum version set to 1.21 as this is what's tested now
-- Fuzz testing now supports caching
-
-## 3.2.1 (2023-04-10)
-
-### Changed
-
-- #198: Improved testing around pre-release names
-- #200: Improved code scanning with addition of CodeQL
-- #201: Testing now includes Go 1.20. Go 1.17 has been dropped
-- #202: Migrated Fuzz testing to Go built-in Fuzzing. CI runs daily
-- #203: Docs updated for security details
-
-### Fixed
-
-- #199: Fixed issue with range transformations
-
-## 3.2.0 (2022-11-28)
-
-### Added
-
-- #190: Added text marshaling and unmarshaling
-- #167: Added JSON marshalling for constraints (thanks @SimonTheLeg)
-- #173: Implement encoding.TextMarshaler and encoding.TextUnmarshaler on Version (thanks @MarkRosemaker)
-- #179: Added New() version constructor (thanks @kazhuravlev)
-
-### Changed
-
-- #182/#183: Updated CI testing setup
-
-### Fixed
-
-- #186: Fixing issue where validation of constraint section gave false positives
-- #176: Fix constraints check with *-0 (thanks @mtt0)
-- #181: Fixed Caret operator (^) gives unexpected results when the minor version in constraint is 0 (thanks @arshchimni)
-- #161: Fixed godoc (thanks @afirth)
-
-## 3.1.1 (2020-11-23)
-
-### Fixed
-
-- #158: Fixed issue with generated regex operation order that could cause problem
-
-## 3.1.0 (2020-04-15)
-
-### Added
-
-- #131: Add support for serializing/deserializing SQL (thanks @ryancurrah)
-
-### Changed
-
-- #148: More accurate validation messages on constraints
-
-## 3.0.3 (2019-12-13)
-
-### Fixed
-
-- #141: Fixed issue with <= comparison
-
-## 3.0.2 (2019-11-14)
-
-### Fixed
-
-- #134: Fixed broken constraint checking with ^0.0 (thanks @krmichelos)
-
-## 3.0.1 (2019-09-13)
-
-### Fixed
-
-- #125: Fixes issue with module path for v3
-
-## 3.0.0 (2019-09-12)
-
-This is a major release of the semver package which includes API changes. The Go
-API is compatible with ^1. The Go API was not changed because many people are using
-`go get` without Go modules for their applications and API breaking changes cause
-errors which we have or would need to support.
-
-The changes in this release are the handling based on the data passed into the
-functions. These are described in the added and changed sections below.
-
-### Added
-
-- StrictNewVersion function. This is similar to NewVersion but will return an
- error if the version passed in is not a strict semantic version. For example,
- 1.2.3 would pass but v1.2.3 or 1.2 would fail because they are not strictly
- speaking semantic versions. This function is faster, performs fewer operations,
- and uses fewer allocations than NewVersion.
-- Fuzzing has been performed on NewVersion, StrictNewVersion, and NewConstraint.
- The Makefile contains the operations used. For more information on you can start
- on Wikipedia at https://en.wikipedia.org/wiki/Fuzzing
-- Now using Go modules
-
-### Changed
-
-- NewVersion has proper prerelease and metadata validation with error messages
- to signal an issue with either of them
-- ^ now operates using a similar set of rules to npm/js and Rust/Cargo. If the
- version is >=1 the ^ ranges works the same as v1. For major versions of 0 the
- rules have changed. The minor version is treated as the stable version unless
- a patch is specified and then it is equivalent to =. One difference from npm/js
- is that prereleases there are only to a specific version (e.g. 1.2.3).
- Prereleases here look over multiple versions and follow semantic version
- ordering rules. This pattern now follows along with the expected and requested
- handling of this packaged by numerous users.
-
-## 1.5.0 (2019-09-11)
-
-### Added
-
-- #103: Add basic fuzzing for `NewVersion()` (thanks @jesse-c)
-
-### Changed
-
-- #82: Clarify wildcard meaning in range constraints and update tests for it (thanks @greysteil)
-- #83: Clarify caret operator range for pre-1.0.0 dependencies (thanks @greysteil)
-- #72: Adding docs comment pointing to vert for a cli
-- #71: Update the docs on pre-release comparator handling
-- #89: Test with new go versions (thanks @thedevsaddam)
-- #87: Added $ to ValidPrerelease for better validation (thanks @jeremycarroll)
-
-### Fixed
-
-- #78: Fix unchecked error in example code (thanks @ravron)
-- #70: Fix the handling of pre-releases and the 0.0.0 release edge case
-- #97: Fixed copyright file for proper display on GitHub
-- #107: Fix handling prerelease when sorting alphanum and num
-- #109: Fixed where Validate sometimes returns wrong message on error
-
-## 1.4.2 (2018-04-10)
-
-### Changed
-
-- #72: Updated the docs to point to vert for a console appliaction
-- #71: Update the docs on pre-release comparator handling
-
-### Fixed
-
-- #70: Fix the handling of pre-releases and the 0.0.0 release edge case
-
-## 1.4.1 (2018-04-02)
-
-### Fixed
-
-- Fixed #64: Fix pre-release precedence issue (thanks @uudashr)
-
-## 1.4.0 (2017-10-04)
-
-### Changed
-
-- #61: Update NewVersion to parse ints with a 64bit int size (thanks @zknill)
-
-## 1.3.1 (2017-07-10)
-
-### Fixed
-
-- Fixed #57: number comparisons in prerelease sometimes inaccurate
-
-## 1.3.0 (2017-05-02)
-
-### Added
-
-- #45: Added json (un)marshaling support (thanks @mh-cbon)
-- Stability marker. See https://masterminds.github.io/stability/
-
-### Fixed
-
-- #51: Fix handling of single digit tilde constraint (thanks @dgodd)
-
-### Changed
-
-- #55: The godoc icon moved from png to svg
-
-## 1.2.3 (2017-04-03)
-
-### Fixed
-
-- #46: Fixed 0.x.x and 0.0.x in constraints being treated as *
-
-## Release 1.2.2 (2016-12-13)
-
-### Fixed
-
-- #34: Fixed issue where hyphen range was not working with pre-release parsing.
-
-## Release 1.2.1 (2016-11-28)
-
-### Fixed
-
-- #24: Fixed edge case issue where constraint "> 0" does not handle "0.0.1-alpha"
- properly.
-
-## Release 1.2.0 (2016-11-04)
-
-### Added
-
-- #20: Added MustParse function for versions (thanks @adamreese)
-- #15: Added increment methods on versions (thanks @mh-cbon)
-
-### Fixed
-
-- Issue #21: Per the SemVer spec (section 9) a pre-release is unstable and
- might not satisfy the intended compatibility. The change here ignores pre-releases
- on constraint checks (e.g., ~ or ^) when a pre-release is not part of the
- constraint. For example, `^1.2.3` will ignore pre-releases while
- `^1.2.3-alpha` will include them.
-
-## Release 1.1.1 (2016-06-30)
-
-### Changed
-
-- Issue #9: Speed up version comparison performance (thanks @sdboyer)
-- Issue #8: Added benchmarks (thanks @sdboyer)
-- Updated Go Report Card URL to new location
-- Updated Readme to add code snippet formatting (thanks @mh-cbon)
-- Updating tagging to v[SemVer] structure for compatibility with other tools.
-
-## Release 1.1.0 (2016-03-11)
-
-- Issue #2: Implemented validation to provide reasons a versions failed a
- constraint.
-
-## Release 1.0.1 (2015-12-31)
-
-- Fixed #1: * constraint failing on valid versions.
-
-## Release 1.0.0 (2015-10-20)
-
-- Initial release
diff --git a/vendor/github.com/Masterminds/semver/v3/LICENSE.txt b/vendor/github.com/Masterminds/semver/v3/LICENSE.txt
deleted file mode 100644
index 9ff7da9c48..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014-2019, Matt Butcher and Matt Farina
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/Masterminds/semver/v3/Makefile b/vendor/github.com/Masterminds/semver/v3/Makefile
deleted file mode 100644
index 9ca87a2c79..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-GOPATH=$(shell go env GOPATH)
-GOLANGCI_LINT=$(GOPATH)/bin/golangci-lint
-
-.PHONY: lint
-lint: $(GOLANGCI_LINT)
- @echo "==> Linting codebase"
- @$(GOLANGCI_LINT) run
-
-.PHONY: test
-test:
- @echo "==> Running tests"
- GO111MODULE=on go test -v
-
-.PHONY: test-cover
-test-cover:
- @echo "==> Running Tests with coverage"
- GO111MODULE=on go test -cover .
-
-.PHONY: fuzz
-fuzz:
- @echo "==> Running Fuzz Tests"
- go env GOCACHE
- go test -fuzz=FuzzNewVersion -fuzztime=15s .
- go test -fuzz=FuzzStrictNewVersion -fuzztime=15s .
- go test -fuzz=FuzzNewConstraint -fuzztime=15s .
-
-$(GOLANGCI_LINT):
- # Install golangci-lint. The configuration for it is in the .golangci.yml
- # file in the root of the repository
- echo ${GOPATH}
- curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(GOPATH)/bin v1.56.2
diff --git a/vendor/github.com/Masterminds/semver/v3/README.md b/vendor/github.com/Masterminds/semver/v3/README.md
deleted file mode 100644
index ed56936084..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/README.md
+++ /dev/null
@@ -1,258 +0,0 @@
-# SemVer
-
-The `semver` package provides the ability to work with [Semantic Versions](http://semver.org) in Go. Specifically it provides the ability to:
-
-* Parse semantic versions
-* Sort semantic versions
-* Check if a semantic version fits within a set of constraints
-* Optionally work with a `v` prefix
-
-[](https://masterminds.github.io/stability/active.html)
-[](https://github.com/Masterminds/semver/actions)
-[](https://pkg.go.dev/github.com/Masterminds/semver/v3)
-[](https://goreportcard.com/report/github.com/Masterminds/semver)
-
-## Package Versions
-
-Note, import `github.com/Masterminds/semver/v3` to use the latest version.
-
-There are three major versions fo the `semver` package.
-
-* 3.x.x is the stable and active version. This version is focused on constraint
- compatibility for range handling in other tools from other languages. It has
- a similar API to the v1 releases. The development of this version is on the master
- branch. The documentation for this version is below.
-* 2.x was developed primarily for [dep](https://github.com/golang/dep). There are
- no tagged releases and the development was performed by [@sdboyer](https://github.com/sdboyer).
- There are API breaking changes from v1. This version lives on the [2.x branch](https://github.com/Masterminds/semver/tree/2.x).
-* 1.x.x is the original release. It is no longer maintained. You should use the
- v3 release instead. You can read the documentation for the 1.x.x release
- [here](https://github.com/Masterminds/semver/blob/release-1/README.md).
-
-## Parsing Semantic Versions
-
-There are two functions that can parse semantic versions. The `StrictNewVersion`
-function only parses valid version 2 semantic versions as outlined in the
-specification. The `NewVersion` function attempts to coerce a version into a
-semantic version and parse it. For example, if there is a leading v or a version
-listed without all 3 parts (e.g. `v1.2`) it will attempt to coerce it into a valid
-semantic version (e.g., 1.2.0). In both cases a `Version` object is returned
-that can be sorted, compared, and used in constraints.
-
-When parsing a version an error is returned if there is an issue parsing the
-version. For example,
-
- v, err := semver.NewVersion("1.2.3-beta.1+build345")
-
-The version object has methods to get the parts of the version, compare it to
-other versions, convert the version back into a string, and get the original
-string. Getting the original string is useful if the semantic version was coerced
-into a valid form.
-
-## Sorting Semantic Versions
-
-A set of versions can be sorted using the `sort` package from the standard library.
-For example,
-
-```go
-raw := []string{"1.2.3", "1.0", "1.3", "2", "0.4.2",}
-vs := make([]*semver.Version, len(raw))
-for i, r := range raw {
- v, err := semver.NewVersion(r)
- if err != nil {
- t.Errorf("Error parsing version: %s", err)
- }
-
- vs[i] = v
-}
-
-sort.Sort(semver.Collection(vs))
-```
-
-## Checking Version Constraints
-
-There are two methods for comparing versions. One uses comparison methods on
-`Version` instances and the other uses `Constraints`. There are some important
-differences to notes between these two methods of comparison.
-
-1. When two versions are compared using functions such as `Compare`, `LessThan`,
- and others it will follow the specification and always include pre-releases
- within the comparison. It will provide an answer that is valid with the
- comparison section of the spec at https://semver.org/#spec-item-11
-2. When constraint checking is used for checks or validation it will follow a
- different set of rules that are common for ranges with tools like npm/js
- and Rust/Cargo. This includes considering pre-releases to be invalid if the
- ranges does not include one. If you want to have it include pre-releases a
- simple solution is to include `-0` in your range.
-3. Constraint ranges can have some complex rules including the shorthand use of
- ~ and ^. For more details on those see the options below.
-
-There are differences between the two methods or checking versions because the
-comparison methods on `Version` follow the specification while comparison ranges
-are not part of the specification. Different packages and tools have taken it
-upon themselves to come up with range rules. This has resulted in differences.
-For example, npm/js and Cargo/Rust follow similar patterns while PHP has a
-different pattern for ^. The comparison features in this package follow the
-npm/js and Cargo/Rust lead because applications using it have followed similar
-patters with their versions.
-
-Checking a version against version constraints is one of the most featureful
-parts of the package.
-
-```go
-c, err := semver.NewConstraint(">= 1.2.3")
-if err != nil {
- // Handle constraint not being parsable.
-}
-
-v, err := semver.NewVersion("1.3")
-if err != nil {
- // Handle version not being parsable.
-}
-// Check if the version meets the constraints. The variable a will be true.
-a := c.Check(v)
-```
-
-### Basic Comparisons
-
-There are two elements to the comparisons. First, a comparison string is a list
-of space or comma separated AND comparisons. These are then separated by || (OR)
-comparisons. For example, `">= 1.2 < 3.0.0 || >= 4.2.3"` is looking for a
-comparison that's greater than or equal to 1.2 and less than 3.0.0 or is
-greater than or equal to 4.2.3.
-
-The basic comparisons are:
-
-* `=`: equal (aliased to no operator)
-* `!=`: not equal
-* `>`: greater than
-* `<`: less than
-* `>=`: greater than or equal to
-* `<=`: less than or equal to
-
-### Working With Prerelease Versions
-
-Pre-releases, for those not familiar with them, are used for software releases
-prior to stable or generally available releases. Examples of pre-releases include
-development, alpha, beta, and release candidate releases. A pre-release may be
-a version such as `1.2.3-beta.1` while the stable release would be `1.2.3`. In the
-order of precedence, pre-releases come before their associated releases. In this
-example `1.2.3-beta.1 < 1.2.3`.
-
-According to the Semantic Version specification, pre-releases may not be
-API compliant with their release counterpart. It says,
-
-> A pre-release version indicates that the version is unstable and might not satisfy the intended compatibility requirements as denoted by its associated normal version.
-
-SemVer's comparisons using constraints without a pre-release comparator will skip
-pre-release versions. For example, `>=1.2.3` will skip pre-releases when looking
-at a list of releases while `>=1.2.3-0` will evaluate and find pre-releases.
-
-The reason for the `0` as a pre-release version in the example comparison is
-because pre-releases can only contain ASCII alphanumerics and hyphens (along with
-`.` separators), per the spec. Sorting happens in ASCII sort order, again per the
-spec. The lowest character is a `0` in ASCII sort order
-(see an [ASCII Table](http://www.asciitable.com/))
-
-Understanding ASCII sort ordering is important because A-Z comes before a-z. That
-means `>=1.2.3-BETA` will return `1.2.3-alpha`. What you might expect from case
-sensitivity doesn't apply here. This is due to ASCII sort ordering which is what
-the spec specifies.
-
-### Hyphen Range Comparisons
-
-There are multiple methods to handle ranges and the first is hyphens ranges.
-These look like:
-
-* `1.2 - 1.4.5` which is equivalent to `>= 1.2 <= 1.4.5`
-* `2.3.4 - 4.5` which is equivalent to `>= 2.3.4 <= 4.5`
-
-Note that `1.2-1.4.5` without whitespace is parsed completely differently; it's
-parsed as a single constraint `1.2.0` with _prerelease_ `1.4.5`.
-
-### Wildcards In Comparisons
-
-The `x`, `X`, and `*` characters can be used as a wildcard character. This works
-for all comparison operators. When used on the `=` operator it falls
-back to the patch level comparison (see tilde below). For example,
-
-* `1.2.x` is equivalent to `>= 1.2.0, < 1.3.0`
-* `>= 1.2.x` is equivalent to `>= 1.2.0`
-* `<= 2.x` is equivalent to `< 3`
-* `*` is equivalent to `>= 0.0.0`
-
-### Tilde Range Comparisons (Patch)
-
-The tilde (`~`) comparison operator is for patch level ranges when a minor
-version is specified and major level changes when the minor number is missing.
-For example,
-
-* `~1.2.3` is equivalent to `>= 1.2.3, < 1.3.0`
-* `~1` is equivalent to `>= 1, < 2`
-* `~2.3` is equivalent to `>= 2.3, < 2.4`
-* `~1.2.x` is equivalent to `>= 1.2.0, < 1.3.0`
-* `~1.x` is equivalent to `>= 1, < 2`
-
-### Caret Range Comparisons (Major)
-
-The caret (`^`) comparison operator is for major level changes once a stable
-(1.0.0) release has occurred. Prior to a 1.0.0 release the minor versions acts
-as the API stability level. This is useful when comparisons of API versions as a
-major change is API breaking. For example,
-
-* `^1.2.3` is equivalent to `>= 1.2.3, < 2.0.0`
-* `^1.2.x` is equivalent to `>= 1.2.0, < 2.0.0`
-* `^2.3` is equivalent to `>= 2.3, < 3`
-* `^2.x` is equivalent to `>= 2.0.0, < 3`
-* `^0.2.3` is equivalent to `>=0.2.3 <0.3.0`
-* `^0.2` is equivalent to `>=0.2.0 <0.3.0`
-* `^0.0.3` is equivalent to `>=0.0.3 <0.0.4`
-* `^0.0` is equivalent to `>=0.0.0 <0.1.0`
-* `^0` is equivalent to `>=0.0.0 <1.0.0`
-
-## Validation
-
-In addition to testing a version against a constraint, a version can be validated
-against a constraint. When validation fails a slice of errors containing why a
-version didn't meet the constraint is returned. For example,
-
-```go
-c, err := semver.NewConstraint("<= 1.2.3, >= 1.4")
-if err != nil {
- // Handle constraint not being parseable.
-}
-
-v, err := semver.NewVersion("1.3")
-if err != nil {
- // Handle version not being parseable.
-}
-
-// Validate a version against a constraint.
-a, msgs := c.Validate(v)
-// a is false
-for _, m := range msgs {
- fmt.Println(m)
-
- // Loops over the errors which would read
- // "1.3 is greater than 1.2.3"
- // "1.3 is less than 1.4"
-}
-```
-
-## Contribute
-
-If you find an issue or want to contribute please file an [issue](https://github.com/Masterminds/semver/issues)
-or [create a pull request](https://github.com/Masterminds/semver/pulls).
-
-## Security
-
-Security is an important consideration for this project. The project currently
-uses the following tools to help discover security issues:
-
-* [CodeQL](https://github.com/Masterminds/semver)
-* [gosec](https://github.com/securego/gosec)
-* Daily Fuzz testing
-
-If you believe you have found a security vulnerability you can privately disclose
-it through the [GitHub security page](https://github.com/Masterminds/semver/security).
diff --git a/vendor/github.com/Masterminds/semver/v3/SECURITY.md b/vendor/github.com/Masterminds/semver/v3/SECURITY.md
deleted file mode 100644
index a30a66b1f7..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/SECURITY.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-The following versions of semver are currently supported:
-
-| Version | Supported |
-| ------- | ------------------ |
-| 3.x | :white_check_mark: |
-| 2.x | :x: |
-| 1.x | :x: |
-
-Fixes are only released for the latest minor version in the form of a patch release.
-
-## Reporting a Vulnerability
-
-You can privately disclose a vulnerability through GitHubs
-[private vulnerability reporting](https://github.com/Masterminds/semver/security/advisories)
-mechanism.
diff --git a/vendor/github.com/Masterminds/semver/v3/collection.go b/vendor/github.com/Masterminds/semver/v3/collection.go
deleted file mode 100644
index a78235895f..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/collection.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package semver
-
-// Collection is a collection of Version instances and implements the sort
-// interface. See the sort package for more details.
-// https://golang.org/pkg/sort/
-type Collection []*Version
-
-// Len returns the length of a collection. The number of Version instances
-// on the slice.
-func (c Collection) Len() int {
- return len(c)
-}
-
-// Less is needed for the sort interface to compare two Version objects on the
-// slice. If checks if one is less than the other.
-func (c Collection) Less(i, j int) bool {
- return c[i].LessThan(c[j])
-}
-
-// Swap is needed for the sort interface to replace the Version objects
-// at two different positions in the slice.
-func (c Collection) Swap(i, j int) {
- c[i], c[j] = c[j], c[i]
-}
diff --git a/vendor/github.com/Masterminds/semver/v3/constraints.go b/vendor/github.com/Masterminds/semver/v3/constraints.go
deleted file mode 100644
index 8461c7ed90..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/constraints.go
+++ /dev/null
@@ -1,594 +0,0 @@
-package semver
-
-import (
- "bytes"
- "errors"
- "fmt"
- "regexp"
- "strings"
-)
-
-// Constraints is one or more constraint that a semantic version can be
-// checked against.
-type Constraints struct {
- constraints [][]*constraint
-}
-
-// NewConstraint returns a Constraints instance that a Version instance can
-// be checked against. If there is a parse error it will be returned.
-func NewConstraint(c string) (*Constraints, error) {
-
- // Rewrite - ranges into a comparison operation.
- c = rewriteRange(c)
-
- ors := strings.Split(c, "||")
- or := make([][]*constraint, len(ors))
- for k, v := range ors {
-
- // TODO: Find a way to validate and fetch all the constraints in a simpler form
-
- // Validate the segment
- if !validConstraintRegex.MatchString(v) {
- return nil, fmt.Errorf("improper constraint: %s", v)
- }
-
- cs := findConstraintRegex.FindAllString(v, -1)
- if cs == nil {
- cs = append(cs, v)
- }
- result := make([]*constraint, len(cs))
- for i, s := range cs {
- pc, err := parseConstraint(s)
- if err != nil {
- return nil, err
- }
-
- result[i] = pc
- }
- or[k] = result
- }
-
- o := &Constraints{constraints: or}
- return o, nil
-}
-
-// Check tests if a version satisfies the constraints.
-func (cs Constraints) Check(v *Version) bool {
- // TODO(mattfarina): For v4 of this library consolidate the Check and Validate
- // functions as the underlying functions make that possible now.
- // loop over the ORs and check the inner ANDs
- for _, o := range cs.constraints {
- joy := true
- for _, c := range o {
- if check, _ := c.check(v); !check {
- joy = false
- break
- }
- }
-
- if joy {
- return true
- }
- }
-
- return false
-}
-
-// Validate checks if a version satisfies a constraint. If not a slice of
-// reasons for the failure are returned in addition to a bool.
-func (cs Constraints) Validate(v *Version) (bool, []error) {
- // loop over the ORs and check the inner ANDs
- var e []error
-
- // Capture the prerelease message only once. When it happens the first time
- // this var is marked
- var prerelesase bool
- for _, o := range cs.constraints {
- joy := true
- for _, c := range o {
- // Before running the check handle the case there the version is
- // a prerelease and the check is not searching for prereleases.
- if c.con.pre == "" && v.pre != "" {
- if !prerelesase {
- em := fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- e = append(e, em)
- prerelesase = true
- }
- joy = false
-
- } else {
-
- if _, err := c.check(v); err != nil {
- e = append(e, err)
- joy = false
- }
- }
- }
-
- if joy {
- return true, []error{}
- }
- }
-
- return false, e
-}
-
-func (cs Constraints) String() string {
- buf := make([]string, len(cs.constraints))
- var tmp bytes.Buffer
-
- for k, v := range cs.constraints {
- tmp.Reset()
- vlen := len(v)
- for kk, c := range v {
- tmp.WriteString(c.string())
-
- // Space separate the AND conditions
- if vlen > 1 && kk < vlen-1 {
- tmp.WriteString(" ")
- }
- }
- buf[k] = tmp.String()
- }
-
- return strings.Join(buf, " || ")
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface.
-func (cs *Constraints) UnmarshalText(text []byte) error {
- temp, err := NewConstraint(string(text))
- if err != nil {
- return err
- }
-
- *cs = *temp
-
- return nil
-}
-
-// MarshalText implements the encoding.TextMarshaler interface.
-func (cs Constraints) MarshalText() ([]byte, error) {
- return []byte(cs.String()), nil
-}
-
-var constraintOps map[string]cfunc
-var constraintRegex *regexp.Regexp
-var constraintRangeRegex *regexp.Regexp
-
-// Used to find individual constraints within a multi-constraint string
-var findConstraintRegex *regexp.Regexp
-
-// Used to validate an segment of ANDs is valid
-var validConstraintRegex *regexp.Regexp
-
-const cvRegex string = `v?([0-9|x|X|\*]+)(\.[0-9|x|X|\*]+)?(\.[0-9|x|X|\*]+)?` +
- `(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?` +
- `(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?`
-
-func init() {
- constraintOps = map[string]cfunc{
- "": constraintTildeOrEqual,
- "=": constraintTildeOrEqual,
- "!=": constraintNotEqual,
- ">": constraintGreaterThan,
- "<": constraintLessThan,
- ">=": constraintGreaterThanEqual,
- "=>": constraintGreaterThanEqual,
- "<=": constraintLessThanEqual,
- "=<": constraintLessThanEqual,
- "~": constraintTilde,
- "~>": constraintTilde,
- "^": constraintCaret,
- }
-
- ops := `=||!=|>|<|>=|=>|<=|=<|~|~>|\^`
-
- constraintRegex = regexp.MustCompile(fmt.Sprintf(
- `^\s*(%s)\s*(%s)\s*$`,
- ops,
- cvRegex))
-
- constraintRangeRegex = regexp.MustCompile(fmt.Sprintf(
- `\s*(%s)\s+-\s+(%s)\s*`,
- cvRegex, cvRegex))
-
- findConstraintRegex = regexp.MustCompile(fmt.Sprintf(
- `(%s)\s*(%s)`,
- ops,
- cvRegex))
-
- // The first time a constraint shows up will look slightly different from
- // future times it shows up due to a leading space or comma in a given
- // string.
- validConstraintRegex = regexp.MustCompile(fmt.Sprintf(
- `^(\s*(%s)\s*(%s)\s*)((?:\s+|,\s*)(%s)\s*(%s)\s*)*$`,
- ops,
- cvRegex,
- ops,
- cvRegex))
-}
-
-// An individual constraint
-type constraint struct {
- // The version used in the constraint check. For example, if a constraint
- // is '<= 2.0.0' the con a version instance representing 2.0.0.
- con *Version
-
- // The original parsed version (e.g., 4.x from != 4.x)
- orig string
-
- // The original operator for the constraint
- origfunc string
-
- // When an x is used as part of the version (e.g., 1.x)
- minorDirty bool
- dirty bool
- patchDirty bool
-}
-
-// Check if a version meets the constraint
-func (c *constraint) check(v *Version) (bool, error) {
- return constraintOps[c.origfunc](v, c)
-}
-
-// String prints an individual constraint into a string
-func (c *constraint) string() string {
- return c.origfunc + c.orig
-}
-
-type cfunc func(v *Version, c *constraint) (bool, error)
-
-func parseConstraint(c string) (*constraint, error) {
- if len(c) > 0 {
- m := constraintRegex.FindStringSubmatch(c)
- if m == nil {
- return nil, fmt.Errorf("improper constraint: %s", c)
- }
-
- cs := &constraint{
- orig: m[2],
- origfunc: m[1],
- }
-
- ver := m[2]
- minorDirty := false
- patchDirty := false
- dirty := false
- if isX(m[3]) || m[3] == "" {
- ver = fmt.Sprintf("0.0.0%s", m[6])
- dirty = true
- } else if isX(strings.TrimPrefix(m[4], ".")) || m[4] == "" {
- minorDirty = true
- dirty = true
- ver = fmt.Sprintf("%s.0.0%s", m[3], m[6])
- } else if isX(strings.TrimPrefix(m[5], ".")) || m[5] == "" {
- dirty = true
- patchDirty = true
- ver = fmt.Sprintf("%s%s.0%s", m[3], m[4], m[6])
- }
-
- con, err := NewVersion(ver)
- if err != nil {
-
- // The constraintRegex should catch any regex parsing errors. So,
- // we should never get here.
- return nil, errors.New("constraint Parser Error")
- }
-
- cs.con = con
- cs.minorDirty = minorDirty
- cs.patchDirty = patchDirty
- cs.dirty = dirty
-
- return cs, nil
- }
-
- // The rest is the special case where an empty string was passed in which
- // is equivalent to * or >=0.0.0
- con, err := StrictNewVersion("0.0.0")
- if err != nil {
-
- // The constraintRegex should catch any regex parsing errors. So,
- // we should never get here.
- return nil, errors.New("constraint Parser Error")
- }
-
- cs := &constraint{
- con: con,
- orig: c,
- origfunc: "",
- minorDirty: false,
- patchDirty: false,
- dirty: true,
- }
- return cs, nil
-}
-
-// Constraint functions
-func constraintNotEqual(v *Version, c *constraint) (bool, error) {
- if c.dirty {
-
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- if c.con.Major() != v.Major() {
- return true, nil
- }
- if c.con.Minor() != v.Minor() && !c.minorDirty {
- return true, nil
- } else if c.minorDirty {
- return false, fmt.Errorf("%s is equal to %s", v, c.orig)
- } else if c.con.Patch() != v.Patch() && !c.patchDirty {
- return true, nil
- } else if c.patchDirty {
- // Need to handle prereleases if present
- if v.Prerelease() != "" || c.con.Prerelease() != "" {
- eq := comparePrerelease(v.Prerelease(), c.con.Prerelease()) != 0
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s is equal to %s", v, c.orig)
- }
- return false, fmt.Errorf("%s is equal to %s", v, c.orig)
- }
- }
-
- eq := v.Equal(c.con)
- if eq {
- return false, fmt.Errorf("%s is equal to %s", v, c.orig)
- }
-
- return true, nil
-}
-
-func constraintGreaterThan(v *Version, c *constraint) (bool, error) {
-
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- var eq bool
-
- if !c.dirty {
- eq = v.Compare(c.con) == 1
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s is less than or equal to %s", v, c.orig)
- }
-
- if v.Major() > c.con.Major() {
- return true, nil
- } else if v.Major() < c.con.Major() {
- return false, fmt.Errorf("%s is less than or equal to %s", v, c.orig)
- } else if c.minorDirty {
- // This is a range case such as >11. When the version is something like
- // 11.1.0 is it not > 11. For that we would need 12 or higher
- return false, fmt.Errorf("%s is less than or equal to %s", v, c.orig)
- } else if c.patchDirty {
- // This is for ranges such as >11.1. A version of 11.1.1 is not greater
- // which one of 11.2.1 is greater
- eq = v.Minor() > c.con.Minor()
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s is less than or equal to %s", v, c.orig)
- }
-
- // If we have gotten here we are not comparing pre-preleases and can use the
- // Compare function to accomplish that.
- eq = v.Compare(c.con) == 1
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s is less than or equal to %s", v, c.orig)
-}
-
-func constraintLessThan(v *Version, c *constraint) (bool, error) {
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- eq := v.Compare(c.con) < 0
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s is greater than or equal to %s", v, c.orig)
-}
-
-func constraintGreaterThanEqual(v *Version, c *constraint) (bool, error) {
-
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- eq := v.Compare(c.con) >= 0
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s is less than %s", v, c.orig)
-}
-
-func constraintLessThanEqual(v *Version, c *constraint) (bool, error) {
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- var eq bool
-
- if !c.dirty {
- eq = v.Compare(c.con) <= 0
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s is greater than %s", v, c.orig)
- }
-
- if v.Major() > c.con.Major() {
- return false, fmt.Errorf("%s is greater than %s", v, c.orig)
- } else if v.Major() == c.con.Major() && v.Minor() > c.con.Minor() && !c.minorDirty {
- return false, fmt.Errorf("%s is greater than %s", v, c.orig)
- }
-
- return true, nil
-}
-
-// ~*, ~>* --> >= 0.0.0 (any)
-// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0, <3.0.0
-// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0, <2.1.0
-// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0, <1.3.0
-// ~1.2.3, ~>1.2.3 --> >=1.2.3, <1.3.0
-// ~1.2.0, ~>1.2.0 --> >=1.2.0, <1.3.0
-func constraintTilde(v *Version, c *constraint) (bool, error) {
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- if v.LessThan(c.con) {
- return false, fmt.Errorf("%s is less than %s", v, c.orig)
- }
-
- // ~0.0.0 is a special case where all constraints are accepted. It's
- // equivalent to >= 0.0.0.
- if c.con.Major() == 0 && c.con.Minor() == 0 && c.con.Patch() == 0 &&
- !c.minorDirty && !c.patchDirty {
- return true, nil
- }
-
- if v.Major() != c.con.Major() {
- return false, fmt.Errorf("%s does not have same major version as %s", v, c.orig)
- }
-
- if v.Minor() != c.con.Minor() && !c.minorDirty {
- return false, fmt.Errorf("%s does not have same major and minor version as %s", v, c.orig)
- }
-
- return true, nil
-}
-
-// When there is a .x (dirty) status it automatically opts in to ~. Otherwise
-// it's a straight =
-func constraintTildeOrEqual(v *Version, c *constraint) (bool, error) {
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- if c.dirty {
- return constraintTilde(v, c)
- }
-
- eq := v.Equal(c.con)
- if eq {
- return true, nil
- }
-
- return false, fmt.Errorf("%s is not equal to %s", v, c.orig)
-}
-
-// ^* --> (any)
-// ^1.2.3 --> >=1.2.3 <2.0.0
-// ^1.2 --> >=1.2.0 <2.0.0
-// ^1 --> >=1.0.0 <2.0.0
-// ^0.2.3 --> >=0.2.3 <0.3.0
-// ^0.2 --> >=0.2.0 <0.3.0
-// ^0.0.3 --> >=0.0.3 <0.0.4
-// ^0.0 --> >=0.0.0 <0.1.0
-// ^0 --> >=0.0.0 <1.0.0
-func constraintCaret(v *Version, c *constraint) (bool, error) {
- // If there is a pre-release on the version but the constraint isn't looking
- // for them assume that pre-releases are not compatible. See issue 21 for
- // more details.
- if v.Prerelease() != "" && c.con.Prerelease() == "" {
- return false, fmt.Errorf("%s is a prerelease version and the constraint is only looking for release versions", v)
- }
-
- // This less than handles prereleases
- if v.LessThan(c.con) {
- return false, fmt.Errorf("%s is less than %s", v, c.orig)
- }
-
- var eq bool
-
- // ^ when the major > 0 is >=x.y.z < x+1
- if c.con.Major() > 0 || c.minorDirty {
-
- // ^ has to be within a major range for > 0. Everything less than was
- // filtered out with the LessThan call above. This filters out those
- // that greater but not within the same major range.
- eq = v.Major() == c.con.Major()
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s does not have same major version as %s", v, c.orig)
- }
-
- // ^ when the major is 0 and minor > 0 is >=0.y.z < 0.y+1
- if c.con.Major() == 0 && v.Major() > 0 {
- return false, fmt.Errorf("%s does not have same major version as %s", v, c.orig)
- }
- // If the con Minor is > 0 it is not dirty
- if c.con.Minor() > 0 || c.patchDirty {
- eq = v.Minor() == c.con.Minor()
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s does not have same minor version as %s. Expected minor versions to match when constraint major version is 0", v, c.orig)
- }
- // ^ when the minor is 0 and minor > 0 is =0.0.z
- if c.con.Minor() == 0 && v.Minor() > 0 {
- return false, fmt.Errorf("%s does not have same minor version as %s", v, c.orig)
- }
-
- // At this point the major is 0 and the minor is 0 and not dirty. The patch
- // is not dirty so we need to check if they are equal. If they are not equal
- eq = c.con.Patch() == v.Patch()
- if eq {
- return true, nil
- }
- return false, fmt.Errorf("%s does not equal %s. Expect version and constraint to equal when major and minor versions are 0", v, c.orig)
-}
-
-func isX(x string) bool {
- switch x {
- case "x", "*", "X":
- return true
- default:
- return false
- }
-}
-
-func rewriteRange(i string) string {
- m := constraintRangeRegex.FindAllStringSubmatch(i, -1)
- if m == nil {
- return i
- }
- o := i
- for _, v := range m {
- t := fmt.Sprintf(">= %s, <= %s ", v[1], v[11])
- o = strings.Replace(o, v[0], t, 1)
- }
-
- return o
-}
diff --git a/vendor/github.com/Masterminds/semver/v3/doc.go b/vendor/github.com/Masterminds/semver/v3/doc.go
deleted file mode 100644
index 74f97caa57..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/doc.go
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-Package semver provides the ability to work with Semantic Versions (http://semver.org) in Go.
-
-Specifically it provides the ability to:
-
- - Parse semantic versions
- - Sort semantic versions
- - Check if a semantic version fits within a set of constraints
- - Optionally work with a `v` prefix
-
-# Parsing Semantic Versions
-
-There are two functions that can parse semantic versions. The `StrictNewVersion`
-function only parses valid version 2 semantic versions as outlined in the
-specification. The `NewVersion` function attempts to coerce a version into a
-semantic version and parse it. For example, if there is a leading v or a version
-listed without all 3 parts (e.g. 1.2) it will attempt to coerce it into a valid
-semantic version (e.g., 1.2.0). In both cases a `Version` object is returned
-that can be sorted, compared, and used in constraints.
-
-When parsing a version an optional error can be returned if there is an issue
-parsing the version. For example,
-
- v, err := semver.NewVersion("1.2.3-beta.1+b345")
-
-The version object has methods to get the parts of the version, compare it to
-other versions, convert the version back into a string, and get the original
-string. For more details please see the documentation
-at https://godoc.org/github.com/Masterminds/semver.
-
-# Sorting Semantic Versions
-
-A set of versions can be sorted using the `sort` package from the standard library.
-For example,
-
- raw := []string{"1.2.3", "1.0", "1.3", "2", "0.4.2",}
- vs := make([]*semver.Version, len(raw))
- for i, r := range raw {
- v, err := semver.NewVersion(r)
- if err != nil {
- t.Errorf("Error parsing version: %s", err)
- }
-
- vs[i] = v
- }
-
- sort.Sort(semver.Collection(vs))
-
-# Checking Version Constraints and Comparing Versions
-
-There are two methods for comparing versions. One uses comparison methods on
-`Version` instances and the other is using Constraints. There are some important
-differences to notes between these two methods of comparison.
-
- 1. When two versions are compared using functions such as `Compare`, `LessThan`,
- and others it will follow the specification and always include prereleases
- within the comparison. It will provide an answer valid with the comparison
- spec section at https://semver.org/#spec-item-11
- 2. When constraint checking is used for checks or validation it will follow a
- different set of rules that are common for ranges with tools like npm/js
- and Rust/Cargo. This includes considering prereleases to be invalid if the
- ranges does not include on. If you want to have it include pre-releases a
- simple solution is to include `-0` in your range.
- 3. Constraint ranges can have some complex rules including the shorthard use of
- ~ and ^. For more details on those see the options below.
-
-There are differences between the two methods or checking versions because the
-comparison methods on `Version` follow the specification while comparison ranges
-are not part of the specification. Different packages and tools have taken it
-upon themselves to come up with range rules. This has resulted in differences.
-For example, npm/js and Cargo/Rust follow similar patterns which PHP has a
-different pattern for ^. The comparison features in this package follow the
-npm/js and Cargo/Rust lead because applications using it have followed similar
-patters with their versions.
-
-Checking a version against version constraints is one of the most featureful
-parts of the package.
-
- c, err := semver.NewConstraint(">= 1.2.3")
- if err != nil {
- // Handle constraint not being parsable.
- }
-
- v, err := semver.NewVersion("1.3")
- if err != nil {
- // Handle version not being parsable.
- }
- // Check if the version meets the constraints. The a variable will be true.
- a := c.Check(v)
-
-# Basic Comparisons
-
-There are two elements to the comparisons. First, a comparison string is a list
-of comma or space separated AND comparisons. These are then separated by || (OR)
-comparisons. For example, `">= 1.2 < 3.0.0 || >= 4.2.3"` is looking for a
-comparison that's greater than or equal to 1.2 and less than 3.0.0 or is
-greater than or equal to 4.2.3. This can also be written as
-`">= 1.2, < 3.0.0 || >= 4.2.3"`
-
-The basic comparisons are:
-
- - `=`: equal (aliased to no operator)
- - `!=`: not equal
- - `>`: greater than
- - `<`: less than
- - `>=`: greater than or equal to
- - `<=`: less than or equal to
-
-# Hyphen Range Comparisons
-
-There are multiple methods to handle ranges and the first is hyphens ranges.
-These look like:
-
- - `1.2 - 1.4.5` which is equivalent to `>= 1.2, <= 1.4.5`
- - `2.3.4 - 4.5` which is equivalent to `>= 2.3.4 <= 4.5`
-
-# Wildcards In Comparisons
-
-The `x`, `X`, and `*` characters can be used as a wildcard character. This works
-for all comparison operators. When used on the `=` operator it falls
-back to the tilde operation. For example,
-
- - `1.2.x` is equivalent to `>= 1.2.0 < 1.3.0`
- - `>= 1.2.x` is equivalent to `>= 1.2.0`
- - `<= 2.x` is equivalent to `<= 3`
- - `*` is equivalent to `>= 0.0.0`
-
-Tilde Range Comparisons (Patch)
-
-The tilde (`~`) comparison operator is for patch level ranges when a minor
-version is specified and major level changes when the minor number is missing.
-For example,
-
- - `~1.2.3` is equivalent to `>= 1.2.3 < 1.3.0`
- - `~1` is equivalent to `>= 1, < 2`
- - `~2.3` is equivalent to `>= 2.3 < 2.4`
- - `~1.2.x` is equivalent to `>= 1.2.0 < 1.3.0`
- - `~1.x` is equivalent to `>= 1 < 2`
-
-Caret Range Comparisons (Major)
-
-The caret (`^`) comparison operator is for major level changes once a stable
-(1.0.0) release has occurred. Prior to a 1.0.0 release the minor versions acts
-as the API stability level. This is useful when comparisons of API versions as a
-major change is API breaking. For example,
-
- - `^1.2.3` is equivalent to `>= 1.2.3, < 2.0.0`
- - `^1.2.x` is equivalent to `>= 1.2.0, < 2.0.0`
- - `^2.3` is equivalent to `>= 2.3, < 3`
- - `^2.x` is equivalent to `>= 2.0.0, < 3`
- - `^0.2.3` is equivalent to `>=0.2.3 <0.3.0`
- - `^0.2` is equivalent to `>=0.2.0 <0.3.0`
- - `^0.0.3` is equivalent to `>=0.0.3 <0.0.4`
- - `^0.0` is equivalent to `>=0.0.0 <0.1.0`
- - `^0` is equivalent to `>=0.0.0 <1.0.0`
-
-# Validation
-
-In addition to testing a version against a constraint, a version can be validated
-against a constraint. When validation fails a slice of errors containing why a
-version didn't meet the constraint is returned. For example,
-
- c, err := semver.NewConstraint("<= 1.2.3, >= 1.4")
- if err != nil {
- // Handle constraint not being parseable.
- }
-
- v, _ := semver.NewVersion("1.3")
- if err != nil {
- // Handle version not being parseable.
- }
-
- // Validate a version against a constraint.
- a, msgs := c.Validate(v)
- // a is false
- for _, m := range msgs {
- fmt.Println(m)
-
- // Loops over the errors which would read
- // "1.3 is greater than 1.2.3"
- // "1.3 is less than 1.4"
- }
-*/
-package semver
diff --git a/vendor/github.com/Masterminds/semver/v3/version.go b/vendor/github.com/Masterminds/semver/v3/version.go
deleted file mode 100644
index ff499fb664..0000000000
--- a/vendor/github.com/Masterminds/semver/v3/version.go
+++ /dev/null
@@ -1,639 +0,0 @@
-package semver
-
-import (
- "bytes"
- "database/sql/driver"
- "encoding/json"
- "errors"
- "fmt"
- "regexp"
- "strconv"
- "strings"
-)
-
-// The compiled version of the regex created at init() is cached here so it
-// only needs to be created once.
-var versionRegex *regexp.Regexp
-
-var (
- // ErrInvalidSemVer is returned a version is found to be invalid when
- // being parsed.
- ErrInvalidSemVer = errors.New("Invalid Semantic Version")
-
- // ErrEmptyString is returned when an empty string is passed in for parsing.
- ErrEmptyString = errors.New("Version string empty")
-
- // ErrInvalidCharacters is returned when invalid characters are found as
- // part of a version
- ErrInvalidCharacters = errors.New("Invalid characters in version")
-
- // ErrSegmentStartsZero is returned when a version segment starts with 0.
- // This is invalid in SemVer.
- ErrSegmentStartsZero = errors.New("Version segment starts with 0")
-
- // ErrInvalidMetadata is returned when the metadata is an invalid format
- ErrInvalidMetadata = errors.New("Invalid Metadata string")
-
- // ErrInvalidPrerelease is returned when the pre-release is an invalid format
- ErrInvalidPrerelease = errors.New("Invalid Prerelease string")
-)
-
-// semVerRegex is the regular expression used to parse a semantic version.
-const semVerRegex string = `v?([0-9]+)(\.[0-9]+)?(\.[0-9]+)?` +
- `(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?` +
- `(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?`
-
-// Version represents a single semantic version.
-type Version struct {
- major, minor, patch uint64
- pre string
- metadata string
- original string
-}
-
-func init() {
- versionRegex = regexp.MustCompile("^" + semVerRegex + "$")
-}
-
-const (
- num string = "0123456789"
- allowed string = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-" + num
-)
-
-// StrictNewVersion parses a given version and returns an instance of Version or
-// an error if unable to parse the version. Only parses valid semantic versions.
-// Performs checking that can find errors within the version.
-// If you want to coerce a version such as 1 or 1.2 and parse it as the 1.x
-// releases of semver did, use the NewVersion() function.
-func StrictNewVersion(v string) (*Version, error) {
- // Parsing here does not use RegEx in order to increase performance and reduce
- // allocations.
-
- if len(v) == 0 {
- return nil, ErrEmptyString
- }
-
- // Split the parts into [0]major, [1]minor, and [2]patch,prerelease,build
- parts := strings.SplitN(v, ".", 3)
- if len(parts) != 3 {
- return nil, ErrInvalidSemVer
- }
-
- sv := &Version{
- original: v,
- }
-
- // Extract build metadata
- if strings.Contains(parts[2], "+") {
- extra := strings.SplitN(parts[2], "+", 2)
- sv.metadata = extra[1]
- parts[2] = extra[0]
- if err := validateMetadata(sv.metadata); err != nil {
- return nil, err
- }
- }
-
- // Extract build prerelease
- if strings.Contains(parts[2], "-") {
- extra := strings.SplitN(parts[2], "-", 2)
- sv.pre = extra[1]
- parts[2] = extra[0]
- if err := validatePrerelease(sv.pre); err != nil {
- return nil, err
- }
- }
-
- // Validate the number segments are valid. This includes only having positive
- // numbers and no leading 0's.
- for _, p := range parts {
- if !containsOnly(p, num) {
- return nil, ErrInvalidCharacters
- }
-
- if len(p) > 1 && p[0] == '0' {
- return nil, ErrSegmentStartsZero
- }
- }
-
- // Extract major, minor, and patch
- var err error
- sv.major, err = strconv.ParseUint(parts[0], 10, 64)
- if err != nil {
- return nil, err
- }
-
- sv.minor, err = strconv.ParseUint(parts[1], 10, 64)
- if err != nil {
- return nil, err
- }
-
- sv.patch, err = strconv.ParseUint(parts[2], 10, 64)
- if err != nil {
- return nil, err
- }
-
- return sv, nil
-}
-
-// NewVersion parses a given version and returns an instance of Version or
-// an error if unable to parse the version. If the version is SemVer-ish it
-// attempts to convert it to SemVer. If you want to validate it was a strict
-// semantic version at parse time see StrictNewVersion().
-func NewVersion(v string) (*Version, error) {
- m := versionRegex.FindStringSubmatch(v)
- if m == nil {
- return nil, ErrInvalidSemVer
- }
-
- sv := &Version{
- metadata: m[8],
- pre: m[5],
- original: v,
- }
-
- var err error
- sv.major, err = strconv.ParseUint(m[1], 10, 64)
- if err != nil {
- return nil, fmt.Errorf("Error parsing version segment: %s", err)
- }
-
- if m[2] != "" {
- sv.minor, err = strconv.ParseUint(strings.TrimPrefix(m[2], "."), 10, 64)
- if err != nil {
- return nil, fmt.Errorf("Error parsing version segment: %s", err)
- }
- } else {
- sv.minor = 0
- }
-
- if m[3] != "" {
- sv.patch, err = strconv.ParseUint(strings.TrimPrefix(m[3], "."), 10, 64)
- if err != nil {
- return nil, fmt.Errorf("Error parsing version segment: %s", err)
- }
- } else {
- sv.patch = 0
- }
-
- // Perform some basic due diligence on the extra parts to ensure they are
- // valid.
-
- if sv.pre != "" {
- if err = validatePrerelease(sv.pre); err != nil {
- return nil, err
- }
- }
-
- if sv.metadata != "" {
- if err = validateMetadata(sv.metadata); err != nil {
- return nil, err
- }
- }
-
- return sv, nil
-}
-
-// New creates a new instance of Version with each of the parts passed in as
-// arguments instead of parsing a version string.
-func New(major, minor, patch uint64, pre, metadata string) *Version {
- v := Version{
- major: major,
- minor: minor,
- patch: patch,
- pre: pre,
- metadata: metadata,
- original: "",
- }
-
- v.original = v.String()
-
- return &v
-}
-
-// MustParse parses a given version and panics on error.
-func MustParse(v string) *Version {
- sv, err := NewVersion(v)
- if err != nil {
- panic(err)
- }
- return sv
-}
-
-// String converts a Version object to a string.
-// Note, if the original version contained a leading v this version will not.
-// See the Original() method to retrieve the original value. Semantic Versions
-// don't contain a leading v per the spec. Instead it's optional on
-// implementation.
-func (v Version) String() string {
- var buf bytes.Buffer
-
- fmt.Fprintf(&buf, "%d.%d.%d", v.major, v.minor, v.patch)
- if v.pre != "" {
- fmt.Fprintf(&buf, "-%s", v.pre)
- }
- if v.metadata != "" {
- fmt.Fprintf(&buf, "+%s", v.metadata)
- }
-
- return buf.String()
-}
-
-// Original returns the original value passed in to be parsed.
-func (v *Version) Original() string {
- return v.original
-}
-
-// Major returns the major version.
-func (v Version) Major() uint64 {
- return v.major
-}
-
-// Minor returns the minor version.
-func (v Version) Minor() uint64 {
- return v.minor
-}
-
-// Patch returns the patch version.
-func (v Version) Patch() uint64 {
- return v.patch
-}
-
-// Prerelease returns the pre-release version.
-func (v Version) Prerelease() string {
- return v.pre
-}
-
-// Metadata returns the metadata on the version.
-func (v Version) Metadata() string {
- return v.metadata
-}
-
-// originalVPrefix returns the original 'v' prefix if any.
-func (v Version) originalVPrefix() string {
- // Note, only lowercase v is supported as a prefix by the parser.
- if v.original != "" && v.original[:1] == "v" {
- return v.original[:1]
- }
- return ""
-}
-
-// IncPatch produces the next patch version.
-// If the current version does not have prerelease/metadata information,
-// it unsets metadata and prerelease values, increments patch number.
-// If the current version has any of prerelease or metadata information,
-// it unsets both values and keeps current patch value
-func (v Version) IncPatch() Version {
- vNext := v
- // according to http://semver.org/#spec-item-9
- // Pre-release versions have a lower precedence than the associated normal version.
- // according to http://semver.org/#spec-item-10
- // Build metadata SHOULD be ignored when determining version precedence.
- if v.pre != "" {
- vNext.metadata = ""
- vNext.pre = ""
- } else {
- vNext.metadata = ""
- vNext.pre = ""
- vNext.patch = v.patch + 1
- }
- vNext.original = v.originalVPrefix() + "" + vNext.String()
- return vNext
-}
-
-// IncMinor produces the next minor version.
-// Sets patch to 0.
-// Increments minor number.
-// Unsets metadata.
-// Unsets prerelease status.
-func (v Version) IncMinor() Version {
- vNext := v
- vNext.metadata = ""
- vNext.pre = ""
- vNext.patch = 0
- vNext.minor = v.minor + 1
- vNext.original = v.originalVPrefix() + "" + vNext.String()
- return vNext
-}
-
-// IncMajor produces the next major version.
-// Sets patch to 0.
-// Sets minor to 0.
-// Increments major number.
-// Unsets metadata.
-// Unsets prerelease status.
-func (v Version) IncMajor() Version {
- vNext := v
- vNext.metadata = ""
- vNext.pre = ""
- vNext.patch = 0
- vNext.minor = 0
- vNext.major = v.major + 1
- vNext.original = v.originalVPrefix() + "" + vNext.String()
- return vNext
-}
-
-// SetPrerelease defines the prerelease value.
-// Value must not include the required 'hyphen' prefix.
-func (v Version) SetPrerelease(prerelease string) (Version, error) {
- vNext := v
- if len(prerelease) > 0 {
- if err := validatePrerelease(prerelease); err != nil {
- return vNext, err
- }
- }
- vNext.pre = prerelease
- vNext.original = v.originalVPrefix() + "" + vNext.String()
- return vNext, nil
-}
-
-// SetMetadata defines metadata value.
-// Value must not include the required 'plus' prefix.
-func (v Version) SetMetadata(metadata string) (Version, error) {
- vNext := v
- if len(metadata) > 0 {
- if err := validateMetadata(metadata); err != nil {
- return vNext, err
- }
- }
- vNext.metadata = metadata
- vNext.original = v.originalVPrefix() + "" + vNext.String()
- return vNext, nil
-}
-
-// LessThan tests if one version is less than another one.
-func (v *Version) LessThan(o *Version) bool {
- return v.Compare(o) < 0
-}
-
-// LessThanEqual tests if one version is less or equal than another one.
-func (v *Version) LessThanEqual(o *Version) bool {
- return v.Compare(o) <= 0
-}
-
-// GreaterThan tests if one version is greater than another one.
-func (v *Version) GreaterThan(o *Version) bool {
- return v.Compare(o) > 0
-}
-
-// GreaterThanEqual tests if one version is greater or equal than another one.
-func (v *Version) GreaterThanEqual(o *Version) bool {
- return v.Compare(o) >= 0
-}
-
-// Equal tests if two versions are equal to each other.
-// Note, versions can be equal with different metadata since metadata
-// is not considered part of the comparable version.
-func (v *Version) Equal(o *Version) bool {
- if v == o {
- return true
- }
- if v == nil || o == nil {
- return false
- }
- return v.Compare(o) == 0
-}
-
-// Compare compares this version to another one. It returns -1, 0, or 1 if
-// the version smaller, equal, or larger than the other version.
-//
-// Versions are compared by X.Y.Z. Build metadata is ignored. Prerelease is
-// lower than the version without a prerelease. Compare always takes into account
-// prereleases. If you want to work with ranges using typical range syntaxes that
-// skip prereleases if the range is not looking for them use constraints.
-func (v *Version) Compare(o *Version) int {
- // Compare the major, minor, and patch version for differences. If a
- // difference is found return the comparison.
- if d := compareSegment(v.Major(), o.Major()); d != 0 {
- return d
- }
- if d := compareSegment(v.Minor(), o.Minor()); d != 0 {
- return d
- }
- if d := compareSegment(v.Patch(), o.Patch()); d != 0 {
- return d
- }
-
- // At this point the major, minor, and patch versions are the same.
- ps := v.pre
- po := o.Prerelease()
-
- if ps == "" && po == "" {
- return 0
- }
- if ps == "" {
- return 1
- }
- if po == "" {
- return -1
- }
-
- return comparePrerelease(ps, po)
-}
-
-// UnmarshalJSON implements JSON.Unmarshaler interface.
-func (v *Version) UnmarshalJSON(b []byte) error {
- var s string
- if err := json.Unmarshal(b, &s); err != nil {
- return err
- }
- temp, err := NewVersion(s)
- if err != nil {
- return err
- }
- v.major = temp.major
- v.minor = temp.minor
- v.patch = temp.patch
- v.pre = temp.pre
- v.metadata = temp.metadata
- v.original = temp.original
- return nil
-}
-
-// MarshalJSON implements JSON.Marshaler interface.
-func (v Version) MarshalJSON() ([]byte, error) {
- return json.Marshal(v.String())
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface.
-func (v *Version) UnmarshalText(text []byte) error {
- temp, err := NewVersion(string(text))
- if err != nil {
- return err
- }
-
- *v = *temp
-
- return nil
-}
-
-// MarshalText implements the encoding.TextMarshaler interface.
-func (v Version) MarshalText() ([]byte, error) {
- return []byte(v.String()), nil
-}
-
-// Scan implements the SQL.Scanner interface.
-func (v *Version) Scan(value interface{}) error {
- var s string
- s, _ = value.(string)
- temp, err := NewVersion(s)
- if err != nil {
- return err
- }
- v.major = temp.major
- v.minor = temp.minor
- v.patch = temp.patch
- v.pre = temp.pre
- v.metadata = temp.metadata
- v.original = temp.original
- return nil
-}
-
-// Value implements the Driver.Valuer interface.
-func (v Version) Value() (driver.Value, error) {
- return v.String(), nil
-}
-
-func compareSegment(v, o uint64) int {
- if v < o {
- return -1
- }
- if v > o {
- return 1
- }
-
- return 0
-}
-
-func comparePrerelease(v, o string) int {
- // split the prelease versions by their part. The separator, per the spec,
- // is a .
- sparts := strings.Split(v, ".")
- oparts := strings.Split(o, ".")
-
- // Find the longer length of the parts to know how many loop iterations to
- // go through.
- slen := len(sparts)
- olen := len(oparts)
-
- l := slen
- if olen > slen {
- l = olen
- }
-
- // Iterate over each part of the prereleases to compare the differences.
- for i := 0; i < l; i++ {
- // Since the lentgh of the parts can be different we need to create
- // a placeholder. This is to avoid out of bounds issues.
- stemp := ""
- if i < slen {
- stemp = sparts[i]
- }
-
- otemp := ""
- if i < olen {
- otemp = oparts[i]
- }
-
- d := comparePrePart(stemp, otemp)
- if d != 0 {
- return d
- }
- }
-
- // Reaching here means two versions are of equal value but have different
- // metadata (the part following a +). They are not identical in string form
- // but the version comparison finds them to be equal.
- return 0
-}
-
-func comparePrePart(s, o string) int {
- // Fastpath if they are equal
- if s == o {
- return 0
- }
-
- // When s or o are empty we can use the other in an attempt to determine
- // the response.
- if s == "" {
- if o != "" {
- return -1
- }
- return 1
- }
-
- if o == "" {
- if s != "" {
- return 1
- }
- return -1
- }
-
- // When comparing strings "99" is greater than "103". To handle
- // cases like this we need to detect numbers and compare them. According
- // to the semver spec, numbers are always positive. If there is a - at the
- // start like -99 this is to be evaluated as an alphanum. numbers always
- // have precedence over alphanum. Parsing as Uints because negative numbers
- // are ignored.
-
- oi, n1 := strconv.ParseUint(o, 10, 64)
- si, n2 := strconv.ParseUint(s, 10, 64)
-
- // The case where both are strings compare the strings
- if n1 != nil && n2 != nil {
- if s > o {
- return 1
- }
- return -1
- } else if n1 != nil {
- // o is a string and s is a number
- return -1
- } else if n2 != nil {
- // s is a string and o is a number
- return 1
- }
- // Both are numbers
- if si > oi {
- return 1
- }
- return -1
-}
-
-// Like strings.ContainsAny but does an only instead of any.
-func containsOnly(s string, comp string) bool {
- return strings.IndexFunc(s, func(r rune) bool {
- return !strings.ContainsRune(comp, r)
- }) == -1
-}
-
-// From the spec, "Identifiers MUST comprise only
-// ASCII alphanumerics and hyphen [0-9A-Za-z-]. Identifiers MUST NOT be empty.
-// Numeric identifiers MUST NOT include leading zeroes.". These segments can
-// be dot separated.
-func validatePrerelease(p string) error {
- eparts := strings.Split(p, ".")
- for _, p := range eparts {
- if containsOnly(p, num) {
- if len(p) > 1 && p[0] == '0' {
- return ErrSegmentStartsZero
- }
- } else if !containsOnly(p, allowed) {
- return ErrInvalidPrerelease
- }
- }
-
- return nil
-}
-
-// From the spec, "Build metadata MAY be denoted by
-// appending a plus sign and a series of dot separated identifiers immediately
-// following the patch or pre-release version. Identifiers MUST comprise only
-// ASCII alphanumerics and hyphen [0-9A-Za-z-]. Identifiers MUST NOT be empty."
-func validateMetadata(m string) error {
- eparts := strings.Split(m, ".")
- for _, p := range eparts {
- if !containsOnly(p, allowed) {
- return ErrInvalidMetadata
- }
- }
- return nil
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/.gitignore b/vendor/github.com/Masterminds/sprig/v3/.gitignore
deleted file mode 100644
index 5e3002f88f..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-vendor/
-/.glide
diff --git a/vendor/github.com/Masterminds/sprig/v3/CHANGELOG.md b/vendor/github.com/Masterminds/sprig/v3/CHANGELOG.md
deleted file mode 100644
index b5ef766a7a..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/CHANGELOG.md
+++ /dev/null
@@ -1,401 +0,0 @@
-# Changelog
-
-## Release 3.3.0 (2024-08-29)
-
-### Added
-
-- #400: added sha512sum function (thanks @itzik-elayev)
-
-### Changed
-
-- #407: Removed duplicate documentation (functions were documentated in 2 places)
-- #290: Corrected copy/paster oops in math documentation (thanks @zzhu41)
-- #369: Corrected template reference in docs (thanks @chey)
-- #375: Added link to URL documenation (thanks @carlpett)
-- #406: Updated the mergo dependency which had a breaking change (which was accounted for)
-- #376: Fixed documentation error (thanks @jheyduk)
-- #404: Updated dependency tree
-- #391: Fixed misspelling (thanks @chrishalbert)
-- #405: Updated Go versions used in testing
-
-## Release 3.2.3 (2022-11-29)
-
-### Changed
-
-- Updated docs (thanks @book987 @aJetHorn @neelayu @pellizzetti @apricote @SaigyoujiYuyuko233 @AlekSi)
-- #348: Updated huandu/xstrings which fixed a snake case bug (thanks @yxxhero)
-- #353: Updated masterminds/semver which included bug fixes
-- #354: Updated golang.org/x/crypto which included bug fixes
-
-## Release 3.2.2 (2021-02-04)
-
-This is a re-release of 3.2.1 to satisfy something with the Go module system.
-
-## Release 3.2.1 (2021-02-04)
-
-### Changed
-
-- Upgraded `Masterminds/goutils` to `v1.1.1`. see the [Security Advisory](https://github.com/Masterminds/goutils/security/advisories/GHSA-xg2h-wx96-xgxr)
-
-## Release 3.2.0 (2020-12-14)
-
-### Added
-
-- #211: Added randInt function (thanks @kochurovro)
-- #223: Added fromJson and mustFromJson functions (thanks @mholt)
-- #242: Added a bcrypt function (thanks @robbiet480)
-- #253: Added randBytes function (thanks @MikaelSmith)
-- #254: Added dig function for dicts (thanks @nyarly)
-- #257: Added regexQuoteMeta for quoting regex metadata (thanks @rheaton)
-- #261: Added filepath functions osBase, osDir, osExt, osClean, osIsAbs (thanks @zugl)
-- #268: Added and and all functions for testing conditions (thanks @phuslu)
-- #181: Added float64 arithmetic addf, add1f, subf, divf, mulf, maxf, and minf
- (thanks @andrewmostello)
-- #265: Added chunk function to split array into smaller arrays (thanks @karelbilek)
-- #270: Extend certificate functions to handle non-RSA keys + add support for
- ed25519 keys (thanks @misberner)
-
-### Changed
-
-- Removed testing and support for Go 1.12. ed25519 support requires Go 1.13 or newer
-- Using semver 3.1.1 and mergo 0.3.11
-
-### Fixed
-
-- #249: Fix htmlDateInZone example (thanks @spawnia)
-
-NOTE: The dependency github.com/imdario/mergo reverted the breaking change in
-0.3.9 via 0.3.10 release.
-
-## Release 3.1.0 (2020-04-16)
-
-NOTE: The dependency github.com/imdario/mergo made a behavior change in 0.3.9
-that impacts sprig functionality. Do not use sprig with a version newer than 0.3.8.
-
-### Added
-
-- #225: Added support for generating htpasswd hash (thanks @rustycl0ck)
-- #224: Added duration filter (thanks @frebib)
-- #205: Added `seq` function (thanks @thadc23)
-
-### Changed
-
-- #203: Unlambda functions with correct signature (thanks @muesli)
-- #236: Updated the license formatting for GitHub display purposes
-- #238: Updated package dependency versions. Note, mergo not updated to 0.3.9
- as it causes a breaking change for sprig. That issue is tracked at
- https://github.com/imdario/mergo/issues/139
-
-### Fixed
-
-- #229: Fix `seq` example in docs (thanks @kalmant)
-
-## Release 3.0.2 (2019-12-13)
-
-### Fixed
-
-- #220: Updating to semver v3.0.3 to fix issue with <= ranges
-- #218: fix typo elyptical->elliptic in ecdsa key description (thanks @laverya)
-
-## Release 3.0.1 (2019-12-08)
-
-### Fixed
-
-- #212: Updated semver fixing broken constraint checking with ^0.0
-
-## Release 3.0.0 (2019-10-02)
-
-### Added
-
-- #187: Added durationRound function (thanks @yjp20)
-- #189: Added numerous template functions that return errors rather than panic (thanks @nrvnrvn)
-- #193: Added toRawJson support (thanks @Dean-Coakley)
-- #197: Added get support to dicts (thanks @Dean-Coakley)
-
-### Changed
-
-- #186: Moving dependency management to Go modules
-- #186: Updated semver to v3. This has changes in the way ^ is handled
-- #194: Updated documentation on merging and how it copies. Added example using deepCopy
-- #196: trunc now supports negative values (thanks @Dean-Coakley)
-
-## Release 2.22.0 (2019-10-02)
-
-### Added
-
-- #173: Added getHostByName function to resolve dns names to ips (thanks @fcgravalos)
-- #195: Added deepCopy function for use with dicts
-
-### Changed
-
-- Updated merge and mergeOverwrite documentation to explain copying and how to
- use deepCopy with it
-
-## Release 2.21.0 (2019-09-18)
-
-### Added
-
-- #122: Added encryptAES/decryptAES functions (thanks @n0madic)
-- #128: Added toDecimal support (thanks @Dean-Coakley)
-- #169: Added list contcat (thanks @astorath)
-- #174: Added deepEqual function (thanks @bonifaido)
-- #170: Added url parse and join functions (thanks @astorath)
-
-### Changed
-
-- #171: Updated glide config for Google UUID to v1 and to add ranges to semver and testify
-
-### Fixed
-
-- #172: Fix semver wildcard example (thanks @piepmatz)
-- #175: Fix dateInZone doc example (thanks @s3than)
-
-## Release 2.20.0 (2019-06-18)
-
-### Added
-
-- #164: Adding function to get unix epoch for a time (@mattfarina)
-- #166: Adding tests for date_in_zone (@mattfarina)
-
-### Changed
-
-- #144: Fix function comments based on best practices from Effective Go (@CodeLingoTeam)
-- #150: Handles pointer type for time.Time in "htmlDate" (@mapreal19)
-- #161, #157, #160, #153, #158, #156, #155, #159, #152 documentation updates (@badeadan)
-
-### Fixed
-
-## Release 2.19.0 (2019-03-02)
-
-IMPORTANT: This release reverts a change from 2.18.0
-
-In the previous release (2.18), we prematurely merged a partial change to the crypto functions that led to creating two sets of crypto functions (I blame @technosophos -- since that's me). This release rolls back that change, and does what was originally intended: It alters the existing crypto functions to use secure random.
-
-We debated whether this classifies as a change worthy of major revision, but given the proximity to the last release, we have decided that treating 2.18 as a faulty release is the correct course of action. We apologize for any inconvenience.
-
-### Changed
-
-- Fix substr panic 35fb796 (Alexey igrychev)
-- Remove extra period 1eb7729 (Matthew Lorimor)
-- Make random string functions use crypto by default 6ceff26 (Matthew Lorimor)
-- README edits/fixes/suggestions 08fe136 (Lauri Apple)
-
-
-## Release 2.18.0 (2019-02-12)
-
-### Added
-
-- Added mergeOverwrite function
-- cryptographic functions that use secure random (see fe1de12)
-
-### Changed
-
-- Improve documentation of regexMatch function, resolves #139 90b89ce (Jan Tagscherer)
-- Handle has for nil list 9c10885 (Daniel Cohen)
-- Document behaviour of mergeOverwrite fe0dbe9 (Lukas Rieder)
-- doc: adds missing documentation. 4b871e6 (Fernandez Ludovic)
-- Replace outdated goutils imports 01893d2 (Matthew Lorimor)
-- Surface crypto secure random strings from goutils fe1de12 (Matthew Lorimor)
-- Handle untyped nil values as paramters to string functions 2b2ec8f (Morten Torkildsen)
-
-### Fixed
-
-- Fix dict merge issue and provide mergeOverwrite .dst .src1 to overwrite from src -> dst 4c59c12 (Lukas Rieder)
-- Fix substr var names and comments d581f80 (Dean Coakley)
-- Fix substr documentation 2737203 (Dean Coakley)
-
-## Release 2.17.1 (2019-01-03)
-
-### Fixed
-
-The 2.17.0 release did not have a version pinned for xstrings, which caused compilation failures when xstrings < 1.2 was used. This adds the correct version string to glide.yaml.
-
-## Release 2.17.0 (2019-01-03)
-
-### Added
-
-- adds alder32sum function and test 6908fc2 (marshallford)
-- Added kebabcase function ca331a1 (Ilyes512)
-
-### Changed
-
-- Update goutils to 1.1.0 4e1125d (Matt Butcher)
-
-### Fixed
-
-- Fix 'has' documentation e3f2a85 (dean-coakley)
-- docs(dict): fix typo in pick example dc424f9 (Dustin Specker)
-- fixes spelling errors... not sure how that happened 4cf188a (marshallford)
-
-## Release 2.16.0 (2018-08-13)
-
-### Added
-
-- add splitn function fccb0b0 (Helgi Þorbjörnsson)
-- Add slice func df28ca7 (gongdo)
-- Generate serial number a3bdffd (Cody Coons)
-- Extract values of dict with values function df39312 (Lawrence Jones)
-
-### Changed
-
-- Modify panic message for list.slice ae38335 (gongdo)
-- Minor improvement in code quality - Removed an unreachable piece of code at defaults.go#L26:6 - Resolve formatting issues. 5834241 (Abhishek Kashyap)
-- Remove duplicated documentation 1d97af1 (Matthew Fisher)
-- Test on go 1.11 49df809 (Helgi Þormar Þorbjörnsson)
-
-### Fixed
-
-- Fix file permissions c5f40b5 (gongdo)
-- Fix example for buildCustomCert 7779e0d (Tin Lam)
-
-## Release 2.15.0 (2018-04-02)
-
-### Added
-
-- #68 and #69: Add json helpers to docs (thanks @arunvelsriram)
-- #66: Add ternary function (thanks @binoculars)
-- #67: Allow keys function to take multiple dicts (thanks @binoculars)
-- #89: Added sha1sum to crypto function (thanks @benkeil)
-- #81: Allow customizing Root CA that used by genSignedCert (thanks @chenzhiwei)
-- #92: Add travis testing for go 1.10
-- #93: Adding appveyor config for windows testing
-
-### Changed
-
-- #90: Updating to more recent dependencies
-- #73: replace satori/go.uuid with google/uuid (thanks @petterw)
-
-### Fixed
-
-- #76: Fixed documentation typos (thanks @Thiht)
-- Fixed rounding issue on the `ago` function. Note, the removes support for Go 1.8 and older
-
-## Release 2.14.1 (2017-12-01)
-
-### Fixed
-
-- #60: Fix typo in function name documentation (thanks @neil-ca-moore)
-- #61: Removing line with {{ due to blocking github pages genertion
-- #64: Update the list functions to handle int, string, and other slices for compatibility
-
-## Release 2.14.0 (2017-10-06)
-
-This new version of Sprig adds a set of functions for generating and working with SSL certificates.
-
-- `genCA` generates an SSL Certificate Authority
-- `genSelfSignedCert` generates an SSL self-signed certificate
-- `genSignedCert` generates an SSL certificate and key based on a given CA
-
-## Release 2.13.0 (2017-09-18)
-
-This release adds new functions, including:
-
-- `regexMatch`, `regexFindAll`, `regexFind`, `regexReplaceAll`, `regexReplaceAllLiteral`, and `regexSplit` to work with regular expressions
-- `floor`, `ceil`, and `round` math functions
-- `toDate` converts a string to a date
-- `nindent` is just like `indent` but also prepends a new line
-- `ago` returns the time from `time.Now`
-
-### Added
-
-- #40: Added basic regex functionality (thanks @alanquillin)
-- #41: Added ceil floor and round functions (thanks @alanquillin)
-- #48: Added toDate function (thanks @andreynering)
-- #50: Added nindent function (thanks @binoculars)
-- #46: Added ago function (thanks @slayer)
-
-### Changed
-
-- #51: Updated godocs to include new string functions (thanks @curtisallen)
-- #49: Added ability to merge multiple dicts (thanks @binoculars)
-
-## Release 2.12.0 (2017-05-17)
-
-- `snakecase`, `camelcase`, and `shuffle` are three new string functions
-- `fail` allows you to bail out of a template render when conditions are not met
-
-## Release 2.11.0 (2017-05-02)
-
-- Added `toJson` and `toPrettyJson`
-- Added `merge`
-- Refactored documentation
-
-## Release 2.10.0 (2017-03-15)
-
-- Added `semver` and `semverCompare` for Semantic Versions
-- `list` replaces `tuple`
-- Fixed issue with `join`
-- Added `first`, `last`, `initial`, `rest`, `prepend`, `append`, `toString`, `toStrings`, `sortAlpha`, `reverse`, `coalesce`, `pluck`, `pick`, `compact`, `keys`, `omit`, `uniq`, `has`, `without`
-
-## Release 2.9.0 (2017-02-23)
-
-- Added `splitList` to split a list
-- Added crypto functions of `genPrivateKey` and `derivePassword`
-
-## Release 2.8.0 (2016-12-21)
-
-- Added access to several path functions (`base`, `dir`, `clean`, `ext`, and `abs`)
-- Added functions for _mutating_ dictionaries (`set`, `unset`, `hasKey`)
-
-## Release 2.7.0 (2016-12-01)
-
-- Added `sha256sum` to generate a hash of an input
-- Added functions to convert a numeric or string to `int`, `int64`, `float64`
-
-## Release 2.6.0 (2016-10-03)
-
-- Added a `uuidv4` template function for generating UUIDs inside of a template.
-
-## Release 2.5.0 (2016-08-19)
-
-- New `trimSuffix`, `trimPrefix`, `hasSuffix`, and `hasPrefix` functions
-- New aliases have been added for a few functions that didn't follow the naming conventions (`trimAll` and `abbrevBoth`)
-- `trimall` and `abbrevboth` (notice the case) are deprecated and will be removed in 3.0.0
-
-## Release 2.4.0 (2016-08-16)
-
-- Adds two functions: `until` and `untilStep`
-
-## Release 2.3.0 (2016-06-21)
-
-- cat: Concatenate strings with whitespace separators.
-- replace: Replace parts of a string: `replace " " "-" "Me First"` renders "Me-First"
-- plural: Format plurals: `len "foo" | plural "one foo" "many foos"` renders "many foos"
-- indent: Indent blocks of text in a way that is sensitive to "\n" characters.
-
-## Release 2.2.0 (2016-04-21)
-
-- Added a `genPrivateKey` function (Thanks @bacongobbler)
-
-## Release 2.1.0 (2016-03-30)
-
-- `default` now prints the default value when it does not receive a value down the pipeline. It is much safer now to do `{{.Foo | default "bar"}}`.
-- Added accessors for "hermetic" functions. These return only functions that, when given the same input, produce the same output.
-
-## Release 2.0.0 (2016-03-29)
-
-Because we switched from `int` to `int64` as the return value for all integer math functions, the library's major version number has been incremented.
-
-- `min` complements `max` (formerly `biggest`)
-- `empty` indicates that a value is the empty value for its type
-- `tuple` creates a tuple inside of a template: `{{$t := tuple "a", "b" "c"}}`
-- `dict` creates a dictionary inside of a template `{{$d := dict "key1" "val1" "key2" "val2"}}`
-- Date formatters have been added for HTML dates (as used in `date` input fields)
-- Integer math functions can convert from a number of types, including `string` (via `strconv.ParseInt`).
-
-## Release 1.2.0 (2016-02-01)
-
-- Added quote and squote
-- Added b32enc and b32dec
-- add now takes varargs
-- biggest now takes varargs
-
-## Release 1.1.0 (2015-12-29)
-
-- Added #4: Added contains function. strings.Contains, but with the arguments
- switched to simplify common pipelines. (thanks krancour)
-- Added Travis-CI testing support
-
-## Release 1.0.0 (2015-12-23)
-
-- Initial release
diff --git a/vendor/github.com/Masterminds/sprig/v3/LICENSE.txt b/vendor/github.com/Masterminds/sprig/v3/LICENSE.txt
deleted file mode 100644
index f311b1eaaa..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2013-2020 Masterminds
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/Masterminds/sprig/v3/Makefile b/vendor/github.com/Masterminds/sprig/v3/Makefile
deleted file mode 100644
index 78d409cde2..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-.PHONY: test
-test:
- @echo "==> Running tests"
- GO111MODULE=on go test -v
-
-.PHONY: test-cover
-test-cover:
- @echo "==> Running Tests with coverage"
- GO111MODULE=on go test -cover .
diff --git a/vendor/github.com/Masterminds/sprig/v3/README.md b/vendor/github.com/Masterminds/sprig/v3/README.md
deleted file mode 100644
index 3e22c60e1a..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/README.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# Sprig: Template functions for Go templates
-
-[](https://pkg.go.dev/github.com/Masterminds/sprig/v3)
-[](https://goreportcard.com/report/github.com/Masterminds/sprig)
-[](https://masterminds.github.io/stability/sustained.html)
-[](https://github.com/Masterminds/sprig/actions)
-
-The Go language comes with a [built-in template
-language](http://golang.org/pkg/text/template/), but not
-very many template functions. Sprig is a library that provides more than 100 commonly
-used template functions.
-
-It is inspired by the template functions found in
-[Twig](http://twig.sensiolabs.org/documentation) and in various
-JavaScript libraries, such as [underscore.js](http://underscorejs.org/).
-
-## IMPORTANT NOTES
-
-Sprig leverages [mergo](https://github.com/imdario/mergo) to handle merges. In
-its v0.3.9 release, there was a behavior change that impacts merging template
-functions in sprig. It is currently recommended to use v0.3.10 or later of that package.
-Using v0.3.9 will cause sprig tests to fail.
-
-## Package Versions
-
-There are two active major versions of the `sprig` package.
-
-* v3 is currently stable release series on the `master` branch. The Go API should
- remain compatible with v2, the current stable version. Behavior change behind
- some functions is the reason for the new major version.
-* v2 is the previous stable release series. It has been more than three years since
- the initial release of v2. You can read the documentation and see the code
- on the [release-2](https://github.com/Masterminds/sprig/tree/release-2) branch.
- Bug fixes to this major version will continue for some time.
-
-## Usage
-
-**Template developers**: Please use Sprig's [function documentation](http://masterminds.github.io/sprig/) for
-detailed instructions and code snippets for the >100 template functions available.
-
-**Go developers**: If you'd like to include Sprig as a library in your program,
-our API documentation is available [at GoDoc.org](http://godoc.org/github.com/Masterminds/sprig).
-
-For standard usage, read on.
-
-### Load the Sprig library
-
-To load the Sprig `FuncMap`:
-
-```go
-
-import (
- "github.com/Masterminds/sprig/v3"
- "html/template"
-)
-
-// This example illustrates that the FuncMap *must* be set before the
-// templates themselves are loaded.
-tpl := template.Must(
- template.New("base").Funcs(sprig.FuncMap()).ParseGlob("*.html")
-)
-
-
-```
-
-### Calling the functions inside of templates
-
-By convention, all functions are lowercase. This seems to follow the Go
-idiom for template functions (as opposed to template methods, which are
-TitleCase). For example, this:
-
-```
-{{ "hello!" | upper | repeat 5 }}
-```
-
-produces this:
-
-```
-HELLO!HELLO!HELLO!HELLO!HELLO!
-```
-
-## Principles Driving Our Function Selection
-
-We followed these principles to decide which functions to add and how to implement them:
-
-- Use template functions to build layout. The following
- types of operations are within the domain of template functions:
- - Formatting
- - Layout
- - Simple type conversions
- - Utilities that assist in handling common formatting and layout needs (e.g. arithmetic)
-- Template functions should not return errors unless there is no way to print
- a sensible value. For example, converting a string to an integer should not
- produce an error if conversion fails. Instead, it should display a default
- value.
-- Simple math is necessary for grid layouts, pagers, and so on. Complex math
- (anything other than arithmetic) should be done outside of templates.
-- Template functions only deal with the data passed into them. They never retrieve
- data from a source.
-- Finally, do not override core Go template functions.
diff --git a/vendor/github.com/Masterminds/sprig/v3/crypto.go b/vendor/github.com/Masterminds/sprig/v3/crypto.go
deleted file mode 100644
index 75fe027e4d..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/crypto.go
+++ /dev/null
@@ -1,659 +0,0 @@
-package sprig
-
-import (
- "bytes"
- "crypto"
- "crypto/aes"
- "crypto/cipher"
- "crypto/dsa"
- "crypto/ecdsa"
- "crypto/ed25519"
- "crypto/elliptic"
- "crypto/hmac"
- "crypto/rand"
- "crypto/rsa"
- "crypto/sha1"
- "crypto/sha256"
- "crypto/sha512"
- "crypto/x509"
- "crypto/x509/pkix"
- "encoding/asn1"
- "encoding/base64"
- "encoding/binary"
- "encoding/hex"
- "encoding/pem"
- "errors"
- "fmt"
- "hash/adler32"
- "io"
- "math/big"
- "net"
- "time"
-
- "strings"
-
- "github.com/google/uuid"
- bcrypt_lib "golang.org/x/crypto/bcrypt"
- "golang.org/x/crypto/scrypt"
-)
-
-func sha512sum(input string) string {
- hash := sha512.Sum512([]byte(input))
- return hex.EncodeToString(hash[:])
-}
-
-func sha256sum(input string) string {
- hash := sha256.Sum256([]byte(input))
- return hex.EncodeToString(hash[:])
-}
-
-func sha1sum(input string) string {
- hash := sha1.Sum([]byte(input))
- return hex.EncodeToString(hash[:])
-}
-
-func adler32sum(input string) string {
- hash := adler32.Checksum([]byte(input))
- return fmt.Sprintf("%d", hash)
-}
-
-func bcrypt(input string) string {
- hash, err := bcrypt_lib.GenerateFromPassword([]byte(input), bcrypt_lib.DefaultCost)
- if err != nil {
- return fmt.Sprintf("failed to encrypt string with bcrypt: %s", err)
- }
-
- return string(hash)
-}
-
-func htpasswd(username string, password string) string {
- if strings.Contains(username, ":") {
- return fmt.Sprintf("invalid username: %s", username)
- }
- return fmt.Sprintf("%s:%s", username, bcrypt(password))
-}
-
-func randBytes(count int) (string, error) {
- buf := make([]byte, count)
- if _, err := rand.Read(buf); err != nil {
- return "", err
- }
- return base64.StdEncoding.EncodeToString(buf), nil
-}
-
-// uuidv4 provides a safe and secure UUID v4 implementation
-func uuidv4() string {
- return uuid.New().String()
-}
-
-var masterPasswordSeed = "com.lyndir.masterpassword"
-
-var passwordTypeTemplates = map[string][][]byte{
- "maximum": {[]byte("anoxxxxxxxxxxxxxxxxx"), []byte("axxxxxxxxxxxxxxxxxno")},
- "long": {[]byte("CvcvnoCvcvCvcv"), []byte("CvcvCvcvnoCvcv"), []byte("CvcvCvcvCvcvno"), []byte("CvccnoCvcvCvcv"), []byte("CvccCvcvnoCvcv"),
- []byte("CvccCvcvCvcvno"), []byte("CvcvnoCvccCvcv"), []byte("CvcvCvccnoCvcv"), []byte("CvcvCvccCvcvno"), []byte("CvcvnoCvcvCvcc"),
- []byte("CvcvCvcvnoCvcc"), []byte("CvcvCvcvCvccno"), []byte("CvccnoCvccCvcv"), []byte("CvccCvccnoCvcv"), []byte("CvccCvccCvcvno"),
- []byte("CvcvnoCvccCvcc"), []byte("CvcvCvccnoCvcc"), []byte("CvcvCvccCvccno"), []byte("CvccnoCvcvCvcc"), []byte("CvccCvcvnoCvcc"),
- []byte("CvccCvcvCvccno")},
- "medium": {[]byte("CvcnoCvc"), []byte("CvcCvcno")},
- "short": {[]byte("Cvcn")},
- "basic": {[]byte("aaanaaan"), []byte("aannaaan"), []byte("aaannaaa")},
- "pin": {[]byte("nnnn")},
-}
-
-var templateCharacters = map[byte]string{
- 'V': "AEIOU",
- 'C': "BCDFGHJKLMNPQRSTVWXYZ",
- 'v': "aeiou",
- 'c': "bcdfghjklmnpqrstvwxyz",
- 'A': "AEIOUBCDFGHJKLMNPQRSTVWXYZ",
- 'a': "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz",
- 'n': "0123456789",
- 'o': "@&%?,=[]_:-+*$#!'^~;()/.",
- 'x': "AEIOUaeiouBCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz0123456789!@#$%^&*()",
-}
-
-func derivePassword(counter uint32, passwordType, password, user, site string) string {
- var templates = passwordTypeTemplates[passwordType]
- if templates == nil {
- return fmt.Sprintf("cannot find password template %s", passwordType)
- }
-
- var buffer bytes.Buffer
- buffer.WriteString(masterPasswordSeed)
- binary.Write(&buffer, binary.BigEndian, uint32(len(user)))
- buffer.WriteString(user)
-
- salt := buffer.Bytes()
- key, err := scrypt.Key([]byte(password), salt, 32768, 8, 2, 64)
- if err != nil {
- return fmt.Sprintf("failed to derive password: %s", err)
- }
-
- buffer.Truncate(len(masterPasswordSeed))
- binary.Write(&buffer, binary.BigEndian, uint32(len(site)))
- buffer.WriteString(site)
- binary.Write(&buffer, binary.BigEndian, counter)
-
- var hmacv = hmac.New(sha256.New, key)
- hmacv.Write(buffer.Bytes())
- var seed = hmacv.Sum(nil)
- var temp = templates[int(seed[0])%len(templates)]
-
- buffer.Truncate(0)
- for i, element := range temp {
- passChars := templateCharacters[element]
- passChar := passChars[int(seed[i+1])%len(passChars)]
- buffer.WriteByte(passChar)
- }
-
- return buffer.String()
-}
-
-func generatePrivateKey(typ string) string {
- var priv interface{}
- var err error
- switch typ {
- case "", "rsa":
- // good enough for government work
- priv, err = rsa.GenerateKey(rand.Reader, 4096)
- case "dsa":
- key := new(dsa.PrivateKey)
- // again, good enough for government work
- if err = dsa.GenerateParameters(&key.Parameters, rand.Reader, dsa.L2048N256); err != nil {
- return fmt.Sprintf("failed to generate dsa params: %s", err)
- }
- err = dsa.GenerateKey(key, rand.Reader)
- priv = key
- case "ecdsa":
- // again, good enough for government work
- priv, err = ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
- case "ed25519":
- _, priv, err = ed25519.GenerateKey(rand.Reader)
- default:
- return "Unknown type " + typ
- }
- if err != nil {
- return fmt.Sprintf("failed to generate private key: %s", err)
- }
-
- return string(pem.EncodeToMemory(pemBlockForKey(priv)))
-}
-
-// DSAKeyFormat stores the format for DSA keys.
-// Used by pemBlockForKey
-type DSAKeyFormat struct {
- Version int
- P, Q, G, Y, X *big.Int
-}
-
-func pemBlockForKey(priv interface{}) *pem.Block {
- switch k := priv.(type) {
- case *rsa.PrivateKey:
- return &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(k)}
- case *dsa.PrivateKey:
- val := DSAKeyFormat{
- P: k.P, Q: k.Q, G: k.G,
- Y: k.Y, X: k.X,
- }
- bytes, _ := asn1.Marshal(val)
- return &pem.Block{Type: "DSA PRIVATE KEY", Bytes: bytes}
- case *ecdsa.PrivateKey:
- b, _ := x509.MarshalECPrivateKey(k)
- return &pem.Block{Type: "EC PRIVATE KEY", Bytes: b}
- default:
- // attempt PKCS#8 format for all other keys
- b, err := x509.MarshalPKCS8PrivateKey(k)
- if err != nil {
- return nil
- }
- return &pem.Block{Type: "PRIVATE KEY", Bytes: b}
- }
-}
-
-func parsePrivateKeyPEM(pemBlock string) (crypto.PrivateKey, error) {
- block, _ := pem.Decode([]byte(pemBlock))
- if block == nil {
- return nil, errors.New("no PEM data in input")
- }
-
- if block.Type == "PRIVATE KEY" {
- priv, err := x509.ParsePKCS8PrivateKey(block.Bytes)
- if err != nil {
- return nil, fmt.Errorf("decoding PEM as PKCS#8: %s", err)
- }
- return priv, nil
- } else if !strings.HasSuffix(block.Type, " PRIVATE KEY") {
- return nil, fmt.Errorf("no private key data in PEM block of type %s", block.Type)
- }
-
- switch block.Type[:len(block.Type)-12] { // strip " PRIVATE KEY"
- case "RSA":
- priv, err := x509.ParsePKCS1PrivateKey(block.Bytes)
- if err != nil {
- return nil, fmt.Errorf("parsing RSA private key from PEM: %s", err)
- }
- return priv, nil
- case "EC":
- priv, err := x509.ParseECPrivateKey(block.Bytes)
- if err != nil {
- return nil, fmt.Errorf("parsing EC private key from PEM: %s", err)
- }
- return priv, nil
- case "DSA":
- var k DSAKeyFormat
- _, err := asn1.Unmarshal(block.Bytes, &k)
- if err != nil {
- return nil, fmt.Errorf("parsing DSA private key from PEM: %s", err)
- }
- priv := &dsa.PrivateKey{
- PublicKey: dsa.PublicKey{
- Parameters: dsa.Parameters{
- P: k.P, Q: k.Q, G: k.G,
- },
- Y: k.Y,
- },
- X: k.X,
- }
- return priv, nil
- default:
- return nil, fmt.Errorf("invalid private key type %s", block.Type)
- }
-}
-
-func getPublicKey(priv crypto.PrivateKey) (crypto.PublicKey, error) {
- switch k := priv.(type) {
- case interface{ Public() crypto.PublicKey }:
- return k.Public(), nil
- case *dsa.PrivateKey:
- return &k.PublicKey, nil
- default:
- return nil, fmt.Errorf("unable to get public key for type %T", priv)
- }
-}
-
-type certificate struct {
- Cert string
- Key string
-}
-
-func buildCustomCertificate(b64cert string, b64key string) (certificate, error) {
- crt := certificate{}
-
- cert, err := base64.StdEncoding.DecodeString(b64cert)
- if err != nil {
- return crt, errors.New("unable to decode base64 certificate")
- }
-
- key, err := base64.StdEncoding.DecodeString(b64key)
- if err != nil {
- return crt, errors.New("unable to decode base64 private key")
- }
-
- decodedCert, _ := pem.Decode(cert)
- if decodedCert == nil {
- return crt, errors.New("unable to decode certificate")
- }
- _, err = x509.ParseCertificate(decodedCert.Bytes)
- if err != nil {
- return crt, fmt.Errorf(
- "error parsing certificate: decodedCert.Bytes: %s",
- err,
- )
- }
-
- _, err = parsePrivateKeyPEM(string(key))
- if err != nil {
- return crt, fmt.Errorf(
- "error parsing private key: %s",
- err,
- )
- }
-
- crt.Cert = string(cert)
- crt.Key = string(key)
-
- return crt, nil
-}
-
-func generateCertificateAuthority(
- cn string,
- daysValid int,
-) (certificate, error) {
- priv, err := rsa.GenerateKey(rand.Reader, 2048)
- if err != nil {
- return certificate{}, fmt.Errorf("error generating rsa key: %s", err)
- }
-
- return generateCertificateAuthorityWithKeyInternal(cn, daysValid, priv)
-}
-
-func generateCertificateAuthorityWithPEMKey(
- cn string,
- daysValid int,
- privPEM string,
-) (certificate, error) {
- priv, err := parsePrivateKeyPEM(privPEM)
- if err != nil {
- return certificate{}, fmt.Errorf("parsing private key: %s", err)
- }
- return generateCertificateAuthorityWithKeyInternal(cn, daysValid, priv)
-}
-
-func generateCertificateAuthorityWithKeyInternal(
- cn string,
- daysValid int,
- priv crypto.PrivateKey,
-) (certificate, error) {
- ca := certificate{}
-
- template, err := getBaseCertTemplate(cn, nil, nil, daysValid)
- if err != nil {
- return ca, err
- }
- // Override KeyUsage and IsCA
- template.KeyUsage = x509.KeyUsageKeyEncipherment |
- x509.KeyUsageDigitalSignature |
- x509.KeyUsageCertSign
- template.IsCA = true
-
- ca.Cert, ca.Key, err = getCertAndKey(template, priv, template, priv)
-
- return ca, err
-}
-
-func generateSelfSignedCertificate(
- cn string,
- ips []interface{},
- alternateDNS []interface{},
- daysValid int,
-) (certificate, error) {
- priv, err := rsa.GenerateKey(rand.Reader, 2048)
- if err != nil {
- return certificate{}, fmt.Errorf("error generating rsa key: %s", err)
- }
- return generateSelfSignedCertificateWithKeyInternal(cn, ips, alternateDNS, daysValid, priv)
-}
-
-func generateSelfSignedCertificateWithPEMKey(
- cn string,
- ips []interface{},
- alternateDNS []interface{},
- daysValid int,
- privPEM string,
-) (certificate, error) {
- priv, err := parsePrivateKeyPEM(privPEM)
- if err != nil {
- return certificate{}, fmt.Errorf("parsing private key: %s", err)
- }
- return generateSelfSignedCertificateWithKeyInternal(cn, ips, alternateDNS, daysValid, priv)
-}
-
-func generateSelfSignedCertificateWithKeyInternal(
- cn string,
- ips []interface{},
- alternateDNS []interface{},
- daysValid int,
- priv crypto.PrivateKey,
-) (certificate, error) {
- cert := certificate{}
-
- template, err := getBaseCertTemplate(cn, ips, alternateDNS, daysValid)
- if err != nil {
- return cert, err
- }
-
- cert.Cert, cert.Key, err = getCertAndKey(template, priv, template, priv)
-
- return cert, err
-}
-
-func generateSignedCertificate(
- cn string,
- ips []interface{},
- alternateDNS []interface{},
- daysValid int,
- ca certificate,
-) (certificate, error) {
- priv, err := rsa.GenerateKey(rand.Reader, 2048)
- if err != nil {
- return certificate{}, fmt.Errorf("error generating rsa key: %s", err)
- }
- return generateSignedCertificateWithKeyInternal(cn, ips, alternateDNS, daysValid, ca, priv)
-}
-
-func generateSignedCertificateWithPEMKey(
- cn string,
- ips []interface{},
- alternateDNS []interface{},
- daysValid int,
- ca certificate,
- privPEM string,
-) (certificate, error) {
- priv, err := parsePrivateKeyPEM(privPEM)
- if err != nil {
- return certificate{}, fmt.Errorf("parsing private key: %s", err)
- }
- return generateSignedCertificateWithKeyInternal(cn, ips, alternateDNS, daysValid, ca, priv)
-}
-
-func generateSignedCertificateWithKeyInternal(
- cn string,
- ips []interface{},
- alternateDNS []interface{},
- daysValid int,
- ca certificate,
- priv crypto.PrivateKey,
-) (certificate, error) {
- cert := certificate{}
-
- decodedSignerCert, _ := pem.Decode([]byte(ca.Cert))
- if decodedSignerCert == nil {
- return cert, errors.New("unable to decode certificate")
- }
- signerCert, err := x509.ParseCertificate(decodedSignerCert.Bytes)
- if err != nil {
- return cert, fmt.Errorf(
- "error parsing certificate: decodedSignerCert.Bytes: %s",
- err,
- )
- }
- signerKey, err := parsePrivateKeyPEM(ca.Key)
- if err != nil {
- return cert, fmt.Errorf(
- "error parsing private key: %s",
- err,
- )
- }
-
- template, err := getBaseCertTemplate(cn, ips, alternateDNS, daysValid)
- if err != nil {
- return cert, err
- }
-
- cert.Cert, cert.Key, err = getCertAndKey(
- template,
- priv,
- signerCert,
- signerKey,
- )
-
- return cert, err
-}
-
-func getCertAndKey(
- template *x509.Certificate,
- signeeKey crypto.PrivateKey,
- parent *x509.Certificate,
- signingKey crypto.PrivateKey,
-) (string, string, error) {
- signeePubKey, err := getPublicKey(signeeKey)
- if err != nil {
- return "", "", fmt.Errorf("error retrieving public key from signee key: %s", err)
- }
- derBytes, err := x509.CreateCertificate(
- rand.Reader,
- template,
- parent,
- signeePubKey,
- signingKey,
- )
- if err != nil {
- return "", "", fmt.Errorf("error creating certificate: %s", err)
- }
-
- certBuffer := bytes.Buffer{}
- if err := pem.Encode(
- &certBuffer,
- &pem.Block{Type: "CERTIFICATE", Bytes: derBytes},
- ); err != nil {
- return "", "", fmt.Errorf("error pem-encoding certificate: %s", err)
- }
-
- keyBuffer := bytes.Buffer{}
- if err := pem.Encode(
- &keyBuffer,
- pemBlockForKey(signeeKey),
- ); err != nil {
- return "", "", fmt.Errorf("error pem-encoding key: %s", err)
- }
-
- return certBuffer.String(), keyBuffer.String(), nil
-}
-
-func getBaseCertTemplate(
- cn string,
- ips []interface{},
- alternateDNS []interface{},
- daysValid int,
-) (*x509.Certificate, error) {
- ipAddresses, err := getNetIPs(ips)
- if err != nil {
- return nil, err
- }
- dnsNames, err := getAlternateDNSStrs(alternateDNS)
- if err != nil {
- return nil, err
- }
- serialNumberUpperBound := new(big.Int).Lsh(big.NewInt(1), 128)
- serialNumber, err := rand.Int(rand.Reader, serialNumberUpperBound)
- if err != nil {
- return nil, err
- }
- return &x509.Certificate{
- SerialNumber: serialNumber,
- Subject: pkix.Name{
- CommonName: cn,
- },
- IPAddresses: ipAddresses,
- DNSNames: dnsNames,
- NotBefore: time.Now(),
- NotAfter: time.Now().Add(time.Hour * 24 * time.Duration(daysValid)),
- KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
- ExtKeyUsage: []x509.ExtKeyUsage{
- x509.ExtKeyUsageServerAuth,
- x509.ExtKeyUsageClientAuth,
- },
- BasicConstraintsValid: true,
- }, nil
-}
-
-func getNetIPs(ips []interface{}) ([]net.IP, error) {
- if ips == nil {
- return []net.IP{}, nil
- }
- var ipStr string
- var ok bool
- var netIP net.IP
- netIPs := make([]net.IP, len(ips))
- for i, ip := range ips {
- ipStr, ok = ip.(string)
- if !ok {
- return nil, fmt.Errorf("error parsing ip: %v is not a string", ip)
- }
- netIP = net.ParseIP(ipStr)
- if netIP == nil {
- return nil, fmt.Errorf("error parsing ip: %s", ipStr)
- }
- netIPs[i] = netIP
- }
- return netIPs, nil
-}
-
-func getAlternateDNSStrs(alternateDNS []interface{}) ([]string, error) {
- if alternateDNS == nil {
- return []string{}, nil
- }
- var dnsStr string
- var ok bool
- alternateDNSStrs := make([]string, len(alternateDNS))
- for i, dns := range alternateDNS {
- dnsStr, ok = dns.(string)
- if !ok {
- return nil, fmt.Errorf(
- "error processing alternate dns name: %v is not a string",
- dns,
- )
- }
- alternateDNSStrs[i] = dnsStr
- }
- return alternateDNSStrs, nil
-}
-
-func encryptAES(password string, plaintext string) (string, error) {
- if plaintext == "" {
- return "", nil
- }
-
- key := make([]byte, 32)
- copy(key, []byte(password))
- block, err := aes.NewCipher(key)
- if err != nil {
- return "", err
- }
-
- content := []byte(plaintext)
- blockSize := block.BlockSize()
- padding := blockSize - len(content)%blockSize
- padtext := bytes.Repeat([]byte{byte(padding)}, padding)
- content = append(content, padtext...)
-
- ciphertext := make([]byte, aes.BlockSize+len(content))
-
- iv := ciphertext[:aes.BlockSize]
- if _, err := io.ReadFull(rand.Reader, iv); err != nil {
- return "", err
- }
-
- mode := cipher.NewCBCEncrypter(block, iv)
- mode.CryptBlocks(ciphertext[aes.BlockSize:], content)
-
- return base64.StdEncoding.EncodeToString(ciphertext), nil
-}
-
-func decryptAES(password string, crypt64 string) (string, error) {
- if crypt64 == "" {
- return "", nil
- }
-
- key := make([]byte, 32)
- copy(key, []byte(password))
-
- crypt, err := base64.StdEncoding.DecodeString(crypt64)
- if err != nil {
- return "", err
- }
-
- block, err := aes.NewCipher(key)
- if err != nil {
- return "", err
- }
-
- iv := crypt[:aes.BlockSize]
- crypt = crypt[aes.BlockSize:]
- decrypted := make([]byte, len(crypt))
- mode := cipher.NewCBCDecrypter(block, iv)
- mode.CryptBlocks(decrypted, crypt)
-
- return string(decrypted[:len(decrypted)-int(decrypted[len(decrypted)-1])]), nil
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/date.go b/vendor/github.com/Masterminds/sprig/v3/date.go
deleted file mode 100644
index ed022ddaca..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/date.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package sprig
-
-import (
- "strconv"
- "time"
-)
-
-// Given a format and a date, format the date string.
-//
-// Date can be a `time.Time` or an `int, int32, int64`.
-// In the later case, it is treated as seconds since UNIX
-// epoch.
-func date(fmt string, date interface{}) string {
- return dateInZone(fmt, date, "Local")
-}
-
-func htmlDate(date interface{}) string {
- return dateInZone("2006-01-02", date, "Local")
-}
-
-func htmlDateInZone(date interface{}, zone string) string {
- return dateInZone("2006-01-02", date, zone)
-}
-
-func dateInZone(fmt string, date interface{}, zone string) string {
- var t time.Time
- switch date := date.(type) {
- default:
- t = time.Now()
- case time.Time:
- t = date
- case *time.Time:
- t = *date
- case int64:
- t = time.Unix(date, 0)
- case int:
- t = time.Unix(int64(date), 0)
- case int32:
- t = time.Unix(int64(date), 0)
- }
-
- loc, err := time.LoadLocation(zone)
- if err != nil {
- loc, _ = time.LoadLocation("UTC")
- }
-
- return t.In(loc).Format(fmt)
-}
-
-func dateModify(fmt string, date time.Time) time.Time {
- d, err := time.ParseDuration(fmt)
- if err != nil {
- return date
- }
- return date.Add(d)
-}
-
-func mustDateModify(fmt string, date time.Time) (time.Time, error) {
- d, err := time.ParseDuration(fmt)
- if err != nil {
- return time.Time{}, err
- }
- return date.Add(d), nil
-}
-
-func dateAgo(date interface{}) string {
- var t time.Time
-
- switch date := date.(type) {
- default:
- t = time.Now()
- case time.Time:
- t = date
- case int64:
- t = time.Unix(date, 0)
- case int:
- t = time.Unix(int64(date), 0)
- }
- // Drop resolution to seconds
- duration := time.Since(t).Round(time.Second)
- return duration.String()
-}
-
-func duration(sec interface{}) string {
- var n int64
- switch value := sec.(type) {
- default:
- n = 0
- case string:
- n, _ = strconv.ParseInt(value, 10, 64)
- case int64:
- n = value
- }
- return (time.Duration(n) * time.Second).String()
-}
-
-func durationRound(duration interface{}) string {
- var d time.Duration
- switch duration := duration.(type) {
- default:
- d = 0
- case string:
- d, _ = time.ParseDuration(duration)
- case int64:
- d = time.Duration(duration)
- case time.Time:
- d = time.Since(duration)
- }
-
- u := uint64(d)
- neg := d < 0
- if neg {
- u = -u
- }
-
- var (
- year = uint64(time.Hour) * 24 * 365
- month = uint64(time.Hour) * 24 * 30
- day = uint64(time.Hour) * 24
- hour = uint64(time.Hour)
- minute = uint64(time.Minute)
- second = uint64(time.Second)
- )
- switch {
- case u > year:
- return strconv.FormatUint(u/year, 10) + "y"
- case u > month:
- return strconv.FormatUint(u/month, 10) + "mo"
- case u > day:
- return strconv.FormatUint(u/day, 10) + "d"
- case u > hour:
- return strconv.FormatUint(u/hour, 10) + "h"
- case u > minute:
- return strconv.FormatUint(u/minute, 10) + "m"
- case u > second:
- return strconv.FormatUint(u/second, 10) + "s"
- }
- return "0s"
-}
-
-func toDate(fmt, str string) time.Time {
- t, _ := time.ParseInLocation(fmt, str, time.Local)
- return t
-}
-
-func mustToDate(fmt, str string) (time.Time, error) {
- return time.ParseInLocation(fmt, str, time.Local)
-}
-
-func unixEpoch(date time.Time) string {
- return strconv.FormatInt(date.Unix(), 10)
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/defaults.go b/vendor/github.com/Masterminds/sprig/v3/defaults.go
deleted file mode 100644
index b9f979666d..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/defaults.go
+++ /dev/null
@@ -1,163 +0,0 @@
-package sprig
-
-import (
- "bytes"
- "encoding/json"
- "math/rand"
- "reflect"
- "strings"
- "time"
-)
-
-func init() {
- rand.Seed(time.Now().UnixNano())
-}
-
-// dfault checks whether `given` is set, and returns default if not set.
-//
-// This returns `d` if `given` appears not to be set, and `given` otherwise.
-//
-// For numeric types 0 is unset.
-// For strings, maps, arrays, and slices, len() = 0 is considered unset.
-// For bool, false is unset.
-// Structs are never considered unset.
-//
-// For everything else, including pointers, a nil value is unset.
-func dfault(d interface{}, given ...interface{}) interface{} {
-
- if empty(given) || empty(given[0]) {
- return d
- }
- return given[0]
-}
-
-// empty returns true if the given value has the zero value for its type.
-func empty(given interface{}) bool {
- g := reflect.ValueOf(given)
- if !g.IsValid() {
- return true
- }
-
- // Basically adapted from text/template.isTrue
- switch g.Kind() {
- default:
- return g.IsNil()
- case reflect.Array, reflect.Slice, reflect.Map, reflect.String:
- return g.Len() == 0
- case reflect.Bool:
- return !g.Bool()
- case reflect.Complex64, reflect.Complex128:
- return g.Complex() == 0
- case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
- return g.Int() == 0
- case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
- return g.Uint() == 0
- case reflect.Float32, reflect.Float64:
- return g.Float() == 0
- case reflect.Struct:
- return false
- }
-}
-
-// coalesce returns the first non-empty value.
-func coalesce(v ...interface{}) interface{} {
- for _, val := range v {
- if !empty(val) {
- return val
- }
- }
- return nil
-}
-
-// all returns true if empty(x) is false for all values x in the list.
-// If the list is empty, return true.
-func all(v ...interface{}) bool {
- for _, val := range v {
- if empty(val) {
- return false
- }
- }
- return true
-}
-
-// any returns true if empty(x) is false for any x in the list.
-// If the list is empty, return false.
-func any(v ...interface{}) bool {
- for _, val := range v {
- if !empty(val) {
- return true
- }
- }
- return false
-}
-
-// fromJson decodes JSON into a structured value, ignoring errors.
-func fromJson(v string) interface{} {
- output, _ := mustFromJson(v)
- return output
-}
-
-// mustFromJson decodes JSON into a structured value, returning errors.
-func mustFromJson(v string) (interface{}, error) {
- var output interface{}
- err := json.Unmarshal([]byte(v), &output)
- return output, err
-}
-
-// toJson encodes an item into a JSON string
-func toJson(v interface{}) string {
- output, _ := json.Marshal(v)
- return string(output)
-}
-
-func mustToJson(v interface{}) (string, error) {
- output, err := json.Marshal(v)
- if err != nil {
- return "", err
- }
- return string(output), nil
-}
-
-// toPrettyJson encodes an item into a pretty (indented) JSON string
-func toPrettyJson(v interface{}) string {
- output, _ := json.MarshalIndent(v, "", " ")
- return string(output)
-}
-
-func mustToPrettyJson(v interface{}) (string, error) {
- output, err := json.MarshalIndent(v, "", " ")
- if err != nil {
- return "", err
- }
- return string(output), nil
-}
-
-// toRawJson encodes an item into a JSON string with no escaping of HTML characters.
-func toRawJson(v interface{}) string {
- output, err := mustToRawJson(v)
- if err != nil {
- panic(err)
- }
- return string(output)
-}
-
-// mustToRawJson encodes an item into a JSON string with no escaping of HTML characters.
-func mustToRawJson(v interface{}) (string, error) {
- buf := new(bytes.Buffer)
- enc := json.NewEncoder(buf)
- enc.SetEscapeHTML(false)
- err := enc.Encode(&v)
- if err != nil {
- return "", err
- }
- return strings.TrimSuffix(buf.String(), "\n"), nil
-}
-
-// ternary returns the first value if the last value is true, otherwise returns the second value.
-func ternary(vt interface{}, vf interface{}, v bool) interface{} {
- if v {
- return vt
- }
-
- return vf
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/dict.go b/vendor/github.com/Masterminds/sprig/v3/dict.go
deleted file mode 100644
index 4315b3542a..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/dict.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package sprig
-
-import (
- "dario.cat/mergo"
- "github.com/mitchellh/copystructure"
-)
-
-func get(d map[string]interface{}, key string) interface{} {
- if val, ok := d[key]; ok {
- return val
- }
- return ""
-}
-
-func set(d map[string]interface{}, key string, value interface{}) map[string]interface{} {
- d[key] = value
- return d
-}
-
-func unset(d map[string]interface{}, key string) map[string]interface{} {
- delete(d, key)
- return d
-}
-
-func hasKey(d map[string]interface{}, key string) bool {
- _, ok := d[key]
- return ok
-}
-
-func pluck(key string, d ...map[string]interface{}) []interface{} {
- res := []interface{}{}
- for _, dict := range d {
- if val, ok := dict[key]; ok {
- res = append(res, val)
- }
- }
- return res
-}
-
-func keys(dicts ...map[string]interface{}) []string {
- k := []string{}
- for _, dict := range dicts {
- for key := range dict {
- k = append(k, key)
- }
- }
- return k
-}
-
-func pick(dict map[string]interface{}, keys ...string) map[string]interface{} {
- res := map[string]interface{}{}
- for _, k := range keys {
- if v, ok := dict[k]; ok {
- res[k] = v
- }
- }
- return res
-}
-
-func omit(dict map[string]interface{}, keys ...string) map[string]interface{} {
- res := map[string]interface{}{}
-
- omit := make(map[string]bool, len(keys))
- for _, k := range keys {
- omit[k] = true
- }
-
- for k, v := range dict {
- if _, ok := omit[k]; !ok {
- res[k] = v
- }
- }
- return res
-}
-
-func dict(v ...interface{}) map[string]interface{} {
- dict := map[string]interface{}{}
- lenv := len(v)
- for i := 0; i < lenv; i += 2 {
- key := strval(v[i])
- if i+1 >= lenv {
- dict[key] = ""
- continue
- }
- dict[key] = v[i+1]
- }
- return dict
-}
-
-func merge(dst map[string]interface{}, srcs ...map[string]interface{}) interface{} {
- for _, src := range srcs {
- if err := mergo.Merge(&dst, src); err != nil {
- // Swallow errors inside of a template.
- return ""
- }
- }
- return dst
-}
-
-func mustMerge(dst map[string]interface{}, srcs ...map[string]interface{}) (interface{}, error) {
- for _, src := range srcs {
- if err := mergo.Merge(&dst, src); err != nil {
- return nil, err
- }
- }
- return dst, nil
-}
-
-func mergeOverwrite(dst map[string]interface{}, srcs ...map[string]interface{}) interface{} {
- for _, src := range srcs {
- if err := mergo.MergeWithOverwrite(&dst, src); err != nil {
- // Swallow errors inside of a template.
- return ""
- }
- }
- return dst
-}
-
-func mustMergeOverwrite(dst map[string]interface{}, srcs ...map[string]interface{}) (interface{}, error) {
- for _, src := range srcs {
- if err := mergo.MergeWithOverwrite(&dst, src); err != nil {
- return nil, err
- }
- }
- return dst, nil
-}
-
-func values(dict map[string]interface{}) []interface{} {
- values := []interface{}{}
- for _, value := range dict {
- values = append(values, value)
- }
-
- return values
-}
-
-func deepCopy(i interface{}) interface{} {
- c, err := mustDeepCopy(i)
- if err != nil {
- panic("deepCopy error: " + err.Error())
- }
-
- return c
-}
-
-func mustDeepCopy(i interface{}) (interface{}, error) {
- return copystructure.Copy(i)
-}
-
-func dig(ps ...interface{}) (interface{}, error) {
- if len(ps) < 3 {
- panic("dig needs at least three arguments")
- }
- dict := ps[len(ps)-1].(map[string]interface{})
- def := ps[len(ps)-2]
- ks := make([]string, len(ps)-2)
- for i := 0; i < len(ks); i++ {
- ks[i] = ps[i].(string)
- }
-
- return digFromDict(dict, def, ks)
-}
-
-func digFromDict(dict map[string]interface{}, d interface{}, ks []string) (interface{}, error) {
- k, ns := ks[0], ks[1:len(ks)]
- step, has := dict[k]
- if !has {
- return d, nil
- }
- if len(ns) == 0 {
- return step, nil
- }
- return digFromDict(step.(map[string]interface{}), d, ns)
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/doc.go b/vendor/github.com/Masterminds/sprig/v3/doc.go
deleted file mode 100644
index 91031d6d19..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/doc.go
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Package sprig provides template functions for Go.
-
-This package contains a number of utility functions for working with data
-inside of Go `html/template` and `text/template` files.
-
-To add these functions, use the `template.Funcs()` method:
-
- t := template.New("foo").Funcs(sprig.FuncMap())
-
-Note that you should add the function map before you parse any template files.
-
- In several cases, Sprig reverses the order of arguments from the way they
- appear in the standard library. This is to make it easier to pipe
- arguments into functions.
-
-See http://masterminds.github.io/sprig/ for more detailed documentation on each of the available functions.
-*/
-package sprig
diff --git a/vendor/github.com/Masterminds/sprig/v3/functions.go b/vendor/github.com/Masterminds/sprig/v3/functions.go
deleted file mode 100644
index cda47d26f2..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/functions.go
+++ /dev/null
@@ -1,385 +0,0 @@
-package sprig
-
-import (
- "errors"
- "html/template"
- "math/rand"
- "os"
- "path"
- "path/filepath"
- "reflect"
- "strconv"
- "strings"
- ttemplate "text/template"
- "time"
-
- util "github.com/Masterminds/goutils"
- "github.com/huandu/xstrings"
- "github.com/shopspring/decimal"
-)
-
-// FuncMap produces the function map.
-//
-// Use this to pass the functions into the template engine:
-//
-// tpl := template.New("foo").Funcs(sprig.FuncMap()))
-func FuncMap() template.FuncMap {
- return HtmlFuncMap()
-}
-
-// HermeticTxtFuncMap returns a 'text/template'.FuncMap with only repeatable functions.
-func HermeticTxtFuncMap() ttemplate.FuncMap {
- r := TxtFuncMap()
- for _, name := range nonhermeticFunctions {
- delete(r, name)
- }
- return r
-}
-
-// HermeticHtmlFuncMap returns an 'html/template'.Funcmap with only repeatable functions.
-func HermeticHtmlFuncMap() template.FuncMap {
- r := HtmlFuncMap()
- for _, name := range nonhermeticFunctions {
- delete(r, name)
- }
- return r
-}
-
-// TxtFuncMap returns a 'text/template'.FuncMap
-func TxtFuncMap() ttemplate.FuncMap {
- return ttemplate.FuncMap(GenericFuncMap())
-}
-
-// HtmlFuncMap returns an 'html/template'.Funcmap
-func HtmlFuncMap() template.FuncMap {
- return template.FuncMap(GenericFuncMap())
-}
-
-// GenericFuncMap returns a copy of the basic function map as a map[string]interface{}.
-func GenericFuncMap() map[string]interface{} {
- gfm := make(map[string]interface{}, len(genericMap))
- for k, v := range genericMap {
- gfm[k] = v
- }
- return gfm
-}
-
-// These functions are not guaranteed to evaluate to the same result for given input, because they
-// refer to the environment or global state.
-var nonhermeticFunctions = []string{
- // Date functions
- "date",
- "date_in_zone",
- "date_modify",
- "now",
- "htmlDate",
- "htmlDateInZone",
- "dateInZone",
- "dateModify",
-
- // Strings
- "randAlphaNum",
- "randAlpha",
- "randAscii",
- "randNumeric",
- "randBytes",
- "uuidv4",
-
- // OS
- "env",
- "expandenv",
-
- // Network
- "getHostByName",
-}
-
-var genericMap = map[string]interface{}{
- "hello": func() string { return "Hello!" },
-
- // Date functions
- "ago": dateAgo,
- "date": date,
- "date_in_zone": dateInZone,
- "date_modify": dateModify,
- "dateInZone": dateInZone,
- "dateModify": dateModify,
- "duration": duration,
- "durationRound": durationRound,
- "htmlDate": htmlDate,
- "htmlDateInZone": htmlDateInZone,
- "must_date_modify": mustDateModify,
- "mustDateModify": mustDateModify,
- "mustToDate": mustToDate,
- "now": time.Now,
- "toDate": toDate,
- "unixEpoch": unixEpoch,
-
- // Strings
- "abbrev": abbrev,
- "abbrevboth": abbrevboth,
- "trunc": trunc,
- "trim": strings.TrimSpace,
- "upper": strings.ToUpper,
- "lower": strings.ToLower,
- "title": strings.Title,
- "untitle": untitle,
- "substr": substring,
- // Switch order so that "foo" | repeat 5
- "repeat": func(count int, str string) string { return strings.Repeat(str, count) },
- // Deprecated: Use trimAll.
- "trimall": func(a, b string) string { return strings.Trim(b, a) },
- // Switch order so that "$foo" | trimall "$"
- "trimAll": func(a, b string) string { return strings.Trim(b, a) },
- "trimSuffix": func(a, b string) string { return strings.TrimSuffix(b, a) },
- "trimPrefix": func(a, b string) string { return strings.TrimPrefix(b, a) },
- "nospace": util.DeleteWhiteSpace,
- "initials": initials,
- "randAlphaNum": randAlphaNumeric,
- "randAlpha": randAlpha,
- "randAscii": randAscii,
- "randNumeric": randNumeric,
- "swapcase": util.SwapCase,
- "shuffle": xstrings.Shuffle,
- "snakecase": xstrings.ToSnakeCase,
- // camelcase used to call xstrings.ToCamelCase, but that function had a breaking change in version
- // 1.5 that moved it from upper camel case to lower camel case. This is a breaking change for sprig.
- // A new xstrings.ToPascalCase function was added that provided upper camel case.
- "camelcase": xstrings.ToPascalCase,
- "kebabcase": xstrings.ToKebabCase,
- "wrap": func(l int, s string) string { return util.Wrap(s, l) },
- "wrapWith": func(l int, sep, str string) string { return util.WrapCustom(str, l, sep, true) },
- // Switch order so that "foobar" | contains "foo"
- "contains": func(substr string, str string) bool { return strings.Contains(str, substr) },
- "hasPrefix": func(substr string, str string) bool { return strings.HasPrefix(str, substr) },
- "hasSuffix": func(substr string, str string) bool { return strings.HasSuffix(str, substr) },
- "quote": quote,
- "squote": squote,
- "cat": cat,
- "indent": indent,
- "nindent": nindent,
- "replace": replace,
- "plural": plural,
- "sha1sum": sha1sum,
- "sha256sum": sha256sum,
- "sha512sum": sha512sum,
- "adler32sum": adler32sum,
- "toString": strval,
-
- // Wrap Atoi to stop errors.
- "atoi": func(a string) int { i, _ := strconv.Atoi(a); return i },
- "int64": toInt64,
- "int": toInt,
- "float64": toFloat64,
- "seq": seq,
- "toDecimal": toDecimal,
-
- //"gt": func(a, b int) bool {return a > b},
- //"gte": func(a, b int) bool {return a >= b},
- //"lt": func(a, b int) bool {return a < b},
- //"lte": func(a, b int) bool {return a <= b},
-
- // split "/" foo/bar returns map[int]string{0: foo, 1: bar}
- "split": split,
- "splitList": func(sep, orig string) []string { return strings.Split(orig, sep) },
- // splitn "/" foo/bar/fuu returns map[int]string{0: foo, 1: bar/fuu}
- "splitn": splitn,
- "toStrings": strslice,
-
- "until": until,
- "untilStep": untilStep,
-
- // VERY basic arithmetic.
- "add1": func(i interface{}) int64 { return toInt64(i) + 1 },
- "add": func(i ...interface{}) int64 {
- var a int64 = 0
- for _, b := range i {
- a += toInt64(b)
- }
- return a
- },
- "sub": func(a, b interface{}) int64 { return toInt64(a) - toInt64(b) },
- "div": func(a, b interface{}) int64 { return toInt64(a) / toInt64(b) },
- "mod": func(a, b interface{}) int64 { return toInt64(a) % toInt64(b) },
- "mul": func(a interface{}, v ...interface{}) int64 {
- val := toInt64(a)
- for _, b := range v {
- val = val * toInt64(b)
- }
- return val
- },
- "randInt": func(min, max int) int { return rand.Intn(max-min) + min },
- "add1f": func(i interface{}) float64 {
- return execDecimalOp(i, []interface{}{1}, func(d1, d2 decimal.Decimal) decimal.Decimal { return d1.Add(d2) })
- },
- "addf": func(i ...interface{}) float64 {
- a := interface{}(float64(0))
- return execDecimalOp(a, i, func(d1, d2 decimal.Decimal) decimal.Decimal { return d1.Add(d2) })
- },
- "subf": func(a interface{}, v ...interface{}) float64 {
- return execDecimalOp(a, v, func(d1, d2 decimal.Decimal) decimal.Decimal { return d1.Sub(d2) })
- },
- "divf": func(a interface{}, v ...interface{}) float64 {
- return execDecimalOp(a, v, func(d1, d2 decimal.Decimal) decimal.Decimal { return d1.Div(d2) })
- },
- "mulf": func(a interface{}, v ...interface{}) float64 {
- return execDecimalOp(a, v, func(d1, d2 decimal.Decimal) decimal.Decimal { return d1.Mul(d2) })
- },
- "biggest": max,
- "max": max,
- "min": min,
- "maxf": maxf,
- "minf": minf,
- "ceil": ceil,
- "floor": floor,
- "round": round,
-
- // string slices. Note that we reverse the order b/c that's better
- // for template processing.
- "join": join,
- "sortAlpha": sortAlpha,
-
- // Defaults
- "default": dfault,
- "empty": empty,
- "coalesce": coalesce,
- "all": all,
- "any": any,
- "compact": compact,
- "mustCompact": mustCompact,
- "fromJson": fromJson,
- "toJson": toJson,
- "toPrettyJson": toPrettyJson,
- "toRawJson": toRawJson,
- "mustFromJson": mustFromJson,
- "mustToJson": mustToJson,
- "mustToPrettyJson": mustToPrettyJson,
- "mustToRawJson": mustToRawJson,
- "ternary": ternary,
- "deepCopy": deepCopy,
- "mustDeepCopy": mustDeepCopy,
-
- // Reflection
- "typeOf": typeOf,
- "typeIs": typeIs,
- "typeIsLike": typeIsLike,
- "kindOf": kindOf,
- "kindIs": kindIs,
- "deepEqual": reflect.DeepEqual,
-
- // OS:
- "env": os.Getenv,
- "expandenv": os.ExpandEnv,
-
- // Network:
- "getHostByName": getHostByName,
-
- // Paths:
- "base": path.Base,
- "dir": path.Dir,
- "clean": path.Clean,
- "ext": path.Ext,
- "isAbs": path.IsAbs,
-
- // Filepaths:
- "osBase": filepath.Base,
- "osClean": filepath.Clean,
- "osDir": filepath.Dir,
- "osExt": filepath.Ext,
- "osIsAbs": filepath.IsAbs,
-
- // Encoding:
- "b64enc": base64encode,
- "b64dec": base64decode,
- "b32enc": base32encode,
- "b32dec": base32decode,
-
- // Data Structures:
- "tuple": list, // FIXME: with the addition of append/prepend these are no longer immutable.
- "list": list,
- "dict": dict,
- "get": get,
- "set": set,
- "unset": unset,
- "hasKey": hasKey,
- "pluck": pluck,
- "keys": keys,
- "pick": pick,
- "omit": omit,
- "merge": merge,
- "mergeOverwrite": mergeOverwrite,
- "mustMerge": mustMerge,
- "mustMergeOverwrite": mustMergeOverwrite,
- "values": values,
-
- "append": push, "push": push,
- "mustAppend": mustPush, "mustPush": mustPush,
- "prepend": prepend,
- "mustPrepend": mustPrepend,
- "first": first,
- "mustFirst": mustFirst,
- "rest": rest,
- "mustRest": mustRest,
- "last": last,
- "mustLast": mustLast,
- "initial": initial,
- "mustInitial": mustInitial,
- "reverse": reverse,
- "mustReverse": mustReverse,
- "uniq": uniq,
- "mustUniq": mustUniq,
- "without": without,
- "mustWithout": mustWithout,
- "has": has,
- "mustHas": mustHas,
- "slice": slice,
- "mustSlice": mustSlice,
- "concat": concat,
- "dig": dig,
- "chunk": chunk,
- "mustChunk": mustChunk,
-
- // Crypto:
- "bcrypt": bcrypt,
- "htpasswd": htpasswd,
- "genPrivateKey": generatePrivateKey,
- "derivePassword": derivePassword,
- "buildCustomCert": buildCustomCertificate,
- "genCA": generateCertificateAuthority,
- "genCAWithKey": generateCertificateAuthorityWithPEMKey,
- "genSelfSignedCert": generateSelfSignedCertificate,
- "genSelfSignedCertWithKey": generateSelfSignedCertificateWithPEMKey,
- "genSignedCert": generateSignedCertificate,
- "genSignedCertWithKey": generateSignedCertificateWithPEMKey,
- "encryptAES": encryptAES,
- "decryptAES": decryptAES,
- "randBytes": randBytes,
-
- // UUIDs:
- "uuidv4": uuidv4,
-
- // SemVer:
- "semver": semver,
- "semverCompare": semverCompare,
-
- // Flow Control:
- "fail": func(msg string) (string, error) { return "", errors.New(msg) },
-
- // Regex
- "regexMatch": regexMatch,
- "mustRegexMatch": mustRegexMatch,
- "regexFindAll": regexFindAll,
- "mustRegexFindAll": mustRegexFindAll,
- "regexFind": regexFind,
- "mustRegexFind": mustRegexFind,
- "regexReplaceAll": regexReplaceAll,
- "mustRegexReplaceAll": mustRegexReplaceAll,
- "regexReplaceAllLiteral": regexReplaceAllLiteral,
- "mustRegexReplaceAllLiteral": mustRegexReplaceAllLiteral,
- "regexSplit": regexSplit,
- "mustRegexSplit": mustRegexSplit,
- "regexQuoteMeta": regexQuoteMeta,
-
- // URLs:
- "urlParse": urlParse,
- "urlJoin": urlJoin,
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/list.go b/vendor/github.com/Masterminds/sprig/v3/list.go
deleted file mode 100644
index ca0fbb7893..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/list.go
+++ /dev/null
@@ -1,464 +0,0 @@
-package sprig
-
-import (
- "fmt"
- "math"
- "reflect"
- "sort"
-)
-
-// Reflection is used in these functions so that slices and arrays of strings,
-// ints, and other types not implementing []interface{} can be worked with.
-// For example, this is useful if you need to work on the output of regexs.
-
-func list(v ...interface{}) []interface{} {
- return v
-}
-
-func push(list interface{}, v interface{}) []interface{} {
- l, err := mustPush(list, v)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustPush(list interface{}, v interface{}) ([]interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- nl := make([]interface{}, l)
- for i := 0; i < l; i++ {
- nl[i] = l2.Index(i).Interface()
- }
-
- return append(nl, v), nil
-
- default:
- return nil, fmt.Errorf("Cannot push on type %s", tp)
- }
-}
-
-func prepend(list interface{}, v interface{}) []interface{} {
- l, err := mustPrepend(list, v)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustPrepend(list interface{}, v interface{}) ([]interface{}, error) {
- //return append([]interface{}{v}, list...)
-
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- nl := make([]interface{}, l)
- for i := 0; i < l; i++ {
- nl[i] = l2.Index(i).Interface()
- }
-
- return append([]interface{}{v}, nl...), nil
-
- default:
- return nil, fmt.Errorf("Cannot prepend on type %s", tp)
- }
-}
-
-func chunk(size int, list interface{}) [][]interface{} {
- l, err := mustChunk(size, list)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustChunk(size int, list interface{}) ([][]interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
-
- cs := int(math.Floor(float64(l-1)/float64(size)) + 1)
- nl := make([][]interface{}, cs)
-
- for i := 0; i < cs; i++ {
- clen := size
- if i == cs-1 {
- clen = int(math.Floor(math.Mod(float64(l), float64(size))))
- if clen == 0 {
- clen = size
- }
- }
-
- nl[i] = make([]interface{}, clen)
-
- for j := 0; j < clen; j++ {
- ix := i*size + j
- nl[i][j] = l2.Index(ix).Interface()
- }
- }
-
- return nl, nil
-
- default:
- return nil, fmt.Errorf("Cannot chunk type %s", tp)
- }
-}
-
-func last(list interface{}) interface{} {
- l, err := mustLast(list)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustLast(list interface{}) (interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- if l == 0 {
- return nil, nil
- }
-
- return l2.Index(l - 1).Interface(), nil
- default:
- return nil, fmt.Errorf("Cannot find last on type %s", tp)
- }
-}
-
-func first(list interface{}) interface{} {
- l, err := mustFirst(list)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustFirst(list interface{}) (interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- if l == 0 {
- return nil, nil
- }
-
- return l2.Index(0).Interface(), nil
- default:
- return nil, fmt.Errorf("Cannot find first on type %s", tp)
- }
-}
-
-func rest(list interface{}) []interface{} {
- l, err := mustRest(list)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustRest(list interface{}) ([]interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- if l == 0 {
- return nil, nil
- }
-
- nl := make([]interface{}, l-1)
- for i := 1; i < l; i++ {
- nl[i-1] = l2.Index(i).Interface()
- }
-
- return nl, nil
- default:
- return nil, fmt.Errorf("Cannot find rest on type %s", tp)
- }
-}
-
-func initial(list interface{}) []interface{} {
- l, err := mustInitial(list)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustInitial(list interface{}) ([]interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- if l == 0 {
- return nil, nil
- }
-
- nl := make([]interface{}, l-1)
- for i := 0; i < l-1; i++ {
- nl[i] = l2.Index(i).Interface()
- }
-
- return nl, nil
- default:
- return nil, fmt.Errorf("Cannot find initial on type %s", tp)
- }
-}
-
-func sortAlpha(list interface{}) []string {
- k := reflect.Indirect(reflect.ValueOf(list)).Kind()
- switch k {
- case reflect.Slice, reflect.Array:
- a := strslice(list)
- s := sort.StringSlice(a)
- s.Sort()
- return s
- }
- return []string{strval(list)}
-}
-
-func reverse(v interface{}) []interface{} {
- l, err := mustReverse(v)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustReverse(v interface{}) ([]interface{}, error) {
- tp := reflect.TypeOf(v).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(v)
-
- l := l2.Len()
- // We do not sort in place because the incoming array should not be altered.
- nl := make([]interface{}, l)
- for i := 0; i < l; i++ {
- nl[l-i-1] = l2.Index(i).Interface()
- }
-
- return nl, nil
- default:
- return nil, fmt.Errorf("Cannot find reverse on type %s", tp)
- }
-}
-
-func compact(list interface{}) []interface{} {
- l, err := mustCompact(list)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustCompact(list interface{}) ([]interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- nl := []interface{}{}
- var item interface{}
- for i := 0; i < l; i++ {
- item = l2.Index(i).Interface()
- if !empty(item) {
- nl = append(nl, item)
- }
- }
-
- return nl, nil
- default:
- return nil, fmt.Errorf("Cannot compact on type %s", tp)
- }
-}
-
-func uniq(list interface{}) []interface{} {
- l, err := mustUniq(list)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustUniq(list interface{}) ([]interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- dest := []interface{}{}
- var item interface{}
- for i := 0; i < l; i++ {
- item = l2.Index(i).Interface()
- if !inList(dest, item) {
- dest = append(dest, item)
- }
- }
-
- return dest, nil
- default:
- return nil, fmt.Errorf("Cannot find uniq on type %s", tp)
- }
-}
-
-func inList(haystack []interface{}, needle interface{}) bool {
- for _, h := range haystack {
- if reflect.DeepEqual(needle, h) {
- return true
- }
- }
- return false
-}
-
-func without(list interface{}, omit ...interface{}) []interface{} {
- l, err := mustWithout(list, omit...)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustWithout(list interface{}, omit ...interface{}) ([]interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- res := []interface{}{}
- var item interface{}
- for i := 0; i < l; i++ {
- item = l2.Index(i).Interface()
- if !inList(omit, item) {
- res = append(res, item)
- }
- }
-
- return res, nil
- default:
- return nil, fmt.Errorf("Cannot find without on type %s", tp)
- }
-}
-
-func has(needle interface{}, haystack interface{}) bool {
- l, err := mustHas(needle, haystack)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustHas(needle interface{}, haystack interface{}) (bool, error) {
- if haystack == nil {
- return false, nil
- }
- tp := reflect.TypeOf(haystack).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(haystack)
- var item interface{}
- l := l2.Len()
- for i := 0; i < l; i++ {
- item = l2.Index(i).Interface()
- if reflect.DeepEqual(needle, item) {
- return true, nil
- }
- }
-
- return false, nil
- default:
- return false, fmt.Errorf("Cannot find has on type %s", tp)
- }
-}
-
-// $list := [1, 2, 3, 4, 5]
-// slice $list -> list[0:5] = list[:]
-// slice $list 0 3 -> list[0:3] = list[:3]
-// slice $list 3 5 -> list[3:5]
-// slice $list 3 -> list[3:5] = list[3:]
-func slice(list interface{}, indices ...interface{}) interface{} {
- l, err := mustSlice(list, indices...)
- if err != nil {
- panic(err)
- }
-
- return l
-}
-
-func mustSlice(list interface{}, indices ...interface{}) (interface{}, error) {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
-
- l := l2.Len()
- if l == 0 {
- return nil, nil
- }
-
- var start, end int
- if len(indices) > 0 {
- start = toInt(indices[0])
- }
- if len(indices) < 2 {
- end = l
- } else {
- end = toInt(indices[1])
- }
-
- return l2.Slice(start, end).Interface(), nil
- default:
- return nil, fmt.Errorf("list should be type of slice or array but %s", tp)
- }
-}
-
-func concat(lists ...interface{}) interface{} {
- var res []interface{}
- for _, list := range lists {
- tp := reflect.TypeOf(list).Kind()
- switch tp {
- case reflect.Slice, reflect.Array:
- l2 := reflect.ValueOf(list)
- for i := 0; i < l2.Len(); i++ {
- res = append(res, l2.Index(i).Interface())
- }
- default:
- panic(fmt.Sprintf("Cannot concat type %s as list", tp))
- }
- }
- return res
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/network.go b/vendor/github.com/Masterminds/sprig/v3/network.go
deleted file mode 100644
index 108d78a946..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/network.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package sprig
-
-import (
- "math/rand"
- "net"
-)
-
-func getHostByName(name string) string {
- addrs, _ := net.LookupHost(name)
- //TODO: add error handing when release v3 comes out
- return addrs[rand.Intn(len(addrs))]
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/numeric.go b/vendor/github.com/Masterminds/sprig/v3/numeric.go
deleted file mode 100644
index f68e4182ee..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/numeric.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package sprig
-
-import (
- "fmt"
- "math"
- "strconv"
- "strings"
-
- "github.com/spf13/cast"
- "github.com/shopspring/decimal"
-)
-
-// toFloat64 converts 64-bit floats
-func toFloat64(v interface{}) float64 {
- return cast.ToFloat64(v)
-}
-
-func toInt(v interface{}) int {
- return cast.ToInt(v)
-}
-
-// toInt64 converts integer types to 64-bit integers
-func toInt64(v interface{}) int64 {
- return cast.ToInt64(v)
-}
-
-func max(a interface{}, i ...interface{}) int64 {
- aa := toInt64(a)
- for _, b := range i {
- bb := toInt64(b)
- if bb > aa {
- aa = bb
- }
- }
- return aa
-}
-
-func maxf(a interface{}, i ...interface{}) float64 {
- aa := toFloat64(a)
- for _, b := range i {
- bb := toFloat64(b)
- aa = math.Max(aa, bb)
- }
- return aa
-}
-
-func min(a interface{}, i ...interface{}) int64 {
- aa := toInt64(a)
- for _, b := range i {
- bb := toInt64(b)
- if bb < aa {
- aa = bb
- }
- }
- return aa
-}
-
-func minf(a interface{}, i ...interface{}) float64 {
- aa := toFloat64(a)
- for _, b := range i {
- bb := toFloat64(b)
- aa = math.Min(aa, bb)
- }
- return aa
-}
-
-func until(count int) []int {
- step := 1
- if count < 0 {
- step = -1
- }
- return untilStep(0, count, step)
-}
-
-func untilStep(start, stop, step int) []int {
- v := []int{}
-
- if stop < start {
- if step >= 0 {
- return v
- }
- for i := start; i > stop; i += step {
- v = append(v, i)
- }
- return v
- }
-
- if step <= 0 {
- return v
- }
- for i := start; i < stop; i += step {
- v = append(v, i)
- }
- return v
-}
-
-func floor(a interface{}) float64 {
- aa := toFloat64(a)
- return math.Floor(aa)
-}
-
-func ceil(a interface{}) float64 {
- aa := toFloat64(a)
- return math.Ceil(aa)
-}
-
-func round(a interface{}, p int, rOpt ...float64) float64 {
- roundOn := .5
- if len(rOpt) > 0 {
- roundOn = rOpt[0]
- }
- val := toFloat64(a)
- places := toFloat64(p)
-
- var round float64
- pow := math.Pow(10, places)
- digit := pow * val
- _, div := math.Modf(digit)
- if div >= roundOn {
- round = math.Ceil(digit)
- } else {
- round = math.Floor(digit)
- }
- return round / pow
-}
-
-// converts unix octal to decimal
-func toDecimal(v interface{}) int64 {
- result, err := strconv.ParseInt(fmt.Sprint(v), 8, 64)
- if err != nil {
- return 0
- }
- return result
-}
-
-func seq(params ...int) string {
- increment := 1
- switch len(params) {
- case 0:
- return ""
- case 1:
- start := 1
- end := params[0]
- if end < start {
- increment = -1
- }
- return intArrayToString(untilStep(start, end+increment, increment), " ")
- case 3:
- start := params[0]
- end := params[2]
- step := params[1]
- if end < start {
- increment = -1
- if step > 0 {
- return ""
- }
- }
- return intArrayToString(untilStep(start, end+increment, step), " ")
- case 2:
- start := params[0]
- end := params[1]
- step := 1
- if end < start {
- step = -1
- }
- return intArrayToString(untilStep(start, end+step, step), " ")
- default:
- return ""
- }
-}
-
-func intArrayToString(slice []int, delimeter string) string {
- return strings.Trim(strings.Join(strings.Fields(fmt.Sprint(slice)), delimeter), "[]")
-}
-
-// performs a float and subsequent decimal.Decimal conversion on inputs,
-// and iterates through a and b executing the mathmetical operation f
-func execDecimalOp(a interface{}, b []interface{}, f func(d1, d2 decimal.Decimal) decimal.Decimal) float64 {
- prt := decimal.NewFromFloat(toFloat64(a))
- for _, x := range b {
- dx := decimal.NewFromFloat(toFloat64(x))
- prt = f(prt, dx)
- }
- rslt, _ := prt.Float64()
- return rslt
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/reflect.go b/vendor/github.com/Masterminds/sprig/v3/reflect.go
deleted file mode 100644
index 8a65c132f0..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/reflect.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package sprig
-
-import (
- "fmt"
- "reflect"
-)
-
-// typeIs returns true if the src is the type named in target.
-func typeIs(target string, src interface{}) bool {
- return target == typeOf(src)
-}
-
-func typeIsLike(target string, src interface{}) bool {
- t := typeOf(src)
- return target == t || "*"+target == t
-}
-
-func typeOf(src interface{}) string {
- return fmt.Sprintf("%T", src)
-}
-
-func kindIs(target string, src interface{}) bool {
- return target == kindOf(src)
-}
-
-func kindOf(src interface{}) string {
- return reflect.ValueOf(src).Kind().String()
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/regex.go b/vendor/github.com/Masterminds/sprig/v3/regex.go
deleted file mode 100644
index fab5510189..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/regex.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package sprig
-
-import (
- "regexp"
-)
-
-func regexMatch(regex string, s string) bool {
- match, _ := regexp.MatchString(regex, s)
- return match
-}
-
-func mustRegexMatch(regex string, s string) (bool, error) {
- return regexp.MatchString(regex, s)
-}
-
-func regexFindAll(regex string, s string, n int) []string {
- r := regexp.MustCompile(regex)
- return r.FindAllString(s, n)
-}
-
-func mustRegexFindAll(regex string, s string, n int) ([]string, error) {
- r, err := regexp.Compile(regex)
- if err != nil {
- return []string{}, err
- }
- return r.FindAllString(s, n), nil
-}
-
-func regexFind(regex string, s string) string {
- r := regexp.MustCompile(regex)
- return r.FindString(s)
-}
-
-func mustRegexFind(regex string, s string) (string, error) {
- r, err := regexp.Compile(regex)
- if err != nil {
- return "", err
- }
- return r.FindString(s), nil
-}
-
-func regexReplaceAll(regex string, s string, repl string) string {
- r := regexp.MustCompile(regex)
- return r.ReplaceAllString(s, repl)
-}
-
-func mustRegexReplaceAll(regex string, s string, repl string) (string, error) {
- r, err := regexp.Compile(regex)
- if err != nil {
- return "", err
- }
- return r.ReplaceAllString(s, repl), nil
-}
-
-func regexReplaceAllLiteral(regex string, s string, repl string) string {
- r := regexp.MustCompile(regex)
- return r.ReplaceAllLiteralString(s, repl)
-}
-
-func mustRegexReplaceAllLiteral(regex string, s string, repl string) (string, error) {
- r, err := regexp.Compile(regex)
- if err != nil {
- return "", err
- }
- return r.ReplaceAllLiteralString(s, repl), nil
-}
-
-func regexSplit(regex string, s string, n int) []string {
- r := regexp.MustCompile(regex)
- return r.Split(s, n)
-}
-
-func mustRegexSplit(regex string, s string, n int) ([]string, error) {
- r, err := regexp.Compile(regex)
- if err != nil {
- return []string{}, err
- }
- return r.Split(s, n), nil
-}
-
-func regexQuoteMeta(s string) string {
- return regexp.QuoteMeta(s)
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/semver.go b/vendor/github.com/Masterminds/sprig/v3/semver.go
deleted file mode 100644
index 3fbe08aa63..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/semver.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package sprig
-
-import (
- sv2 "github.com/Masterminds/semver/v3"
-)
-
-func semverCompare(constraint, version string) (bool, error) {
- c, err := sv2.NewConstraint(constraint)
- if err != nil {
- return false, err
- }
-
- v, err := sv2.NewVersion(version)
- if err != nil {
- return false, err
- }
-
- return c.Check(v), nil
-}
-
-func semver(version string) (*sv2.Version, error) {
- return sv2.NewVersion(version)
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/strings.go b/vendor/github.com/Masterminds/sprig/v3/strings.go
deleted file mode 100644
index e0ae628c84..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/strings.go
+++ /dev/null
@@ -1,236 +0,0 @@
-package sprig
-
-import (
- "encoding/base32"
- "encoding/base64"
- "fmt"
- "reflect"
- "strconv"
- "strings"
-
- util "github.com/Masterminds/goutils"
-)
-
-func base64encode(v string) string {
- return base64.StdEncoding.EncodeToString([]byte(v))
-}
-
-func base64decode(v string) string {
- data, err := base64.StdEncoding.DecodeString(v)
- if err != nil {
- return err.Error()
- }
- return string(data)
-}
-
-func base32encode(v string) string {
- return base32.StdEncoding.EncodeToString([]byte(v))
-}
-
-func base32decode(v string) string {
- data, err := base32.StdEncoding.DecodeString(v)
- if err != nil {
- return err.Error()
- }
- return string(data)
-}
-
-func abbrev(width int, s string) string {
- if width < 4 {
- return s
- }
- r, _ := util.Abbreviate(s, width)
- return r
-}
-
-func abbrevboth(left, right int, s string) string {
- if right < 4 || left > 0 && right < 7 {
- return s
- }
- r, _ := util.AbbreviateFull(s, left, right)
- return r
-}
-func initials(s string) string {
- // Wrap this just to eliminate the var args, which templates don't do well.
- return util.Initials(s)
-}
-
-func randAlphaNumeric(count int) string {
- // It is not possible, it appears, to actually generate an error here.
- r, _ := util.CryptoRandomAlphaNumeric(count)
- return r
-}
-
-func randAlpha(count int) string {
- r, _ := util.CryptoRandomAlphabetic(count)
- return r
-}
-
-func randAscii(count int) string {
- r, _ := util.CryptoRandomAscii(count)
- return r
-}
-
-func randNumeric(count int) string {
- r, _ := util.CryptoRandomNumeric(count)
- return r
-}
-
-func untitle(str string) string {
- return util.Uncapitalize(str)
-}
-
-func quote(str ...interface{}) string {
- out := make([]string, 0, len(str))
- for _, s := range str {
- if s != nil {
- out = append(out, fmt.Sprintf("%q", strval(s)))
- }
- }
- return strings.Join(out, " ")
-}
-
-func squote(str ...interface{}) string {
- out := make([]string, 0, len(str))
- for _, s := range str {
- if s != nil {
- out = append(out, fmt.Sprintf("'%v'", s))
- }
- }
- return strings.Join(out, " ")
-}
-
-func cat(v ...interface{}) string {
- v = removeNilElements(v)
- r := strings.TrimSpace(strings.Repeat("%v ", len(v)))
- return fmt.Sprintf(r, v...)
-}
-
-func indent(spaces int, v string) string {
- pad := strings.Repeat(" ", spaces)
- return pad + strings.Replace(v, "\n", "\n"+pad, -1)
-}
-
-func nindent(spaces int, v string) string {
- return "\n" + indent(spaces, v)
-}
-
-func replace(old, new, src string) string {
- return strings.Replace(src, old, new, -1)
-}
-
-func plural(one, many string, count int) string {
- if count == 1 {
- return one
- }
- return many
-}
-
-func strslice(v interface{}) []string {
- switch v := v.(type) {
- case []string:
- return v
- case []interface{}:
- b := make([]string, 0, len(v))
- for _, s := range v {
- if s != nil {
- b = append(b, strval(s))
- }
- }
- return b
- default:
- val := reflect.ValueOf(v)
- switch val.Kind() {
- case reflect.Array, reflect.Slice:
- l := val.Len()
- b := make([]string, 0, l)
- for i := 0; i < l; i++ {
- value := val.Index(i).Interface()
- if value != nil {
- b = append(b, strval(value))
- }
- }
- return b
- default:
- if v == nil {
- return []string{}
- }
-
- return []string{strval(v)}
- }
- }
-}
-
-func removeNilElements(v []interface{}) []interface{} {
- newSlice := make([]interface{}, 0, len(v))
- for _, i := range v {
- if i != nil {
- newSlice = append(newSlice, i)
- }
- }
- return newSlice
-}
-
-func strval(v interface{}) string {
- switch v := v.(type) {
- case string:
- return v
- case []byte:
- return string(v)
- case error:
- return v.Error()
- case fmt.Stringer:
- return v.String()
- default:
- return fmt.Sprintf("%v", v)
- }
-}
-
-func trunc(c int, s string) string {
- if c < 0 && len(s)+c > 0 {
- return s[len(s)+c:]
- }
- if c >= 0 && len(s) > c {
- return s[:c]
- }
- return s
-}
-
-func join(sep string, v interface{}) string {
- return strings.Join(strslice(v), sep)
-}
-
-func split(sep, orig string) map[string]string {
- parts := strings.Split(orig, sep)
- res := make(map[string]string, len(parts))
- for i, v := range parts {
- res["_"+strconv.Itoa(i)] = v
- }
- return res
-}
-
-func splitn(sep string, n int, orig string) map[string]string {
- parts := strings.SplitN(orig, sep, n)
- res := make(map[string]string, len(parts))
- for i, v := range parts {
- res["_"+strconv.Itoa(i)] = v
- }
- return res
-}
-
-// substring creates a substring of the given string.
-//
-// If start is < 0, this calls string[:end].
-//
-// If start is >= 0 and end < 0 or end bigger than s length, this calls string[start:]
-//
-// Otherwise, this calls string[start, end].
-func substring(start, end int, s string) string {
- if start < 0 {
- return s[:end]
- }
- if end < 0 || end > len(s) {
- return s[start:]
- }
- return s[start:end]
-}
diff --git a/vendor/github.com/Masterminds/sprig/v3/url.go b/vendor/github.com/Masterminds/sprig/v3/url.go
deleted file mode 100644
index b8e120e19b..0000000000
--- a/vendor/github.com/Masterminds/sprig/v3/url.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package sprig
-
-import (
- "fmt"
- "net/url"
- "reflect"
-)
-
-func dictGetOrEmpty(dict map[string]interface{}, key string) string {
- value, ok := dict[key]
- if !ok {
- return ""
- }
- tp := reflect.TypeOf(value).Kind()
- if tp != reflect.String {
- panic(fmt.Sprintf("unable to parse %s key, must be of type string, but %s found", key, tp.String()))
- }
- return reflect.ValueOf(value).String()
-}
-
-// parses given URL to return dict object
-func urlParse(v string) map[string]interface{} {
- dict := map[string]interface{}{}
- parsedURL, err := url.Parse(v)
- if err != nil {
- panic(fmt.Sprintf("unable to parse url: %s", err))
- }
- dict["scheme"] = parsedURL.Scheme
- dict["host"] = parsedURL.Host
- dict["hostname"] = parsedURL.Hostname()
- dict["path"] = parsedURL.Path
- dict["query"] = parsedURL.RawQuery
- dict["opaque"] = parsedURL.Opaque
- dict["fragment"] = parsedURL.Fragment
- if parsedURL.User != nil {
- dict["userinfo"] = parsedURL.User.String()
- } else {
- dict["userinfo"] = ""
- }
-
- return dict
-}
-
-// join given dict to URL string
-func urlJoin(d map[string]interface{}) string {
- resURL := url.URL{
- Scheme: dictGetOrEmpty(d, "scheme"),
- Host: dictGetOrEmpty(d, "host"),
- Path: dictGetOrEmpty(d, "path"),
- RawQuery: dictGetOrEmpty(d, "query"),
- Opaque: dictGetOrEmpty(d, "opaque"),
- Fragment: dictGetOrEmpty(d, "fragment"),
- }
- userinfo := dictGetOrEmpty(d, "userinfo")
- var user *url.Userinfo
- if userinfo != "" {
- tempURL, err := url.Parse(fmt.Sprintf("proto://%s@host", userinfo))
- if err != nil {
- panic(fmt.Sprintf("unable to parse userinfo in dict: %s", err))
- }
- user = tempURL.User
- }
-
- resURL.User = user
- return resURL.String()
-}
diff --git a/vendor/github.com/huandu/xstrings/.gitignore b/vendor/github.com/huandu/xstrings/.gitignore
deleted file mode 100644
index daf913b1b3..0000000000
--- a/vendor/github.com/huandu/xstrings/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/vendor/github.com/huandu/xstrings/CONTRIBUTING.md b/vendor/github.com/huandu/xstrings/CONTRIBUTING.md
deleted file mode 100644
index d7b4b8d584..0000000000
--- a/vendor/github.com/huandu/xstrings/CONTRIBUTING.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributing #
-
-Thanks for your contribution in advance. No matter what you will contribute to this project, pull request or bug report or feature discussion, it's always highly appreciated.
-
-## New API or feature ##
-
-I want to speak more about how to add new functions to this package.
-
-Package `xstring` is a collection of useful string functions which should be implemented in Go. It's a bit subject to say which function should be included and which should not. I set up following rules in order to make it clear and as objective as possible.
-
-* Rule 1: Only string algorithm, which takes string as input, can be included.
-* Rule 2: If a function has been implemented in package `string`, it must not be included.
-* Rule 3: If a function is not language neutral, it must not be included.
-* Rule 4: If a function is a part of standard library in other languages, it can be included.
-* Rule 5: If a function is quite useful in some famous framework or library, it can be included.
-
-New function must be discussed in project issues before submitting any code. If a pull request with new functions is sent without any ref issue, it will be rejected.
-
-## Pull request ##
-
-Pull request is always welcome. Just make sure you have run `go fmt` and all test cases passed before submit.
-
-If the pull request is to add a new API or feature, don't forget to update README.md and add new API in function list.
diff --git a/vendor/github.com/huandu/xstrings/LICENSE b/vendor/github.com/huandu/xstrings/LICENSE
deleted file mode 100644
index 2701772593..0000000000
--- a/vendor/github.com/huandu/xstrings/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Huan Du
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/vendor/github.com/huandu/xstrings/README.md b/vendor/github.com/huandu/xstrings/README.md
deleted file mode 100644
index e809c79abc..0000000000
--- a/vendor/github.com/huandu/xstrings/README.md
+++ /dev/null
@@ -1,118 +0,0 @@
-# xstrings
-
-[](https://github.com/huandu/xstrings/actions)
-[](https://pkg.go.dev/github.com/huandu/xstrings)
-[](https://goreportcard.com/report/github.com/huandu/xstrings)
-[](https://coveralls.io/github/huandu/xstrings?branch=master)
-
-Go package [xstrings](https://godoc.org/github.com/huandu/xstrings) is a collection of string functions, which are widely used in other languages but absent in Go package [strings](http://golang.org/pkg/strings).
-
-All functions are well tested and carefully tuned for performance.
-
-## Propose a new function
-
-Please review [contributing guideline](CONTRIBUTING.md) and [create new issue](https://github.com/huandu/xstrings/issues) to state why it should be included.
-
-## Install
-
-Use `go get` to install this library.
-
- go get github.com/huandu/xstrings
-
-## API document
-
-See [GoDoc](https://godoc.org/github.com/huandu/xstrings) for full document.
-
-## Function list
-
-Go functions have a unique naming style. One, who has experience in other language but new in Go, may have difficulties to find out right string function to use.
-
-Here is a list of functions in [strings](http://golang.org/pkg/strings) and [xstrings](https://godoc.org/github.com/huandu/xstrings) with enough extra information about how to map these functions to their friends in other languages. Hope this list could be helpful for fresh gophers.
-
-### Package `xstrings` functions
-
-_Keep this table sorted by Function in ascending order._
-
-| Function | Friends | # |
-| --------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- | --------------------------------------------------- |
-| [Center](https://godoc.org/github.com/huandu/xstrings#Center) | `str.center` in Python; `String#center` in Ruby | [#30](https://github.com/huandu/xstrings/issues/30) |
-| [Count](https://godoc.org/github.com/huandu/xstrings#Count) | `String#count` in Ruby | [#16](https://github.com/huandu/xstrings/issues/16) |
-| [Delete](https://godoc.org/github.com/huandu/xstrings#Delete) | `String#delete` in Ruby | [#17](https://github.com/huandu/xstrings/issues/17) |
-| [ExpandTabs](https://godoc.org/github.com/huandu/xstrings#ExpandTabs) | `str.expandtabs` in Python | [#27](https://github.com/huandu/xstrings/issues/27) |
-| [FirstRuneToLower](https://godoc.org/github.com/huandu/xstrings#FirstRuneToLower) | `lcfirst` in PHP or Perl | [#15](https://github.com/huandu/xstrings/issues/15) |
-| [FirstRuneToUpper](https://godoc.org/github.com/huandu/xstrings#FirstRuneToUpper) | `String#capitalize` in Ruby; `ucfirst` in PHP or Perl | [#15](https://github.com/huandu/xstrings/issues/15) |
-| [Insert](https://godoc.org/github.com/huandu/xstrings#Insert) | `String#insert` in Ruby | [#18](https://github.com/huandu/xstrings/issues/18) |
-| [LastPartition](https://godoc.org/github.com/huandu/xstrings#LastPartition) | `str.rpartition` in Python; `String#rpartition` in Ruby | [#19](https://github.com/huandu/xstrings/issues/19) |
-| [LeftJustify](https://godoc.org/github.com/huandu/xstrings#LeftJustify) | `str.ljust` in Python; `String#ljust` in Ruby | [#28](https://github.com/huandu/xstrings/issues/28) |
-| [Len](https://godoc.org/github.com/huandu/xstrings#Len) | `mb_strlen` in PHP | [#23](https://github.com/huandu/xstrings/issues/23) |
-| [Partition](https://godoc.org/github.com/huandu/xstrings#Partition) | `str.partition` in Python; `String#partition` in Ruby | [#10](https://github.com/huandu/xstrings/issues/10) |
-| [Reverse](https://godoc.org/github.com/huandu/xstrings#Reverse) | `String#reverse` in Ruby; `strrev` in PHP; `reverse` in Perl | [#7](https://github.com/huandu/xstrings/issues/7) |
-| [RightJustify](https://godoc.org/github.com/huandu/xstrings#RightJustify) | `str.rjust` in Python; `String#rjust` in Ruby | [#29](https://github.com/huandu/xstrings/issues/29) |
-| [RuneWidth](https://godoc.org/github.com/huandu/xstrings#RuneWidth) | - | [#27](https://github.com/huandu/xstrings/issues/27) |
-| [Scrub](https://godoc.org/github.com/huandu/xstrings#Scrub) | `String#scrub` in Ruby | [#20](https://github.com/huandu/xstrings/issues/20) |
-| [Shuffle](https://godoc.org/github.com/huandu/xstrings#Shuffle) | `str_shuffle` in PHP | [#13](https://github.com/huandu/xstrings/issues/13) |
-| [ShuffleSource](https://godoc.org/github.com/huandu/xstrings#ShuffleSource) | `str_shuffle` in PHP | [#13](https://github.com/huandu/xstrings/issues/13) |
-| [Slice](https://godoc.org/github.com/huandu/xstrings#Slice) | `mb_substr` in PHP | [#9](https://github.com/huandu/xstrings/issues/9) |
-| [Squeeze](https://godoc.org/github.com/huandu/xstrings#Squeeze) | `String#squeeze` in Ruby | [#11](https://github.com/huandu/xstrings/issues/11) |
-| [Successor](https://godoc.org/github.com/huandu/xstrings#Successor) | `String#succ` or `String#next` in Ruby | [#22](https://github.com/huandu/xstrings/issues/22) |
-| [SwapCase](https://godoc.org/github.com/huandu/xstrings#SwapCase) | `str.swapcase` in Python; `String#swapcase` in Ruby | [#12](https://github.com/huandu/xstrings/issues/12) |
-| [ToCamelCase](https://godoc.org/github.com/huandu/xstrings#ToCamelCase) | `String#camelize` in RoR | [#1](https://github.com/huandu/xstrings/issues/1) |
-| [ToKebab](https://godoc.org/github.com/huandu/xstrings#ToKebabCase) | - | [#41](https://github.com/huandu/xstrings/issues/41) |
-| [ToPascalCase](https://godoc.org/github.com/huandu/xstrings#ToPascalCase) | - | [#1](https://github.com/huandu/xstrings/issues/1) |
-| [ToSnakeCase](https://godoc.org/github.com/huandu/xstrings#ToSnakeCase) | `String#underscore` in RoR | [#1](https://github.com/huandu/xstrings/issues/1) |
-| [Translate](https://godoc.org/github.com/huandu/xstrings#Translate) | `str.translate` in Python; `String#tr` in Ruby; `strtr` in PHP; `tr///` in Perl | [#21](https://github.com/huandu/xstrings/issues/21) |
-| [Width](https://godoc.org/github.com/huandu/xstrings#Width) | `mb_strwidth` in PHP | [#26](https://github.com/huandu/xstrings/issues/26) |
-| [WordCount](https://godoc.org/github.com/huandu/xstrings#WordCount) | `str_word_count` in PHP | [#14](https://github.com/huandu/xstrings/issues/14) |
-| [WordSplit](https://godoc.org/github.com/huandu/xstrings#WordSplit) | - | [#14](https://github.com/huandu/xstrings/issues/14) |
-
-### Package `strings` functions
-
-_Keep this table sorted by Function in ascending order._
-
-| Function | Friends |
-| --------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
-| [Contains](http://golang.org/pkg/strings/#Contains) | `String#include?` in Ruby |
-| [ContainsAny](http://golang.org/pkg/strings/#ContainsAny) | - |
-| [ContainsRune](http://golang.org/pkg/strings/#ContainsRune) | - |
-| [Count](http://golang.org/pkg/strings/#Count) | `str.count` in Python; `substr_count` in PHP |
-| [EqualFold](http://golang.org/pkg/strings/#EqualFold) | `stricmp` in PHP; `String#casecmp` in Ruby |
-| [Fields](http://golang.org/pkg/strings/#Fields) | `str.split` in Python; `split` in Perl; `String#split` in Ruby |
-| [FieldsFunc](http://golang.org/pkg/strings/#FieldsFunc) | - |
-| [HasPrefix](http://golang.org/pkg/strings/#HasPrefix) | `str.startswith` in Python; `String#start_with?` in Ruby |
-| [HasSuffix](http://golang.org/pkg/strings/#HasSuffix) | `str.endswith` in Python; `String#end_with?` in Ruby |
-| [Index](http://golang.org/pkg/strings/#Index) | `str.index` in Python; `String#index` in Ruby; `strpos` in PHP; `index` in Perl |
-| [IndexAny](http://golang.org/pkg/strings/#IndexAny) | - |
-| [IndexByte](http://golang.org/pkg/strings/#IndexByte) | - |
-| [IndexFunc](http://golang.org/pkg/strings/#IndexFunc) | - |
-| [IndexRune](http://golang.org/pkg/strings/#IndexRune) | - |
-| [Join](http://golang.org/pkg/strings/#Join) | `str.join` in Python; `Array#join` in Ruby; `implode` in PHP; `join` in Perl |
-| [LastIndex](http://golang.org/pkg/strings/#LastIndex) | `str.rindex` in Python; `String#rindex`; `strrpos` in PHP; `rindex` in Perl |
-| [LastIndexAny](http://golang.org/pkg/strings/#LastIndexAny) | - |
-| [LastIndexFunc](http://golang.org/pkg/strings/#LastIndexFunc) | - |
-| [Map](http://golang.org/pkg/strings/#Map) | `String#each_codepoint` in Ruby |
-| [Repeat](http://golang.org/pkg/strings/#Repeat) | operator `*` in Python and Ruby; `str_repeat` in PHP |
-| [Replace](http://golang.org/pkg/strings/#Replace) | `str.replace` in Python; `String#sub` in Ruby; `str_replace` in PHP |
-| [Split](http://golang.org/pkg/strings/#Split) | `str.split` in Python; `String#split` in Ruby; `explode` in PHP; `split` in Perl |
-| [SplitAfter](http://golang.org/pkg/strings/#SplitAfter) | - |
-| [SplitAfterN](http://golang.org/pkg/strings/#SplitAfterN) | - |
-| [SplitN](http://golang.org/pkg/strings/#SplitN) | `str.split` in Python; `String#split` in Ruby; `explode` in PHP; `split` in Perl |
-| [Title](http://golang.org/pkg/strings/#Title) | `str.title` in Python |
-| [ToLower](http://golang.org/pkg/strings/#ToLower) | `str.lower` in Python; `String#downcase` in Ruby; `strtolower` in PHP; `lc` in Perl |
-| [ToLowerSpecial](http://golang.org/pkg/strings/#ToLowerSpecial) | - |
-| [ToTitle](http://golang.org/pkg/strings/#ToTitle) | - |
-| [ToTitleSpecial](http://golang.org/pkg/strings/#ToTitleSpecial) | - |
-| [ToUpper](http://golang.org/pkg/strings/#ToUpper) | `str.upper` in Python; `String#upcase` in Ruby; `strtoupper` in PHP; `uc` in Perl |
-| [ToUpperSpecial](http://golang.org/pkg/strings/#ToUpperSpecial) | - |
-| [Trim](http://golang.org/pkg/strings/#Trim) | `str.strip` in Python; `String#strip` in Ruby; `trim` in PHP |
-| [TrimFunc](http://golang.org/pkg/strings/#TrimFunc) | - |
-| [TrimLeft](http://golang.org/pkg/strings/#TrimLeft) | `str.lstrip` in Python; `String#lstrip` in Ruby; `ltrim` in PHP |
-| [TrimLeftFunc](http://golang.org/pkg/strings/#TrimLeftFunc) | - |
-| [TrimPrefix](http://golang.org/pkg/strings/#TrimPrefix) | - |
-| [TrimRight](http://golang.org/pkg/strings/#TrimRight) | `str.rstrip` in Python; `String#rstrip` in Ruby; `rtrim` in PHP |
-| [TrimRightFunc](http://golang.org/pkg/strings/#TrimRightFunc) | - |
-| [TrimSpace](http://golang.org/pkg/strings/#TrimSpace) | `str.strip` in Python; `String#strip` in Ruby; `trim` in PHP |
-| [TrimSuffix](http://golang.org/pkg/strings/#TrimSuffix) | `String#chomp` in Ruby; `chomp` in Perl |
-
-## License
-
-This library is licensed under MIT license. See LICENSE for details.
diff --git a/vendor/github.com/huandu/xstrings/common.go b/vendor/github.com/huandu/xstrings/common.go
deleted file mode 100644
index f427cc84e2..0000000000
--- a/vendor/github.com/huandu/xstrings/common.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 Huan Du. All rights reserved.
-// Licensed under the MIT license that can be found in the LICENSE file.
-
-package xstrings
-
-const bufferMaxInitGrowSize = 2048
-
-// Lazy initialize a buffer.
-func allocBuffer(orig, cur string) *stringBuilder {
- output := &stringBuilder{}
- maxSize := len(orig) * 4
-
- // Avoid to reserve too much memory at once.
- if maxSize > bufferMaxInitGrowSize {
- maxSize = bufferMaxInitGrowSize
- }
-
- output.Grow(maxSize)
- output.WriteString(orig[:len(orig)-len(cur)])
- return output
-}
diff --git a/vendor/github.com/huandu/xstrings/convert.go b/vendor/github.com/huandu/xstrings/convert.go
deleted file mode 100644
index 5d8cfee470..0000000000
--- a/vendor/github.com/huandu/xstrings/convert.go
+++ /dev/null
@@ -1,633 +0,0 @@
-// Copyright 2015 Huan Du. All rights reserved.
-// Licensed under the MIT license that can be found in the LICENSE file.
-
-package xstrings
-
-import (
- "math/rand"
- "unicode"
- "unicode/utf8"
-)
-
-// ToCamelCase is to convert words separated by space, underscore and hyphen to camel case.
-//
-// Some samples.
-//
-// "some_words" => "someWords"
-// "http_server" => "httpServer"
-// "no_https" => "noHttps"
-// "_complex__case_" => "_complex_Case_"
-// "some words" => "someWords"
-// "GOLANG_IS_GREAT" => "golangIsGreat"
-func ToCamelCase(str string) string {
- return toCamelCase(str, false)
-}
-
-// ToPascalCase is to convert words separated by space, underscore and hyphen to pascal case.
-//
-// Some samples.
-//
-// "some_words" => "SomeWords"
-// "http_server" => "HttpServer"
-// "no_https" => "NoHttps"
-// "_complex__case_" => "_Complex_Case_"
-// "some words" => "SomeWords"
-// "GOLANG_IS_GREAT" => "GolangIsGreat"
-func ToPascalCase(str string) string {
- return toCamelCase(str, true)
-}
-
-func toCamelCase(str string, isBig bool) string {
- if len(str) == 0 {
- return ""
- }
-
- buf := &stringBuilder{}
- var isFirstRuneUpper bool
- var r0, r1 rune
- var size int
-
- // leading connector will appear in output.
- for len(str) > 0 {
- r0, size = utf8.DecodeRuneInString(str)
- str = str[size:]
-
- if !isConnector(r0) {
- isFirstRuneUpper = unicode.IsUpper(r0)
-
- if isBig {
- r0 = unicode.ToUpper(r0)
- } else {
- r0 = unicode.ToLower(r0)
- }
-
- break
- }
-
- buf.WriteRune(r0)
- }
-
- if len(str) == 0 {
- // A special case for a string contains only 1 rune.
- if size != 0 {
- buf.WriteRune(r0)
- }
-
- return buf.String()
- }
-
- for len(str) > 0 {
- r1 = r0
- r0, size = utf8.DecodeRuneInString(str)
- str = str[size:]
-
- if isConnector(r0) && isConnector(r1) {
- buf.WriteRune(r1)
- continue
- }
-
- if isConnector(r1) {
- isFirstRuneUpper = unicode.IsUpper(r0)
- r0 = unicode.ToUpper(r0)
- } else {
- if isFirstRuneUpper {
- if unicode.IsUpper(r0) {
- r0 = unicode.ToLower(r0)
- } else {
- isFirstRuneUpper = false
- }
- }
-
- buf.WriteRune(r1)
- }
- }
-
- if isFirstRuneUpper && !isBig {
- r0 = unicode.ToLower(r0)
- }
-
- buf.WriteRune(r0)
- return buf.String()
-}
-
-// ToSnakeCase can convert all upper case characters in a string to
-// snake case format.
-//
-// Some samples.
-//
-// "FirstName" => "first_name"
-// "HTTPServer" => "http_server"
-// "NoHTTPS" => "no_https"
-// "GO_PATH" => "go_path"
-// "GO PATH" => "go_path" // space is converted to underscore.
-// "GO-PATH" => "go_path" // hyphen is converted to underscore.
-// "http2xx" => "http_2xx" // insert an underscore before a number and after an alphabet.
-// "HTTP20xOK" => "http_20x_ok"
-// "Duration2m3s" => "duration_2m3s"
-// "Bld4Floor3rd" => "bld4_floor_3rd"
-func ToSnakeCase(str string) string {
- return camelCaseToLowerCase(str, '_')
-}
-
-// ToKebabCase can convert all upper case characters in a string to
-// kebab case format.
-//
-// Some samples.
-//
-// "FirstName" => "first-name"
-// "HTTPServer" => "http-server"
-// "NoHTTPS" => "no-https"
-// "GO_PATH" => "go-path"
-// "GO PATH" => "go-path" // space is converted to '-'.
-// "GO-PATH" => "go-path" // hyphen is converted to '-'.
-// "http2xx" => "http-2xx" // insert an underscore before a number and after an alphabet.
-// "HTTP20xOK" => "http-20x-ok"
-// "Duration2m3s" => "duration-2m3s"
-// "Bld4Floor3rd" => "bld4-floor-3rd"
-func ToKebabCase(str string) string {
- return camelCaseToLowerCase(str, '-')
-}
-
-func camelCaseToLowerCase(str string, connector rune) string {
- if len(str) == 0 {
- return ""
- }
-
- buf := &stringBuilder{}
- wt, word, remaining := nextWord(str)
-
- for len(remaining) > 0 {
- if wt != connectorWord {
- toLower(buf, wt, word, connector)
- }
-
- prev := wt
- last := word
- wt, word, remaining = nextWord(remaining)
-
- switch prev {
- case numberWord:
- for wt == alphabetWord || wt == numberWord {
- toLower(buf, wt, word, connector)
- wt, word, remaining = nextWord(remaining)
- }
-
- if wt != invalidWord && wt != punctWord && wt != connectorWord {
- buf.WriteRune(connector)
- }
-
- case connectorWord:
- toLower(buf, prev, last, connector)
-
- case punctWord:
- // nothing.
-
- default:
- if wt != numberWord {
- if wt != connectorWord && wt != punctWord {
- buf.WriteRune(connector)
- }
-
- break
- }
-
- if len(remaining) == 0 {
- break
- }
-
- last := word
- wt, word, remaining = nextWord(remaining)
-
- // consider number as a part of previous word.
- // e.g. "Bld4Floor" => "bld4_floor"
- if wt != alphabetWord {
- toLower(buf, numberWord, last, connector)
-
- if wt != connectorWord && wt != punctWord {
- buf.WriteRune(connector)
- }
-
- break
- }
-
- // if there are some lower case letters following a number,
- // add connector before the number.
- // e.g. "HTTP2xx" => "http_2xx"
- buf.WriteRune(connector)
- toLower(buf, numberWord, last, connector)
-
- for wt == alphabetWord || wt == numberWord {
- toLower(buf, wt, word, connector)
- wt, word, remaining = nextWord(remaining)
- }
-
- if wt != invalidWord && wt != connectorWord && wt != punctWord {
- buf.WriteRune(connector)
- }
- }
- }
-
- toLower(buf, wt, word, connector)
- return buf.String()
-}
-
-func isConnector(r rune) bool {
- return r == '-' || r == '_' || unicode.IsSpace(r)
-}
-
-type wordType int
-
-const (
- invalidWord wordType = iota
- numberWord
- upperCaseWord
- alphabetWord
- connectorWord
- punctWord
- otherWord
-)
-
-func nextWord(str string) (wt wordType, word, remaining string) {
- if len(str) == 0 {
- return
- }
-
- var offset int
- remaining = str
- r, size := nextValidRune(remaining, utf8.RuneError)
- offset += size
-
- if r == utf8.RuneError {
- wt = invalidWord
- word = str[:offset]
- remaining = str[offset:]
- return
- }
-
- switch {
- case isConnector(r):
- wt = connectorWord
- remaining = remaining[size:]
-
- for len(remaining) > 0 {
- r, size = nextValidRune(remaining, r)
-
- if !isConnector(r) {
- break
- }
-
- offset += size
- remaining = remaining[size:]
- }
-
- case unicode.IsPunct(r):
- wt = punctWord
- remaining = remaining[size:]
-
- for len(remaining) > 0 {
- r, size = nextValidRune(remaining, r)
-
- if !unicode.IsPunct(r) {
- break
- }
-
- offset += size
- remaining = remaining[size:]
- }
-
- case unicode.IsUpper(r):
- wt = upperCaseWord
- remaining = remaining[size:]
-
- if len(remaining) == 0 {
- break
- }
-
- r, size = nextValidRune(remaining, r)
-
- switch {
- case unicode.IsUpper(r):
- prevSize := size
- offset += size
- remaining = remaining[size:]
-
- for len(remaining) > 0 {
- r, size = nextValidRune(remaining, r)
-
- if !unicode.IsUpper(r) {
- break
- }
-
- prevSize = size
- offset += size
- remaining = remaining[size:]
- }
-
- // it's a bit complex when dealing with a case like "HTTPStatus".
- // it's expected to be splitted into "HTTP" and "Status".
- // Therefore "S" should be in remaining instead of word.
- if len(remaining) > 0 && isAlphabet(r) {
- offset -= prevSize
- remaining = str[offset:]
- }
-
- case isAlphabet(r):
- offset += size
- remaining = remaining[size:]
-
- for len(remaining) > 0 {
- r, size = nextValidRune(remaining, r)
-
- if !isAlphabet(r) || unicode.IsUpper(r) {
- break
- }
-
- offset += size
- remaining = remaining[size:]
- }
- }
-
- case isAlphabet(r):
- wt = alphabetWord
- remaining = remaining[size:]
-
- for len(remaining) > 0 {
- r, size = nextValidRune(remaining, r)
-
- if !isAlphabet(r) || unicode.IsUpper(r) {
- break
- }
-
- offset += size
- remaining = remaining[size:]
- }
-
- case unicode.IsNumber(r):
- wt = numberWord
- remaining = remaining[size:]
-
- for len(remaining) > 0 {
- r, size = nextValidRune(remaining, r)
-
- if !unicode.IsNumber(r) {
- break
- }
-
- offset += size
- remaining = remaining[size:]
- }
-
- default:
- wt = otherWord
- remaining = remaining[size:]
-
- for len(remaining) > 0 {
- r, size = nextValidRune(remaining, r)
-
- if size == 0 || isConnector(r) || isAlphabet(r) || unicode.IsNumber(r) || unicode.IsPunct(r) {
- break
- }
-
- offset += size
- remaining = remaining[size:]
- }
- }
-
- word = str[:offset]
- return
-}
-
-func nextValidRune(str string, prev rune) (r rune, size int) {
- var sz int
-
- for len(str) > 0 {
- r, sz = utf8.DecodeRuneInString(str)
- size += sz
-
- if r != utf8.RuneError {
- return
- }
-
- str = str[sz:]
- }
-
- r = prev
- return
-}
-
-func toLower(buf *stringBuilder, wt wordType, str string, connector rune) {
- buf.Grow(buf.Len() + len(str))
-
- if wt != upperCaseWord && wt != connectorWord {
- buf.WriteString(str)
- return
- }
-
- for len(str) > 0 {
- r, size := utf8.DecodeRuneInString(str)
- str = str[size:]
-
- if isConnector(r) {
- buf.WriteRune(connector)
- } else if unicode.IsUpper(r) {
- buf.WriteRune(unicode.ToLower(r))
- } else {
- buf.WriteRune(r)
- }
- }
-}
-
-// SwapCase will swap characters case from upper to lower or lower to upper.
-func SwapCase(str string) string {
- var r rune
- var size int
-
- buf := &stringBuilder{}
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
-
- switch {
- case unicode.IsUpper(r):
- buf.WriteRune(unicode.ToLower(r))
-
- case unicode.IsLower(r):
- buf.WriteRune(unicode.ToUpper(r))
-
- default:
- buf.WriteRune(r)
- }
-
- str = str[size:]
- }
-
- return buf.String()
-}
-
-// FirstRuneToUpper converts first rune to upper case if necessary.
-func FirstRuneToUpper(str string) string {
- if str == "" {
- return str
- }
-
- r, size := utf8.DecodeRuneInString(str)
-
- if !unicode.IsLower(r) {
- return str
- }
-
- buf := &stringBuilder{}
- buf.WriteRune(unicode.ToUpper(r))
- buf.WriteString(str[size:])
- return buf.String()
-}
-
-// FirstRuneToLower converts first rune to lower case if necessary.
-func FirstRuneToLower(str string) string {
- if str == "" {
- return str
- }
-
- r, size := utf8.DecodeRuneInString(str)
-
- if !unicode.IsUpper(r) {
- return str
- }
-
- buf := &stringBuilder{}
- buf.WriteRune(unicode.ToLower(r))
- buf.WriteString(str[size:])
- return buf.String()
-}
-
-// Shuffle randomizes runes in a string and returns the result.
-// It uses default random source in `math/rand`.
-func Shuffle(str string) string {
- if str == "" {
- return str
- }
-
- runes := []rune(str)
- index := 0
-
- for i := len(runes) - 1; i > 0; i-- {
- index = rand.Intn(i + 1)
-
- if i != index {
- runes[i], runes[index] = runes[index], runes[i]
- }
- }
-
- return string(runes)
-}
-
-// ShuffleSource randomizes runes in a string with given random source.
-func ShuffleSource(str string, src rand.Source) string {
- if str == "" {
- return str
- }
-
- runes := []rune(str)
- index := 0
- r := rand.New(src)
-
- for i := len(runes) - 1; i > 0; i-- {
- index = r.Intn(i + 1)
-
- if i != index {
- runes[i], runes[index] = runes[index], runes[i]
- }
- }
-
- return string(runes)
-}
-
-// Successor returns the successor to string.
-//
-// If there is one alphanumeric rune is found in string, increase the rune by 1.
-// If increment generates a "carry", the rune to the left of it is incremented.
-// This process repeats until there is no carry, adding an additional rune if necessary.
-//
-// If there is no alphanumeric rune, the rightmost rune will be increased by 1
-// regardless whether the result is a valid rune or not.
-//
-// Only following characters are alphanumeric.
-// - a - z
-// - A - Z
-// - 0 - 9
-//
-// Samples (borrowed from ruby's String#succ document):
-//
-// "abcd" => "abce"
-// "THX1138" => "THX1139"
-// "<>" => "<>"
-// "1999zzz" => "2000aaa"
-// "ZZZ9999" => "AAAA0000"
-// "***" => "**+"
-func Successor(str string) string {
- if str == "" {
- return str
- }
-
- var r rune
- var i int
- carry := ' '
- runes := []rune(str)
- l := len(runes)
- lastAlphanumeric := l
-
- for i = l - 1; i >= 0; i-- {
- r = runes[i]
-
- if ('a' <= r && r <= 'y') ||
- ('A' <= r && r <= 'Y') ||
- ('0' <= r && r <= '8') {
- runes[i]++
- carry = ' '
- lastAlphanumeric = i
- break
- }
-
- switch r {
- case 'z':
- runes[i] = 'a'
- carry = 'a'
- lastAlphanumeric = i
-
- case 'Z':
- runes[i] = 'A'
- carry = 'A'
- lastAlphanumeric = i
-
- case '9':
- runes[i] = '0'
- carry = '0'
- lastAlphanumeric = i
- }
- }
-
- // Needs to add one character for carry.
- if i < 0 && carry != ' ' {
- buf := &stringBuilder{}
- buf.Grow(l + 4) // Reserve enough space for write.
-
- if lastAlphanumeric != 0 {
- buf.WriteString(str[:lastAlphanumeric])
- }
-
- buf.WriteRune(carry)
-
- for _, r = range runes[lastAlphanumeric:] {
- buf.WriteRune(r)
- }
-
- return buf.String()
- }
-
- // No alphanumeric character. Simply increase last rune's value.
- if lastAlphanumeric == l {
- runes[l-1]++
- }
-
- return string(runes)
-}
diff --git a/vendor/github.com/huandu/xstrings/count.go b/vendor/github.com/huandu/xstrings/count.go
deleted file mode 100644
index f96e38703a..0000000000
--- a/vendor/github.com/huandu/xstrings/count.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2015 Huan Du. All rights reserved.
-// Licensed under the MIT license that can be found in the LICENSE file.
-
-package xstrings
-
-import (
- "unicode"
- "unicode/utf8"
-)
-
-// Len returns str's utf8 rune length.
-func Len(str string) int {
- return utf8.RuneCountInString(str)
-}
-
-// WordCount returns number of words in a string.
-//
-// Word is defined as a locale dependent string containing alphabetic characters,
-// which may also contain but not start with `'` and `-` characters.
-func WordCount(str string) int {
- var r rune
- var size, n int
-
- inWord := false
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
-
- switch {
- case isAlphabet(r):
- if !inWord {
- inWord = true
- n++
- }
-
- case inWord && (r == '\'' || r == '-'):
- // Still in word.
-
- default:
- inWord = false
- }
-
- str = str[size:]
- }
-
- return n
-}
-
-const minCJKCharacter = '\u3400'
-
-// Checks r is a letter but not CJK character.
-func isAlphabet(r rune) bool {
- if !unicode.IsLetter(r) {
- return false
- }
-
- switch {
- // Quick check for non-CJK character.
- case r < minCJKCharacter:
- return true
-
- // Common CJK characters.
- case r >= '\u4E00' && r <= '\u9FCC':
- return false
-
- // Rare CJK characters.
- case r >= '\u3400' && r <= '\u4D85':
- return false
-
- // Rare and historic CJK characters.
- case r >= '\U00020000' && r <= '\U0002B81D':
- return false
- }
-
- return true
-}
-
-// Width returns string width in monotype font.
-// Multi-byte characters are usually twice the width of single byte characters.
-//
-// Algorithm comes from `mb_strwidth` in PHP.
-// http://php.net/manual/en/function.mb-strwidth.php
-func Width(str string) int {
- var r rune
- var size, n int
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
- n += RuneWidth(r)
- str = str[size:]
- }
-
- return n
-}
-
-// RuneWidth returns character width in monotype font.
-// Multi-byte characters are usually twice the width of single byte characters.
-//
-// Algorithm comes from `mb_strwidth` in PHP.
-// http://php.net/manual/en/function.mb-strwidth.php
-func RuneWidth(r rune) int {
- switch {
- case r == utf8.RuneError || r < '\x20':
- return 0
-
- case '\x20' <= r && r < '\u2000':
- return 1
-
- case '\u2000' <= r && r < '\uFF61':
- return 2
-
- case '\uFF61' <= r && r < '\uFFA0':
- return 1
-
- case '\uFFA0' <= r:
- return 2
- }
-
- return 0
-}
diff --git a/vendor/github.com/huandu/xstrings/doc.go b/vendor/github.com/huandu/xstrings/doc.go
deleted file mode 100644
index 1a6ef069f6..0000000000
--- a/vendor/github.com/huandu/xstrings/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2015 Huan Du. All rights reserved.
-// Licensed under the MIT license that can be found in the LICENSE file.
-
-// Package xstrings is to provide string algorithms which are useful but not included in `strings` package.
-// See project home page for details. https://github.com/huandu/xstrings
-//
-// Package xstrings assumes all strings are encoded in utf8.
-package xstrings
diff --git a/vendor/github.com/huandu/xstrings/format.go b/vendor/github.com/huandu/xstrings/format.go
deleted file mode 100644
index b32219bbd5..0000000000
--- a/vendor/github.com/huandu/xstrings/format.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2015 Huan Du. All rights reserved.
-// Licensed under the MIT license that can be found in the LICENSE file.
-
-package xstrings
-
-import (
- "unicode/utf8"
-)
-
-// ExpandTabs can expand tabs ('\t') rune in str to one or more spaces dpending on
-// current column and tabSize.
-// The column number is reset to zero after each newline ('\n') occurring in the str.
-//
-// ExpandTabs uses RuneWidth to decide rune's width.
-// For example, CJK characters will be treated as two characters.
-//
-// If tabSize <= 0, ExpandTabs panics with error.
-//
-// Samples:
-//
-// ExpandTabs("a\tbc\tdef\tghij\tk", 4) => "a bc def ghij k"
-// ExpandTabs("abcdefg\thij\nk\tl", 4) => "abcdefg hij\nk l"
-// ExpandTabs("z中\t文\tw", 4) => "z中 文 w"
-func ExpandTabs(str string, tabSize int) string {
- if tabSize <= 0 {
- panic("tab size must be positive")
- }
-
- var r rune
- var i, size, column, expand int
- var output *stringBuilder
-
- orig := str
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
-
- if r == '\t' {
- expand = tabSize - column%tabSize
-
- if output == nil {
- output = allocBuffer(orig, str)
- }
-
- for i = 0; i < expand; i++ {
- output.WriteRune(' ')
- }
-
- column += expand
- } else {
- if r == '\n' {
- column = 0
- } else {
- column += RuneWidth(r)
- }
-
- if output != nil {
- output.WriteRune(r)
- }
- }
-
- str = str[size:]
- }
-
- if output == nil {
- return orig
- }
-
- return output.String()
-}
-
-// LeftJustify returns a string with pad string at right side if str's rune length is smaller than length.
-// If str's rune length is larger than length, str itself will be returned.
-//
-// If pad is an empty string, str will be returned.
-//
-// Samples:
-//
-// LeftJustify("hello", 4, " ") => "hello"
-// LeftJustify("hello", 10, " ") => "hello "
-// LeftJustify("hello", 10, "123") => "hello12312"
-func LeftJustify(str string, length int, pad string) string {
- l := Len(str)
-
- if l >= length || pad == "" {
- return str
- }
-
- remains := length - l
- padLen := Len(pad)
-
- output := &stringBuilder{}
- output.Grow(len(str) + (remains/padLen+1)*len(pad))
- output.WriteString(str)
- writePadString(output, pad, padLen, remains)
- return output.String()
-}
-
-// RightJustify returns a string with pad string at left side if str's rune length is smaller than length.
-// If str's rune length is larger than length, str itself will be returned.
-//
-// If pad is an empty string, str will be returned.
-//
-// Samples:
-//
-// RightJustify("hello", 4, " ") => "hello"
-// RightJustify("hello", 10, " ") => " hello"
-// RightJustify("hello", 10, "123") => "12312hello"
-func RightJustify(str string, length int, pad string) string {
- l := Len(str)
-
- if l >= length || pad == "" {
- return str
- }
-
- remains := length - l
- padLen := Len(pad)
-
- output := &stringBuilder{}
- output.Grow(len(str) + (remains/padLen+1)*len(pad))
- writePadString(output, pad, padLen, remains)
- output.WriteString(str)
- return output.String()
-}
-
-// Center returns a string with pad string at both side if str's rune length is smaller than length.
-// If str's rune length is larger than length, str itself will be returned.
-//
-// If pad is an empty string, str will be returned.
-//
-// Samples:
-//
-// Center("hello", 4, " ") => "hello"
-// Center("hello", 10, " ") => " hello "
-// Center("hello", 10, "123") => "12hello123"
-func Center(str string, length int, pad string) string {
- l := Len(str)
-
- if l >= length || pad == "" {
- return str
- }
-
- remains := length - l
- padLen := Len(pad)
-
- output := &stringBuilder{}
- output.Grow(len(str) + (remains/padLen+1)*len(pad))
- writePadString(output, pad, padLen, remains/2)
- output.WriteString(str)
- writePadString(output, pad, padLen, (remains+1)/2)
- return output.String()
-}
-
-func writePadString(output *stringBuilder, pad string, padLen, remains int) {
- var r rune
- var size int
-
- repeats := remains / padLen
-
- for i := 0; i < repeats; i++ {
- output.WriteString(pad)
- }
-
- remains = remains % padLen
-
- if remains != 0 {
- for i := 0; i < remains; i++ {
- r, size = utf8.DecodeRuneInString(pad)
- output.WriteRune(r)
- pad = pad[size:]
- }
- }
-}
diff --git a/vendor/github.com/huandu/xstrings/manipulate.go b/vendor/github.com/huandu/xstrings/manipulate.go
deleted file mode 100644
index ab42fe0fec..0000000000
--- a/vendor/github.com/huandu/xstrings/manipulate.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright 2015 Huan Du. All rights reserved.
-// Licensed under the MIT license that can be found in the LICENSE file.
-
-package xstrings
-
-import (
- "strings"
- "unicode/utf8"
-)
-
-// Reverse a utf8 encoded string.
-func Reverse(str string) string {
- var size int
-
- tail := len(str)
- buf := make([]byte, tail)
- s := buf
-
- for len(str) > 0 {
- _, size = utf8.DecodeRuneInString(str)
- tail -= size
- s = append(s[:tail], []byte(str[:size])...)
- str = str[size:]
- }
-
- return string(buf)
-}
-
-// Slice a string by rune.
-//
-// Start must satisfy 0 <= start <= rune length.
-//
-// End can be positive, zero or negative.
-// If end >= 0, start and end must satisfy start <= end <= rune length.
-// If end < 0, it means slice to the end of string.
-//
-// Otherwise, Slice will panic as out of range.
-func Slice(str string, start, end int) string {
- var size, startPos, endPos int
-
- origin := str
-
- if start < 0 || end > len(str) || (end >= 0 && start > end) {
- panic("out of range")
- }
-
- if end >= 0 {
- end -= start
- }
-
- for start > 0 && len(str) > 0 {
- _, size = utf8.DecodeRuneInString(str)
- start--
- startPos += size
- str = str[size:]
- }
-
- if end < 0 {
- return origin[startPos:]
- }
-
- endPos = startPos
-
- for end > 0 && len(str) > 0 {
- _, size = utf8.DecodeRuneInString(str)
- end--
- endPos += size
- str = str[size:]
- }
-
- if len(str) == 0 && (start > 0 || end > 0) {
- panic("out of range")
- }
-
- return origin[startPos:endPos]
-}
-
-// Partition splits a string by sep into three parts.
-// The return value is a slice of strings with head, match and tail.
-//
-// If str contains sep, for example "hello" and "l", Partition returns
-//
-// "he", "l", "lo"
-//
-// If str doesn't contain sep, for example "hello" and "x", Partition returns
-//
-// "hello", "", ""
-func Partition(str, sep string) (head, match, tail string) {
- index := strings.Index(str, sep)
-
- if index == -1 {
- head = str
- return
- }
-
- head = str[:index]
- match = str[index : index+len(sep)]
- tail = str[index+len(sep):]
- return
-}
-
-// LastPartition splits a string by last instance of sep into three parts.
-// The return value is a slice of strings with head, match and tail.
-//
-// If str contains sep, for example "hello" and "l", LastPartition returns
-//
-// "hel", "l", "o"
-//
-// If str doesn't contain sep, for example "hello" and "x", LastPartition returns
-//
-// "", "", "hello"
-func LastPartition(str, sep string) (head, match, tail string) {
- index := strings.LastIndex(str, sep)
-
- if index == -1 {
- tail = str
- return
- }
-
- head = str[:index]
- match = str[index : index+len(sep)]
- tail = str[index+len(sep):]
- return
-}
-
-// Insert src into dst at given rune index.
-// Index is counted by runes instead of bytes.
-//
-// If index is out of range of dst, panic with out of range.
-func Insert(dst, src string, index int) string {
- return Slice(dst, 0, index) + src + Slice(dst, index, -1)
-}
-
-// Scrub scrubs invalid utf8 bytes with repl string.
-// Adjacent invalid bytes are replaced only once.
-func Scrub(str, repl string) string {
- var buf *stringBuilder
- var r rune
- var size, pos int
- var hasError bool
-
- origin := str
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
-
- if r == utf8.RuneError {
- if !hasError {
- if buf == nil {
- buf = &stringBuilder{}
- }
-
- buf.WriteString(origin[:pos])
- hasError = true
- }
- } else if hasError {
- hasError = false
- buf.WriteString(repl)
-
- origin = origin[pos:]
- pos = 0
- }
-
- pos += size
- str = str[size:]
- }
-
- if buf != nil {
- buf.WriteString(origin)
- return buf.String()
- }
-
- // No invalid byte.
- return origin
-}
-
-// WordSplit splits a string into words. Returns a slice of words.
-// If there is no word in a string, return nil.
-//
-// Word is defined as a locale dependent string containing alphabetic characters,
-// which may also contain but not start with `'` and `-` characters.
-func WordSplit(str string) []string {
- var word string
- var words []string
- var r rune
- var size, pos int
-
- inWord := false
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
-
- switch {
- case isAlphabet(r):
- if !inWord {
- inWord = true
- word = str
- pos = 0
- }
-
- case inWord && (r == '\'' || r == '-'):
- // Still in word.
-
- default:
- if inWord {
- inWord = false
- words = append(words, word[:pos])
- }
- }
-
- pos += size
- str = str[size:]
- }
-
- if inWord {
- words = append(words, word[:pos])
- }
-
- return words
-}
diff --git a/vendor/github.com/huandu/xstrings/stringbuilder.go b/vendor/github.com/huandu/xstrings/stringbuilder.go
deleted file mode 100644
index 06812fea07..0000000000
--- a/vendor/github.com/huandu/xstrings/stringbuilder.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build go1.10
-// +build go1.10
-
-package xstrings
-
-import "strings"
-
-type stringBuilder = strings.Builder
diff --git a/vendor/github.com/huandu/xstrings/stringbuilder_go110.go b/vendor/github.com/huandu/xstrings/stringbuilder_go110.go
deleted file mode 100644
index ccaa5aedd3..0000000000
--- a/vendor/github.com/huandu/xstrings/stringbuilder_go110.go
+++ /dev/null
@@ -1,10 +0,0 @@
-//go:build !go1.10
-// +build !go1.10
-
-package xstrings
-
-import "bytes"
-
-type stringBuilder struct {
- bytes.Buffer
-}
diff --git a/vendor/github.com/huandu/xstrings/translate.go b/vendor/github.com/huandu/xstrings/translate.go
deleted file mode 100644
index 1fac6a00be..0000000000
--- a/vendor/github.com/huandu/xstrings/translate.go
+++ /dev/null
@@ -1,552 +0,0 @@
-// Copyright 2015 Huan Du. All rights reserved.
-// Licensed under the MIT license that can be found in the LICENSE file.
-
-package xstrings
-
-import (
- "unicode"
- "unicode/utf8"
-)
-
-type runeRangeMap struct {
- FromLo rune // Lower bound of range map.
- FromHi rune // An inclusive higher bound of range map.
- ToLo rune
- ToHi rune
-}
-
-type runeDict struct {
- Dict [unicode.MaxASCII + 1]rune
-}
-
-type runeMap map[rune]rune
-
-// Translator can translate string with pre-compiled from and to patterns.
-// If a from/to pattern pair needs to be used more than once, it's recommended
-// to create a Translator and reuse it.
-type Translator struct {
- quickDict *runeDict // A quick dictionary to look up rune by index. Only available for latin runes.
- runeMap runeMap // Rune map for translation.
- ranges []*runeRangeMap // Ranges of runes.
- mappedRune rune // If mappedRune >= 0, all matched runes are translated to the mappedRune.
- reverted bool // If to pattern is empty, all matched characters will be deleted.
- hasPattern bool
-}
-
-// NewTranslator creates new Translator through a from/to pattern pair.
-func NewTranslator(from, to string) *Translator {
- tr := &Translator{}
-
- if from == "" {
- return tr
- }
-
- reverted := from[0] == '^'
- deletion := len(to) == 0
-
- if reverted {
- from = from[1:]
- }
-
- var fromStart, fromEnd, fromRangeStep rune
- var toStart, toEnd, toRangeStep rune
- var fromRangeSize, toRangeSize rune
- var singleRunes []rune
-
- // Update the to rune range.
- updateRange := func() {
- // No more rune to read in the to rune pattern.
- if toEnd == utf8.RuneError {
- return
- }
-
- if toRangeStep == 0 {
- to, toStart, toEnd, toRangeStep = nextRuneRange(to, toEnd)
- return
- }
-
- // Current range is not empty. Consume 1 rune from start.
- if toStart != toEnd {
- toStart += toRangeStep
- return
- }
-
- // No more rune. Repeat the last rune.
- if to == "" {
- toEnd = utf8.RuneError
- return
- }
-
- // Both start and end are used. Read two more runes from the to pattern.
- to, toStart, toEnd, toRangeStep = nextRuneRange(to, utf8.RuneError)
- }
-
- if deletion {
- toStart = utf8.RuneError
- toEnd = utf8.RuneError
- } else {
- // If from pattern is reverted, only the last rune in the to pattern will be used.
- if reverted {
- var size int
-
- for len(to) > 0 {
- toStart, size = utf8.DecodeRuneInString(to)
- to = to[size:]
- }
-
- toEnd = utf8.RuneError
- } else {
- to, toStart, toEnd, toRangeStep = nextRuneRange(to, utf8.RuneError)
- }
- }
-
- fromEnd = utf8.RuneError
-
- for len(from) > 0 {
- from, fromStart, fromEnd, fromRangeStep = nextRuneRange(from, fromEnd)
-
- // fromStart is a single character. Just map it with a rune in the to pattern.
- if fromRangeStep == 0 {
- singleRunes = tr.addRune(fromStart, toStart, singleRunes)
- updateRange()
- continue
- }
-
- for toEnd != utf8.RuneError && fromStart != fromEnd {
- // If mapped rune is a single character instead of a range, simply shift first
- // rune in the range.
- if toRangeStep == 0 {
- singleRunes = tr.addRune(fromStart, toStart, singleRunes)
- updateRange()
- fromStart += fromRangeStep
- continue
- }
-
- fromRangeSize = (fromEnd - fromStart) * fromRangeStep
- toRangeSize = (toEnd - toStart) * toRangeStep
-
- // Not enough runes in the to pattern. Need to read more.
- if fromRangeSize > toRangeSize {
- fromStart, toStart = tr.addRuneRange(fromStart, fromStart+toRangeSize*fromRangeStep, toStart, toEnd, singleRunes)
- fromStart += fromRangeStep
- updateRange()
-
- // Edge case: If fromRangeSize == toRangeSize + 1, the last fromStart value needs be considered
- // as a single rune.
- if fromStart == fromEnd {
- singleRunes = tr.addRune(fromStart, toStart, singleRunes)
- updateRange()
- }
-
- continue
- }
-
- fromStart, toStart = tr.addRuneRange(fromStart, fromEnd, toStart, toStart+fromRangeSize*toRangeStep, singleRunes)
- updateRange()
- break
- }
-
- if fromStart == fromEnd {
- fromEnd = utf8.RuneError
- continue
- }
-
- _, toStart = tr.addRuneRange(fromStart, fromEnd, toStart, toStart, singleRunes)
- fromEnd = utf8.RuneError
- }
-
- if fromEnd != utf8.RuneError {
- tr.addRune(fromEnd, toStart, singleRunes)
- }
-
- tr.reverted = reverted
- tr.mappedRune = -1
- tr.hasPattern = true
-
- // Translate RuneError only if in deletion or reverted mode.
- if deletion || reverted {
- tr.mappedRune = toStart
- }
-
- return tr
-}
-
-func (tr *Translator) addRune(from, to rune, singleRunes []rune) []rune {
- if from <= unicode.MaxASCII {
- if tr.quickDict == nil {
- tr.quickDict = &runeDict{}
- }
-
- tr.quickDict.Dict[from] = to
- } else {
- if tr.runeMap == nil {
- tr.runeMap = make(runeMap)
- }
-
- tr.runeMap[from] = to
- }
-
- singleRunes = append(singleRunes, from)
- return singleRunes
-}
-
-func (tr *Translator) addRuneRange(fromLo, fromHi, toLo, toHi rune, singleRunes []rune) (rune, rune) {
- var r rune
- var rrm *runeRangeMap
-
- if fromLo < fromHi {
- rrm = &runeRangeMap{
- FromLo: fromLo,
- FromHi: fromHi,
- ToLo: toLo,
- ToHi: toHi,
- }
- } else {
- rrm = &runeRangeMap{
- FromLo: fromHi,
- FromHi: fromLo,
- ToLo: toHi,
- ToHi: toLo,
- }
- }
-
- // If there is any single rune conflicts with this rune range, clear single rune record.
- for _, r = range singleRunes {
- if rrm.FromLo <= r && r <= rrm.FromHi {
- if r <= unicode.MaxASCII {
- tr.quickDict.Dict[r] = 0
- } else {
- delete(tr.runeMap, r)
- }
- }
- }
-
- tr.ranges = append(tr.ranges, rrm)
- return fromHi, toHi
-}
-
-func nextRuneRange(str string, last rune) (remaining string, start, end rune, rangeStep rune) {
- var r rune
- var size int
-
- remaining = str
- escaping := false
- isRange := false
-
- for len(remaining) > 0 {
- r, size = utf8.DecodeRuneInString(remaining)
- remaining = remaining[size:]
-
- // Parse special characters.
- if !escaping {
- if r == '\\' {
- escaping = true
- continue
- }
-
- if r == '-' {
- // Ignore slash at beginning of string.
- if last == utf8.RuneError {
- continue
- }
-
- start = last
- isRange = true
- continue
- }
- }
-
- escaping = false
-
- if last != utf8.RuneError {
- // This is a range which start and end are the same.
- // Considier it as a normal character.
- if isRange && last == r {
- isRange = false
- continue
- }
-
- start = last
- end = r
-
- if isRange {
- if start < end {
- rangeStep = 1
- } else {
- rangeStep = -1
- }
- }
-
- return
- }
-
- last = r
- }
-
- start = last
- end = utf8.RuneError
- return
-}
-
-// Translate str with a from/to pattern pair.
-//
-// See comment in Translate function for usage and samples.
-func (tr *Translator) Translate(str string) string {
- if !tr.hasPattern || str == "" {
- return str
- }
-
- var r rune
- var size int
- var needTr bool
-
- orig := str
-
- var output *stringBuilder
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
- r, needTr = tr.TranslateRune(r)
-
- if needTr && output == nil {
- output = allocBuffer(orig, str)
- }
-
- if r != utf8.RuneError && output != nil {
- output.WriteRune(r)
- }
-
- str = str[size:]
- }
-
- // No character is translated.
- if output == nil {
- return orig
- }
-
- return output.String()
-}
-
-// TranslateRune return translated rune and true if r matches the from pattern.
-// If r doesn't match the pattern, original r is returned and translated is false.
-func (tr *Translator) TranslateRune(r rune) (result rune, translated bool) {
- switch {
- case tr.quickDict != nil:
- if r <= unicode.MaxASCII {
- result = tr.quickDict.Dict[r]
-
- if result != 0 {
- translated = true
-
- if tr.mappedRune >= 0 {
- result = tr.mappedRune
- }
-
- break
- }
- }
-
- fallthrough
-
- case tr.runeMap != nil:
- var ok bool
-
- if result, ok = tr.runeMap[r]; ok {
- translated = true
-
- if tr.mappedRune >= 0 {
- result = tr.mappedRune
- }
-
- break
- }
-
- fallthrough
-
- default:
- var rrm *runeRangeMap
- ranges := tr.ranges
-
- for i := len(ranges) - 1; i >= 0; i-- {
- rrm = ranges[i]
-
- if rrm.FromLo <= r && r <= rrm.FromHi {
- translated = true
-
- if tr.mappedRune >= 0 {
- result = tr.mappedRune
- break
- }
-
- if rrm.ToLo < rrm.ToHi {
- result = rrm.ToLo + r - rrm.FromLo
- } else if rrm.ToLo > rrm.ToHi {
- // ToHi can be smaller than ToLo if range is from higher to lower.
- result = rrm.ToLo - r + rrm.FromLo
- } else {
- result = rrm.ToLo
- }
-
- break
- }
- }
- }
-
- if tr.reverted {
- if !translated {
- result = tr.mappedRune
- }
-
- translated = !translated
- }
-
- if !translated {
- result = r
- }
-
- return
-}
-
-// HasPattern returns true if Translator has one pattern at least.
-func (tr *Translator) HasPattern() bool {
- return tr.hasPattern
-}
-
-// Translate str with the characters defined in from replaced by characters defined in to.
-//
-// From and to are patterns representing a set of characters. Pattern is defined as following.
-//
-// Special characters:
-//
-// 1. '-' means a range of runes, e.g.
-// "a-z" means all characters from 'a' to 'z' inclusive;
-// "z-a" means all characters from 'z' to 'a' inclusive.
-// 2. '^' as first character means a set of all runes excepted listed, e.g.
-// "^a-z" means all characters except 'a' to 'z' inclusive.
-// 3. '\' escapes special characters.
-//
-// Normal character represents itself, e.g. "abc" is a set including 'a', 'b' and 'c'.
-//
-// Translate will try to find a 1:1 mapping from from to to.
-// If to is smaller than from, last rune in to will be used to map "out of range" characters in from.
-//
-// Note that '^' only works in the from pattern. It will be considered as a normal character in the to pattern.
-//
-// If the to pattern is an empty string, Translate works exactly the same as Delete.
-//
-// Samples:
-//
-// Translate("hello", "aeiou", "12345") => "h2ll4"
-// Translate("hello", "a-z", "A-Z") => "HELLO"
-// Translate("hello", "z-a", "a-z") => "svool"
-// Translate("hello", "aeiou", "*") => "h*ll*"
-// Translate("hello", "^l", "*") => "**ll*"
-// Translate("hello ^ world", `\^lo`, "*") => "he*** * w*r*d"
-func Translate(str, from, to string) string {
- tr := NewTranslator(from, to)
- return tr.Translate(str)
-}
-
-// Delete runes in str matching the pattern.
-// Pattern is defined in Translate function.
-//
-// Samples:
-//
-// Delete("hello", "aeiou") => "hll"
-// Delete("hello", "a-k") => "llo"
-// Delete("hello", "^a-k") => "he"
-func Delete(str, pattern string) string {
- tr := NewTranslator(pattern, "")
- return tr.Translate(str)
-}
-
-// Count how many runes in str match the pattern.
-// Pattern is defined in Translate function.
-//
-// Samples:
-//
-// Count("hello", "aeiou") => 3
-// Count("hello", "a-k") => 3
-// Count("hello", "^a-k") => 2
-func Count(str, pattern string) int {
- if pattern == "" || str == "" {
- return 0
- }
-
- var r rune
- var size int
- var matched bool
-
- tr := NewTranslator(pattern, "")
- cnt := 0
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
- str = str[size:]
-
- if _, matched = tr.TranslateRune(r); matched {
- cnt++
- }
- }
-
- return cnt
-}
-
-// Squeeze deletes adjacent repeated runes in str.
-// If pattern is not empty, only runes matching the pattern will be squeezed.
-//
-// Samples:
-//
-// Squeeze("hello", "") => "helo"
-// Squeeze("hello", "m-z") => "hello"
-// Squeeze("hello world", " ") => "hello world"
-func Squeeze(str, pattern string) string {
- var last, r rune
- var size int
- var skipSqueeze, matched bool
- var tr *Translator
- var output *stringBuilder
-
- orig := str
- last = -1
-
- if len(pattern) > 0 {
- tr = NewTranslator(pattern, "")
- }
-
- for len(str) > 0 {
- r, size = utf8.DecodeRuneInString(str)
-
- // Need to squeeze the str.
- if last == r && !skipSqueeze {
- if tr != nil {
- if _, matched = tr.TranslateRune(r); !matched {
- skipSqueeze = true
- }
- }
-
- if output == nil {
- output = allocBuffer(orig, str)
- }
-
- if skipSqueeze {
- output.WriteRune(r)
- }
- } else {
- if output != nil {
- output.WriteRune(r)
- }
-
- last = r
- skipSqueeze = false
- }
-
- str = str[size:]
- }
-
- if output == nil {
- return orig
- }
-
- return output.String()
-}
diff --git a/vendor/github.com/mitchellh/copystructure/LICENSE b/vendor/github.com/mitchellh/copystructure/LICENSE
deleted file mode 100644
index 2298515904..0000000000
--- a/vendor/github.com/mitchellh/copystructure/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Mitchell Hashimoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/mitchellh/copystructure/README.md b/vendor/github.com/mitchellh/copystructure/README.md
deleted file mode 100644
index f0fbd2e5c9..0000000000
--- a/vendor/github.com/mitchellh/copystructure/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# copystructure
-
-copystructure is a Go library for deep copying values in Go.
-
-This allows you to copy Go values that may contain reference values
-such as maps, slices, or pointers, and copy their data as well instead
-of just their references.
-
-## Installation
-
-Standard `go get`:
-
-```
-$ go get github.com/mitchellh/copystructure
-```
-
-## Usage & Example
-
-For usage and examples see the [Godoc](http://godoc.org/github.com/mitchellh/copystructure).
-
-The `Copy` function has examples associated with it there.
diff --git a/vendor/github.com/mitchellh/copystructure/copier_time.go b/vendor/github.com/mitchellh/copystructure/copier_time.go
deleted file mode 100644
index db6a6aa1a1..0000000000
--- a/vendor/github.com/mitchellh/copystructure/copier_time.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package copystructure
-
-import (
- "reflect"
- "time"
-)
-
-func init() {
- Copiers[reflect.TypeOf(time.Time{})] = timeCopier
-}
-
-func timeCopier(v interface{}) (interface{}, error) {
- // Just... copy it.
- return v.(time.Time), nil
-}
diff --git a/vendor/github.com/mitchellh/copystructure/copystructure.go b/vendor/github.com/mitchellh/copystructure/copystructure.go
deleted file mode 100644
index 8089e6670a..0000000000
--- a/vendor/github.com/mitchellh/copystructure/copystructure.go
+++ /dev/null
@@ -1,631 +0,0 @@
-package copystructure
-
-import (
- "errors"
- "reflect"
- "sync"
-
- "github.com/mitchellh/reflectwalk"
-)
-
-const tagKey = "copy"
-
-// Copy returns a deep copy of v.
-//
-// Copy is unable to copy unexported fields in a struct (lowercase field names).
-// Unexported fields can't be reflected by the Go runtime and therefore
-// copystructure can't perform any data copies.
-//
-// For structs, copy behavior can be controlled with struct tags. For example:
-//
-// struct {
-// Name string
-// Data *bytes.Buffer `copy:"shallow"`
-// }
-//
-// The available tag values are:
-//
-// * "ignore" - The field will be ignored, effectively resulting in it being
-// assigned the zero value in the copy.
-//
-// * "shallow" - The field will be be shallow copied. This means that references
-// values such as pointers, maps, slices, etc. will be directly assigned
-// versus deep copied.
-//
-func Copy(v interface{}) (interface{}, error) {
- return Config{}.Copy(v)
-}
-
-// CopierFunc is a function that knows how to deep copy a specific type.
-// Register these globally with the Copiers variable.
-type CopierFunc func(interface{}) (interface{}, error)
-
-// Copiers is a map of types that behave specially when they are copied.
-// If a type is found in this map while deep copying, this function
-// will be called to copy it instead of attempting to copy all fields.
-//
-// The key should be the type, obtained using: reflect.TypeOf(value with type).
-//
-// It is unsafe to write to this map after Copies have started. If you
-// are writing to this map while also copying, wrap all modifications to
-// this map as well as to Copy in a mutex.
-var Copiers map[reflect.Type]CopierFunc = make(map[reflect.Type]CopierFunc)
-
-// ShallowCopiers is a map of pointer types that behave specially
-// when they are copied. If a type is found in this map while deep
-// copying, the pointer value will be shallow copied and not walked
-// into.
-//
-// The key should be the type, obtained using: reflect.TypeOf(value
-// with type).
-//
-// It is unsafe to write to this map after Copies have started. If you
-// are writing to this map while also copying, wrap all modifications to
-// this map as well as to Copy in a mutex.
-var ShallowCopiers map[reflect.Type]struct{} = make(map[reflect.Type]struct{})
-
-// Must is a helper that wraps a call to a function returning
-// (interface{}, error) and panics if the error is non-nil. It is intended
-// for use in variable initializations and should only be used when a copy
-// error should be a crashing case.
-func Must(v interface{}, err error) interface{} {
- if err != nil {
- panic("copy error: " + err.Error())
- }
-
- return v
-}
-
-var errPointerRequired = errors.New("Copy argument must be a pointer when Lock is true")
-
-type Config struct {
- // Lock any types that are a sync.Locker and are not a mutex while copying.
- // If there is an RLocker method, use that to get the sync.Locker.
- Lock bool
-
- // Copiers is a map of types associated with a CopierFunc. Use the global
- // Copiers map if this is nil.
- Copiers map[reflect.Type]CopierFunc
-
- // ShallowCopiers is a map of pointer types that when they are
- // shallow copied no matter where they are encountered. Use the
- // global ShallowCopiers if this is nil.
- ShallowCopiers map[reflect.Type]struct{}
-}
-
-func (c Config) Copy(v interface{}) (interface{}, error) {
- if c.Lock && reflect.ValueOf(v).Kind() != reflect.Ptr {
- return nil, errPointerRequired
- }
-
- w := new(walker)
- if c.Lock {
- w.useLocks = true
- }
-
- if c.Copiers == nil {
- c.Copiers = Copiers
- }
- w.copiers = c.Copiers
-
- if c.ShallowCopiers == nil {
- c.ShallowCopiers = ShallowCopiers
- }
- w.shallowCopiers = c.ShallowCopiers
-
- err := reflectwalk.Walk(v, w)
- if err != nil {
- return nil, err
- }
-
- // Get the result. If the result is nil, then we want to turn it
- // into a typed nil if we can.
- result := w.Result
- if result == nil {
- val := reflect.ValueOf(v)
- result = reflect.Indirect(reflect.New(val.Type())).Interface()
- }
-
- return result, nil
-}
-
-// Return the key used to index interfaces types we've seen. Store the number
-// of pointers in the upper 32bits, and the depth in the lower 32bits. This is
-// easy to calculate, easy to match a key with our current depth, and we don't
-// need to deal with initializing and cleaning up nested maps or slices.
-func ifaceKey(pointers, depth int) uint64 {
- return uint64(pointers)<<32 | uint64(depth)
-}
-
-type walker struct {
- Result interface{}
-
- copiers map[reflect.Type]CopierFunc
- shallowCopiers map[reflect.Type]struct{}
- depth int
- ignoreDepth int
- vals []reflect.Value
- cs []reflect.Value
-
- // This stores the number of pointers we've walked over, indexed by depth.
- ps []int
-
- // If an interface is indirected by a pointer, we need to know the type of
- // interface to create when creating the new value. Store the interface
- // types here, indexed by both the walk depth and the number of pointers
- // already seen at that depth. Use ifaceKey to calculate the proper uint64
- // value.
- ifaceTypes map[uint64]reflect.Type
-
- // any locks we've taken, indexed by depth
- locks []sync.Locker
- // take locks while walking the structure
- useLocks bool
-}
-
-func (w *walker) Enter(l reflectwalk.Location) error {
- w.depth++
-
- // ensure we have enough elements to index via w.depth
- for w.depth >= len(w.locks) {
- w.locks = append(w.locks, nil)
- }
-
- for len(w.ps) < w.depth+1 {
- w.ps = append(w.ps, 0)
- }
-
- return nil
-}
-
-func (w *walker) Exit(l reflectwalk.Location) error {
- locker := w.locks[w.depth]
- w.locks[w.depth] = nil
- if locker != nil {
- defer locker.Unlock()
- }
-
- // clear out pointers and interfaces as we exit the stack
- w.ps[w.depth] = 0
-
- for k := range w.ifaceTypes {
- mask := uint64(^uint32(0))
- if k&mask == uint64(w.depth) {
- delete(w.ifaceTypes, k)
- }
- }
-
- w.depth--
- if w.ignoreDepth > w.depth {
- w.ignoreDepth = 0
- }
-
- if w.ignoring() {
- return nil
- }
-
- switch l {
- case reflectwalk.Array:
- fallthrough
- case reflectwalk.Map:
- fallthrough
- case reflectwalk.Slice:
- w.replacePointerMaybe()
-
- // Pop map off our container
- w.cs = w.cs[:len(w.cs)-1]
- case reflectwalk.MapValue:
- // Pop off the key and value
- mv := w.valPop()
- mk := w.valPop()
- m := w.cs[len(w.cs)-1]
-
- // If mv is the zero value, SetMapIndex deletes the key form the map,
- // or in this case never adds it. We need to create a properly typed
- // zero value so that this key can be set.
- if !mv.IsValid() {
- mv = reflect.Zero(m.Elem().Type().Elem())
- }
- m.Elem().SetMapIndex(mk, mv)
- case reflectwalk.ArrayElem:
- // Pop off the value and the index and set it on the array
- v := w.valPop()
- i := w.valPop().Interface().(int)
- if v.IsValid() {
- a := w.cs[len(w.cs)-1]
- ae := a.Elem().Index(i) // storing array as pointer on stack - so need Elem() call
- if ae.CanSet() {
- ae.Set(v)
- }
- }
- case reflectwalk.SliceElem:
- // Pop off the value and the index and set it on the slice
- v := w.valPop()
- i := w.valPop().Interface().(int)
- if v.IsValid() {
- s := w.cs[len(w.cs)-1]
- se := s.Elem().Index(i)
- if se.CanSet() {
- se.Set(v)
- }
- }
- case reflectwalk.Struct:
- w.replacePointerMaybe()
-
- // Remove the struct from the container stack
- w.cs = w.cs[:len(w.cs)-1]
- case reflectwalk.StructField:
- // Pop off the value and the field
- v := w.valPop()
- f := w.valPop().Interface().(reflect.StructField)
- if v.IsValid() {
- s := w.cs[len(w.cs)-1]
- sf := reflect.Indirect(s).FieldByName(f.Name)
-
- if sf.CanSet() {
- sf.Set(v)
- }
- }
- case reflectwalk.WalkLoc:
- // Clear out the slices for GC
- w.cs = nil
- w.vals = nil
- }
-
- return nil
-}
-
-func (w *walker) Map(m reflect.Value) error {
- if w.ignoring() {
- return nil
- }
- w.lock(m)
-
- // Create the map. If the map itself is nil, then just make a nil map
- var newMap reflect.Value
- if m.IsNil() {
- newMap = reflect.New(m.Type())
- } else {
- newMap = wrapPtr(reflect.MakeMap(m.Type()))
- }
-
- w.cs = append(w.cs, newMap)
- w.valPush(newMap)
- return nil
-}
-
-func (w *walker) MapElem(m, k, v reflect.Value) error {
- return nil
-}
-
-func (w *walker) PointerEnter(v bool) error {
- if v {
- w.ps[w.depth]++
- }
- return nil
-}
-
-func (w *walker) PointerExit(v bool) error {
- if v {
- w.ps[w.depth]--
- }
- return nil
-}
-
-func (w *walker) Pointer(v reflect.Value) error {
- if _, ok := w.shallowCopiers[v.Type()]; ok {
- // Shallow copy this value. Use the same logic as primitive, then
- // return skip.
- if err := w.Primitive(v); err != nil {
- return err
- }
-
- return reflectwalk.SkipEntry
- }
-
- return nil
-}
-
-func (w *walker) Interface(v reflect.Value) error {
- if !v.IsValid() {
- return nil
- }
- if w.ifaceTypes == nil {
- w.ifaceTypes = make(map[uint64]reflect.Type)
- }
-
- w.ifaceTypes[ifaceKey(w.ps[w.depth], w.depth)] = v.Type()
- return nil
-}
-
-func (w *walker) Primitive(v reflect.Value) error {
- if w.ignoring() {
- return nil
- }
- w.lock(v)
-
- // IsValid verifies the v is non-zero and CanInterface verifies
- // that we're allowed to read this value (unexported fields).
- var newV reflect.Value
- if v.IsValid() && v.CanInterface() {
- newV = reflect.New(v.Type())
- newV.Elem().Set(v)
- }
-
- w.valPush(newV)
- w.replacePointerMaybe()
- return nil
-}
-
-func (w *walker) Slice(s reflect.Value) error {
- if w.ignoring() {
- return nil
- }
- w.lock(s)
-
- var newS reflect.Value
- if s.IsNil() {
- newS = reflect.New(s.Type())
- } else {
- newS = wrapPtr(reflect.MakeSlice(s.Type(), s.Len(), s.Cap()))
- }
-
- w.cs = append(w.cs, newS)
- w.valPush(newS)
- return nil
-}
-
-func (w *walker) SliceElem(i int, elem reflect.Value) error {
- if w.ignoring() {
- return nil
- }
-
- // We don't write the slice here because elem might still be
- // arbitrarily complex. Just record the index and continue on.
- w.valPush(reflect.ValueOf(i))
-
- return nil
-}
-
-func (w *walker) Array(a reflect.Value) error {
- if w.ignoring() {
- return nil
- }
- w.lock(a)
-
- newA := reflect.New(a.Type())
-
- w.cs = append(w.cs, newA)
- w.valPush(newA)
- return nil
-}
-
-func (w *walker) ArrayElem(i int, elem reflect.Value) error {
- if w.ignoring() {
- return nil
- }
-
- // We don't write the array here because elem might still be
- // arbitrarily complex. Just record the index and continue on.
- w.valPush(reflect.ValueOf(i))
-
- return nil
-}
-
-func (w *walker) Struct(s reflect.Value) error {
- if w.ignoring() {
- return nil
- }
- w.lock(s)
-
- var v reflect.Value
- if c, ok := w.copiers[s.Type()]; ok {
- // We have a Copier for this struct, so we use that copier to
- // get the copy, and we ignore anything deeper than this.
- w.ignoreDepth = w.depth
-
- dup, err := c(s.Interface())
- if err != nil {
- return err
- }
-
- // We need to put a pointer to the value on the value stack,
- // so allocate a new pointer and set it.
- v = reflect.New(s.Type())
- reflect.Indirect(v).Set(reflect.ValueOf(dup))
- } else {
- // No copier, we copy ourselves and allow reflectwalk to guide
- // us deeper into the structure for copying.
- v = reflect.New(s.Type())
- }
-
- // Push the value onto the value stack for setting the struct field,
- // and add the struct itself to the containers stack in case we walk
- // deeper so that its own fields can be modified.
- w.valPush(v)
- w.cs = append(w.cs, v)
-
- return nil
-}
-
-func (w *walker) StructField(f reflect.StructField, v reflect.Value) error {
- if w.ignoring() {
- return nil
- }
-
- // If PkgPath is non-empty, this is a private (unexported) field.
- // We do not set this unexported since the Go runtime doesn't allow us.
- if f.PkgPath != "" {
- return reflectwalk.SkipEntry
- }
-
- switch f.Tag.Get(tagKey) {
- case "shallow":
- // If we're shallow copying then assign the value directly to the
- // struct and skip the entry.
- if v.IsValid() {
- s := w.cs[len(w.cs)-1]
- sf := reflect.Indirect(s).FieldByName(f.Name)
- if sf.CanSet() {
- sf.Set(v)
- }
- }
-
- return reflectwalk.SkipEntry
-
- case "ignore":
- // Do nothing
- return reflectwalk.SkipEntry
- }
-
- // Push the field onto the stack, we'll handle it when we exit
- // the struct field in Exit...
- w.valPush(reflect.ValueOf(f))
-
- return nil
-}
-
-// ignore causes the walker to ignore any more values until we exit this on
-func (w *walker) ignore() {
- w.ignoreDepth = w.depth
-}
-
-func (w *walker) ignoring() bool {
- return w.ignoreDepth > 0 && w.depth >= w.ignoreDepth
-}
-
-func (w *walker) pointerPeek() bool {
- return w.ps[w.depth] > 0
-}
-
-func (w *walker) valPop() reflect.Value {
- result := w.vals[len(w.vals)-1]
- w.vals = w.vals[:len(w.vals)-1]
-
- // If we're out of values, that means we popped everything off. In
- // this case, we reset the result so the next pushed value becomes
- // the result.
- if len(w.vals) == 0 {
- w.Result = nil
- }
-
- return result
-}
-
-func (w *walker) valPush(v reflect.Value) {
- w.vals = append(w.vals, v)
-
- // If we haven't set the result yet, then this is the result since
- // it is the first (outermost) value we're seeing.
- if w.Result == nil && v.IsValid() {
- w.Result = v.Interface()
- }
-}
-
-func (w *walker) replacePointerMaybe() {
- // Determine the last pointer value. If it is NOT a pointer, then
- // we need to push that onto the stack.
- if !w.pointerPeek() {
- w.valPush(reflect.Indirect(w.valPop()))
- return
- }
-
- v := w.valPop()
-
- // If the expected type is a pointer to an interface of any depth,
- // such as *interface{}, **interface{}, etc., then we need to convert
- // the value "v" from *CONCRETE to *interface{} so types match for
- // Set.
- //
- // Example if v is type *Foo where Foo is a struct, v would become
- // *interface{} instead. This only happens if we have an interface expectation
- // at this depth.
- //
- // For more info, see GH-16
- if iType, ok := w.ifaceTypes[ifaceKey(w.ps[w.depth], w.depth)]; ok && iType.Kind() == reflect.Interface {
- y := reflect.New(iType) // Create *interface{}
- y.Elem().Set(reflect.Indirect(v)) // Assign "Foo" to interface{} (dereferenced)
- v = y // v is now typed *interface{} (where *v = Foo)
- }
-
- for i := 1; i < w.ps[w.depth]; i++ {
- if iType, ok := w.ifaceTypes[ifaceKey(w.ps[w.depth]-i, w.depth)]; ok {
- iface := reflect.New(iType).Elem()
- iface.Set(v)
- v = iface
- }
-
- p := reflect.New(v.Type())
- p.Elem().Set(v)
- v = p
- }
-
- w.valPush(v)
-}
-
-// if this value is a Locker, lock it and add it to the locks slice
-func (w *walker) lock(v reflect.Value) {
- if !w.useLocks {
- return
- }
-
- if !v.IsValid() || !v.CanInterface() {
- return
- }
-
- type rlocker interface {
- RLocker() sync.Locker
- }
-
- var locker sync.Locker
-
- // We can't call Interface() on a value directly, since that requires
- // a copy. This is OK, since the pointer to a value which is a sync.Locker
- // is also a sync.Locker.
- if v.Kind() == reflect.Ptr {
- switch l := v.Interface().(type) {
- case rlocker:
- // don't lock a mutex directly
- if _, ok := l.(*sync.RWMutex); !ok {
- locker = l.RLocker()
- }
- case sync.Locker:
- locker = l
- }
- } else if v.CanAddr() {
- switch l := v.Addr().Interface().(type) {
- case rlocker:
- // don't lock a mutex directly
- if _, ok := l.(*sync.RWMutex); !ok {
- locker = l.RLocker()
- }
- case sync.Locker:
- locker = l
- }
- }
-
- // still no callable locker
- if locker == nil {
- return
- }
-
- // don't lock a mutex directly
- switch locker.(type) {
- case *sync.Mutex, *sync.RWMutex:
- return
- }
-
- locker.Lock()
- w.locks[w.depth] = locker
-}
-
-// wrapPtr is a helper that takes v and always make it *v. copystructure
-// stores things internally as pointers until the last moment before unwrapping
-func wrapPtr(v reflect.Value) reflect.Value {
- if !v.IsValid() {
- return v
- }
- vPtr := reflect.New(v.Type())
- vPtr.Elem().Set(v)
- return vPtr
-}
diff --git a/vendor/github.com/mitchellh/reflectwalk/.travis.yml b/vendor/github.com/mitchellh/reflectwalk/.travis.yml
deleted file mode 100644
index 4f2ee4d973..0000000000
--- a/vendor/github.com/mitchellh/reflectwalk/.travis.yml
+++ /dev/null
@@ -1 +0,0 @@
-language: go
diff --git a/vendor/github.com/mitchellh/reflectwalk/LICENSE b/vendor/github.com/mitchellh/reflectwalk/LICENSE
deleted file mode 100644
index f9c841a51e..0000000000
--- a/vendor/github.com/mitchellh/reflectwalk/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 Mitchell Hashimoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/mitchellh/reflectwalk/README.md b/vendor/github.com/mitchellh/reflectwalk/README.md
deleted file mode 100644
index ac82cd2e15..0000000000
--- a/vendor/github.com/mitchellh/reflectwalk/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# reflectwalk
-
-reflectwalk is a Go library for "walking" a value in Go using reflection,
-in the same way a directory tree can be "walked" on the filesystem. Walking
-a complex structure can allow you to do manipulations on unknown structures
-such as those decoded from JSON.
diff --git a/vendor/github.com/mitchellh/reflectwalk/location.go b/vendor/github.com/mitchellh/reflectwalk/location.go
deleted file mode 100644
index 6a7f176117..0000000000
--- a/vendor/github.com/mitchellh/reflectwalk/location.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package reflectwalk
-
-//go:generate stringer -type=Location location.go
-
-type Location uint
-
-const (
- None Location = iota
- Map
- MapKey
- MapValue
- Slice
- SliceElem
- Array
- ArrayElem
- Struct
- StructField
- WalkLoc
-)
diff --git a/vendor/github.com/mitchellh/reflectwalk/location_string.go b/vendor/github.com/mitchellh/reflectwalk/location_string.go
deleted file mode 100644
index 70760cf4c7..0000000000
--- a/vendor/github.com/mitchellh/reflectwalk/location_string.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Code generated by "stringer -type=Location location.go"; DO NOT EDIT.
-
-package reflectwalk
-
-import "fmt"
-
-const _Location_name = "NoneMapMapKeyMapValueSliceSliceElemArrayArrayElemStructStructFieldWalkLoc"
-
-var _Location_index = [...]uint8{0, 4, 7, 13, 21, 26, 35, 40, 49, 55, 66, 73}
-
-func (i Location) String() string {
- if i >= Location(len(_Location_index)-1) {
- return fmt.Sprintf("Location(%d)", i)
- }
- return _Location_name[_Location_index[i]:_Location_index[i+1]]
-}
diff --git a/vendor/github.com/mitchellh/reflectwalk/reflectwalk.go b/vendor/github.com/mitchellh/reflectwalk/reflectwalk.go
deleted file mode 100644
index 7fee7b050b..0000000000
--- a/vendor/github.com/mitchellh/reflectwalk/reflectwalk.go
+++ /dev/null
@@ -1,420 +0,0 @@
-// reflectwalk is a package that allows you to "walk" complex structures
-// similar to how you may "walk" a filesystem: visiting every element one
-// by one and calling callback functions allowing you to handle and manipulate
-// those elements.
-package reflectwalk
-
-import (
- "errors"
- "reflect"
-)
-
-// PrimitiveWalker implementations are able to handle primitive values
-// within complex structures. Primitive values are numbers, strings,
-// booleans, funcs, chans.
-//
-// These primitive values are often members of more complex
-// structures (slices, maps, etc.) that are walkable by other interfaces.
-type PrimitiveWalker interface {
- Primitive(reflect.Value) error
-}
-
-// InterfaceWalker implementations are able to handle interface values as they
-// are encountered during the walk.
-type InterfaceWalker interface {
- Interface(reflect.Value) error
-}
-
-// MapWalker implementations are able to handle individual elements
-// found within a map structure.
-type MapWalker interface {
- Map(m reflect.Value) error
- MapElem(m, k, v reflect.Value) error
-}
-
-// SliceWalker implementations are able to handle slice elements found
-// within complex structures.
-type SliceWalker interface {
- Slice(reflect.Value) error
- SliceElem(int, reflect.Value) error
-}
-
-// ArrayWalker implementations are able to handle array elements found
-// within complex structures.
-type ArrayWalker interface {
- Array(reflect.Value) error
- ArrayElem(int, reflect.Value) error
-}
-
-// StructWalker is an interface that has methods that are called for
-// structs when a Walk is done.
-type StructWalker interface {
- Struct(reflect.Value) error
- StructField(reflect.StructField, reflect.Value) error
-}
-
-// EnterExitWalker implementations are notified before and after
-// they walk deeper into complex structures (into struct fields,
-// into slice elements, etc.)
-type EnterExitWalker interface {
- Enter(Location) error
- Exit(Location) error
-}
-
-// PointerWalker implementations are notified when the value they're
-// walking is a pointer or not. Pointer is called for _every_ value whether
-// it is a pointer or not.
-type PointerWalker interface {
- PointerEnter(bool) error
- PointerExit(bool) error
-}
-
-// PointerValueWalker implementations are notified with the value of
-// a particular pointer when a pointer is walked. Pointer is called
-// right before PointerEnter.
-type PointerValueWalker interface {
- Pointer(reflect.Value) error
-}
-
-// SkipEntry can be returned from walk functions to skip walking
-// the value of this field. This is only valid in the following functions:
-//
-// - Struct: skips all fields from being walked
-// - StructField: skips walking the struct value
-//
-var SkipEntry = errors.New("skip this entry")
-
-// Walk takes an arbitrary value and an interface and traverses the
-// value, calling callbacks on the interface if they are supported.
-// The interface should implement one or more of the walker interfaces
-// in this package, such as PrimitiveWalker, StructWalker, etc.
-func Walk(data, walker interface{}) (err error) {
- v := reflect.ValueOf(data)
- ew, ok := walker.(EnterExitWalker)
- if ok {
- err = ew.Enter(WalkLoc)
- }
-
- if err == nil {
- err = walk(v, walker)
- }
-
- if ok && err == nil {
- err = ew.Exit(WalkLoc)
- }
-
- return
-}
-
-func walk(v reflect.Value, w interface{}) (err error) {
- // Determine if we're receiving a pointer and if so notify the walker.
- // The logic here is convoluted but very important (tests will fail if
- // almost any part is changed). I will try to explain here.
- //
- // First, we check if the value is an interface, if so, we really need
- // to check the interface's VALUE to see whether it is a pointer.
- //
- // Check whether the value is then a pointer. If so, then set pointer
- // to true to notify the user.
- //
- // If we still have a pointer or an interface after the indirections, then
- // we unwrap another level
- //
- // At this time, we also set "v" to be the dereferenced value. This is
- // because once we've unwrapped the pointer we want to use that value.
- pointer := false
- pointerV := v
-
- for {
- if pointerV.Kind() == reflect.Interface {
- if iw, ok := w.(InterfaceWalker); ok {
- if err = iw.Interface(pointerV); err != nil {
- return
- }
- }
-
- pointerV = pointerV.Elem()
- }
-
- if pointerV.Kind() == reflect.Ptr {
- if pw, ok := w.(PointerValueWalker); ok {
- if err = pw.Pointer(pointerV); err != nil {
- if err == SkipEntry {
- // Skip the rest of this entry but clear the error
- return nil
- }
-
- return
- }
- }
-
- pointer = true
- v = reflect.Indirect(pointerV)
- }
- if pw, ok := w.(PointerWalker); ok {
- if err = pw.PointerEnter(pointer); err != nil {
- return
- }
-
- defer func(pointer bool) {
- if err != nil {
- return
- }
-
- err = pw.PointerExit(pointer)
- }(pointer)
- }
-
- if pointer {
- pointerV = v
- }
- pointer = false
-
- // If we still have a pointer or interface we have to indirect another level.
- switch pointerV.Kind() {
- case reflect.Ptr, reflect.Interface:
- continue
- }
- break
- }
-
- // We preserve the original value here because if it is an interface
- // type, we want to pass that directly into the walkPrimitive, so that
- // we can set it.
- originalV := v
- if v.Kind() == reflect.Interface {
- v = v.Elem()
- }
-
- k := v.Kind()
- if k >= reflect.Int && k <= reflect.Complex128 {
- k = reflect.Int
- }
-
- switch k {
- // Primitives
- case reflect.Bool, reflect.Chan, reflect.Func, reflect.Int, reflect.String, reflect.Invalid:
- err = walkPrimitive(originalV, w)
- return
- case reflect.Map:
- err = walkMap(v, w)
- return
- case reflect.Slice:
- err = walkSlice(v, w)
- return
- case reflect.Struct:
- err = walkStruct(v, w)
- return
- case reflect.Array:
- err = walkArray(v, w)
- return
- default:
- panic("unsupported type: " + k.String())
- }
-}
-
-func walkMap(v reflect.Value, w interface{}) error {
- ew, ewok := w.(EnterExitWalker)
- if ewok {
- ew.Enter(Map)
- }
-
- if mw, ok := w.(MapWalker); ok {
- if err := mw.Map(v); err != nil {
- return err
- }
- }
-
- for _, k := range v.MapKeys() {
- kv := v.MapIndex(k)
-
- if mw, ok := w.(MapWalker); ok {
- if err := mw.MapElem(v, k, kv); err != nil {
- return err
- }
- }
-
- ew, ok := w.(EnterExitWalker)
- if ok {
- ew.Enter(MapKey)
- }
-
- if err := walk(k, w); err != nil {
- return err
- }
-
- if ok {
- ew.Exit(MapKey)
- ew.Enter(MapValue)
- }
-
- // get the map value again as it may have changed in the MapElem call
- if err := walk(v.MapIndex(k), w); err != nil {
- return err
- }
-
- if ok {
- ew.Exit(MapValue)
- }
- }
-
- if ewok {
- ew.Exit(Map)
- }
-
- return nil
-}
-
-func walkPrimitive(v reflect.Value, w interface{}) error {
- if pw, ok := w.(PrimitiveWalker); ok {
- return pw.Primitive(v)
- }
-
- return nil
-}
-
-func walkSlice(v reflect.Value, w interface{}) (err error) {
- ew, ok := w.(EnterExitWalker)
- if ok {
- ew.Enter(Slice)
- }
-
- if sw, ok := w.(SliceWalker); ok {
- if err := sw.Slice(v); err != nil {
- return err
- }
- }
-
- for i := 0; i < v.Len(); i++ {
- elem := v.Index(i)
-
- if sw, ok := w.(SliceWalker); ok {
- if err := sw.SliceElem(i, elem); err != nil {
- return err
- }
- }
-
- ew, ok := w.(EnterExitWalker)
- if ok {
- ew.Enter(SliceElem)
- }
-
- if err := walk(elem, w); err != nil {
- return err
- }
-
- if ok {
- ew.Exit(SliceElem)
- }
- }
-
- ew, ok = w.(EnterExitWalker)
- if ok {
- ew.Exit(Slice)
- }
-
- return nil
-}
-
-func walkArray(v reflect.Value, w interface{}) (err error) {
- ew, ok := w.(EnterExitWalker)
- if ok {
- ew.Enter(Array)
- }
-
- if aw, ok := w.(ArrayWalker); ok {
- if err := aw.Array(v); err != nil {
- return err
- }
- }
-
- for i := 0; i < v.Len(); i++ {
- elem := v.Index(i)
-
- if aw, ok := w.(ArrayWalker); ok {
- if err := aw.ArrayElem(i, elem); err != nil {
- return err
- }
- }
-
- ew, ok := w.(EnterExitWalker)
- if ok {
- ew.Enter(ArrayElem)
- }
-
- if err := walk(elem, w); err != nil {
- return err
- }
-
- if ok {
- ew.Exit(ArrayElem)
- }
- }
-
- ew, ok = w.(EnterExitWalker)
- if ok {
- ew.Exit(Array)
- }
-
- return nil
-}
-
-func walkStruct(v reflect.Value, w interface{}) (err error) {
- ew, ewok := w.(EnterExitWalker)
- if ewok {
- ew.Enter(Struct)
- }
-
- skip := false
- if sw, ok := w.(StructWalker); ok {
- err = sw.Struct(v)
- if err == SkipEntry {
- skip = true
- err = nil
- }
- if err != nil {
- return
- }
- }
-
- if !skip {
- vt := v.Type()
- for i := 0; i < vt.NumField(); i++ {
- sf := vt.Field(i)
- f := v.FieldByIndex([]int{i})
-
- if sw, ok := w.(StructWalker); ok {
- err = sw.StructField(sf, f)
-
- // SkipEntry just pretends this field doesn't even exist
- if err == SkipEntry {
- continue
- }
-
- if err != nil {
- return
- }
- }
-
- ew, ok := w.(EnterExitWalker)
- if ok {
- ew.Enter(StructField)
- }
-
- err = walk(f, w)
- if err != nil {
- return
- }
-
- if ok {
- ew.Exit(StructField)
- }
- }
- }
-
- if ewok {
- ew.Exit(Struct)
- }
-
- return nil
-}
diff --git a/vendor/github.com/rancher/yip/pkg/executor/default.go b/vendor/github.com/rancher/yip/pkg/executor/default.go
index 541feb63be..27e4b5d7e3 100644
--- a/vendor/github.com/rancher/yip/pkg/executor/default.go
+++ b/vendor/github.com/rancher/yip/pkg/executor/default.go
@@ -75,6 +75,20 @@ func (l opList) uniqueNames() {
}
}
+type loaderError struct {
+ path string
+}
+
+func (e loaderError) Error() string {
+ return fmt.Sprintf("error loading path '%s'", e.path)
+}
+
+func newLoaderError(path string) loaderError {
+ return loaderError{
+ path,
+ }
+}
+
func (e *DefaultExecutor) applyStage(stage schema.Stage, fs vfs.FS, console plugins.Console) error {
var errs error
for _, p := range e.conditionals {
@@ -167,10 +181,10 @@ func (e *DefaultExecutor) genOpFromSchema(file, stage string, config schema.YipC
return results
}
-func (e *DefaultExecutor) dirOps(stage, dir string, fs vfs.FS, console plugins.Console) ([]*op, error) {
- results := []*op{}
+func (e *DefaultExecutor) dirOps(stage, dir string, fs vfs.FS, console plugins.Console) (results []*op, loaderError error, err error) {
+ results = []*op{}
prev := []*op{}
- err := vfs.Walk(fs, dir,
+ err = vfs.Walk(fs, dir,
func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
@@ -189,9 +203,11 @@ func (e *DefaultExecutor) dirOps(stage, dir string, fs vfs.FS, console plugins.C
config, err := schema.Load(path, fs, schema.FromFile, e.modifier)
if err != nil {
- return err
-
+ e.logger.Warnf("failed to load file '%s': %s", path, err.Error())
+ loaderError = multierror.Append(loaderError, newLoaderError(path))
+ return nil
}
+
ops := e.genOpFromSchema(path, stage, *config, fs, console)
// mark lexicographic order dependency from previous blocks
if len(prev) > 0 && len(ops) > 0 {
@@ -209,7 +225,8 @@ func (e *DefaultExecutor) dirOps(stage, dir string, fs vfs.FS, console plugins.C
results = append(results, ops...)
return nil
})
- return results, err
+
+ return results, loaderError, err
}
func writeDAG(dag [][]dag.GraphEntry) {
@@ -227,17 +244,17 @@ func writeDAG(dag [][]dag.GraphEntry) {
}
func (e *DefaultExecutor) Graph(stage string, fs vfs.FS, console plugins.Console, source string) ([][]dag.GraphEntry, error) {
- g, err := e.prepareDAG(stage, source, fs, console)
+ g, loaderError, err := e.prepareDAG(stage, source, fs, console)
if err != nil {
return nil, err
}
- return g.Analyze(), err
+ return g.Analyze(), loaderError
}
func (e *DefaultExecutor) Analyze(stage string, fs vfs.FS, console plugins.Console, args ...string) {
var errs error
for _, source := range args {
- g, err := e.prepareDAG(stage, source, fs, console)
+ g, _, err := e.prepareDAG(stage, source, fs, console)
if err != nil {
errs = multierror.Append(errs, err)
continue
@@ -255,35 +272,35 @@ func (e *DefaultExecutor) Analyze(stage string, fs vfs.FS, console plugins.Conso
}
}
-func (e *DefaultExecutor) prepareDAG(stage, uri string, fs vfs.FS, console plugins.Console) (*dag.Graph, error) {
+func (e *DefaultExecutor) prepareDAG(stage, uri string, fs vfs.FS, console plugins.Console) (g *dag.Graph, loaderError error, err error) {
f, err := fs.Stat(uri)
- g := dag.DAG(dag.EnableInit)
+ g = dag.DAG(dag.EnableInit)
var ops opList
switch {
case err == nil && f.IsDir():
- ops, err = e.dirOps(stage, uri, fs, console)
+ ops, loaderError, err = e.dirOps(stage, uri, fs, console)
if err != nil {
- return nil, err
+ return nil, loaderError, err
}
case err == nil:
config, err := schema.Load(uri, fs, schema.FromFile, e.modifier)
if err != nil {
- return nil, err
+ return nil, nil, err
}
ops = e.genOpFromSchema(uri, stage, *config, fs, console)
case utils.IsUrl(uri):
config, err := schema.Load(uri, fs, schema.FromUrl, e.modifier)
if err != nil {
- return nil, err
+ return nil, nil, err
}
ops = e.genOpFromSchema(uri, stage, *config, fs, console)
default:
config, err := schema.Load(uri, fs, nil, e.modifier)
if err != nil {
- return nil, err
+ return nil, nil, err
}
ops = e.genOpFromSchema("", stage, *config, fs, console)
@@ -295,11 +312,11 @@ func (e *DefaultExecutor) prepareDAG(stage, uri string, fs vfs.FS, console plugi
g.Add(o.name, append(o.options, dag.WithCallback(o.fn), dag.WithDeps(append(o.after, o.deps...)...))...)
}
- return g, nil
+ return g, loaderError, nil
}
func (e *DefaultExecutor) runStage(stage, uri string, fs vfs.FS, console plugins.Console) (err error) {
- g, err := e.prepareDAG(stage, uri, fs, console)
+ g, loaderError, err := e.prepareDAG(stage, uri, fs, console)
if err != nil {
return err
}
@@ -321,6 +338,10 @@ func (e *DefaultExecutor) runStage(stage, uri string, fs vfs.FS, console plugins
}
}
+ if loaderError != nil {
+ err = multierror.Append(err, loaderError)
+ }
+
return err
}
diff --git a/vendor/github.com/rancher/yip/pkg/utils/text.go b/vendor/github.com/rancher/yip/pkg/utils/text.go
index 9cee4df36e..befe7e5f6a 100644
--- a/vendor/github.com/rancher/yip/pkg/utils/text.go
+++ b/vendor/github.com/rancher/yip/pkg/utils/text.go
@@ -4,8 +4,6 @@ import (
"bytes"
"math/rand"
"text/template"
-
- "github.com/Masterminds/sprig/v3"
)
// UUIDTemplatedString accepts a template, and renders it with a
@@ -13,7 +11,7 @@ import (
// E.g. input "foo-{{.}}"
func TemplatedString(t string, i interface{}) (string, error) {
b := bytes.NewBuffer([]byte{})
- tmpl, err := template.New("template").Funcs(sprig.TxtFuncMap()).Parse(t)
+ tmpl, err := template.New("template").Parse(t)
if err != nil {
return "", err
}
diff --git a/vendor/github.com/shopspring/decimal/.gitignore b/vendor/github.com/shopspring/decimal/.gitignore
deleted file mode 100644
index ff36b987f0..0000000000
--- a/vendor/github.com/shopspring/decimal/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.git
-*.swp
-
-# IntelliJ
-.idea/
-*.iml
-
-# VS code
-*.code-workspace
diff --git a/vendor/github.com/shopspring/decimal/CHANGELOG.md b/vendor/github.com/shopspring/decimal/CHANGELOG.md
deleted file mode 100644
index 432d0fd4ea..0000000000
--- a/vendor/github.com/shopspring/decimal/CHANGELOG.md
+++ /dev/null
@@ -1,76 +0,0 @@
-## Decimal v1.4.0
-#### BREAKING
-- Drop support for Go version older than 1.10 [#361](https://github.com/shopspring/decimal/pull/361)
-
-#### FEATURES
-- Add implementation of natural logarithm [#339](https://github.com/shopspring/decimal/pull/339) [#357](https://github.com/shopspring/decimal/pull/357)
-- Add improved implementation of power operation [#358](https://github.com/shopspring/decimal/pull/358)
-- Add Compare method which forwards calls to Cmp [#346](https://github.com/shopspring/decimal/pull/346)
-- Add NewFromBigRat constructor [#288](https://github.com/shopspring/decimal/pull/288)
-- Add NewFromUint64 constructor [#352](https://github.com/shopspring/decimal/pull/352)
-
-#### ENHANCEMENTS
-- Migrate to Github Actions [#245](https://github.com/shopspring/decimal/pull/245) [#340](https://github.com/shopspring/decimal/pull/340)
-- Fix examples for RoundDown, RoundFloor, RoundUp, and RoundCeil [#285](https://github.com/shopspring/decimal/pull/285) [#328](https://github.com/shopspring/decimal/pull/328) [#341](https://github.com/shopspring/decimal/pull/341)
-- Use Godoc standard to mark deprecated Equals and StringScaled methods [#342](https://github.com/shopspring/decimal/pull/342)
-- Removed unnecessary min function for RescalePair method [#265](https://github.com/shopspring/decimal/pull/265)
-- Avoid reallocation of initial slice in MarshalBinary (GobEncode) [#355](https://github.com/shopspring/decimal/pull/355)
-- Optimize NumDigits method [#301](https://github.com/shopspring/decimal/pull/301) [#356](https://github.com/shopspring/decimal/pull/356)
-- Optimize BigInt method [#359](https://github.com/shopspring/decimal/pull/359)
-- Support scanning uint64 [#131](https://github.com/shopspring/decimal/pull/131) [#364](https://github.com/shopspring/decimal/pull/364)
-- Add docs section with alternative libraries [#363](https://github.com/shopspring/decimal/pull/363)
-
-#### BUGFIXES
-- Fix incorrect calculation of decimal modulo [#258](https://github.com/shopspring/decimal/pull/258) [#317](https://github.com/shopspring/decimal/pull/317)
-- Allocate new(big.Int) in Copy method to deeply clone it [#278](https://github.com/shopspring/decimal/pull/278)
-- Fix overflow edge case in QuoRem method [#322](https://github.com/shopspring/decimal/pull/322)
-
-## Decimal v1.3.1
-
-#### ENHANCEMENTS
-- Reduce memory allocation in case of initialization from big.Int [#252](https://github.com/shopspring/decimal/pull/252)
-
-#### BUGFIXES
-- Fix binary marshalling of decimal zero value [#253](https://github.com/shopspring/decimal/pull/253)
-
-## Decimal v1.3.0
-
-#### FEATURES
-- Add NewFromFormattedString initializer [#184](https://github.com/shopspring/decimal/pull/184)
-- Add NewNullDecimal initializer [#234](https://github.com/shopspring/decimal/pull/234)
-- Add implementation of natural exponent function (Taylor, Hull-Abraham) [#229](https://github.com/shopspring/decimal/pull/229)
-- Add RoundUp, RoundDown, RoundCeil, RoundFloor methods [#196](https://github.com/shopspring/decimal/pull/196) [#202](https://github.com/shopspring/decimal/pull/202) [#220](https://github.com/shopspring/decimal/pull/220)
-- Add XML support for NullDecimal [#192](https://github.com/shopspring/decimal/pull/192)
-- Add IsInteger method [#179](https://github.com/shopspring/decimal/pull/179)
-- Add Copy helper method [#123](https://github.com/shopspring/decimal/pull/123)
-- Add InexactFloat64 helper method [#205](https://github.com/shopspring/decimal/pull/205)
-- Add CoefficientInt64 helper method [#244](https://github.com/shopspring/decimal/pull/244)
-
-#### ENHANCEMENTS
-- Performance optimization of NewFromString init method [#198](https://github.com/shopspring/decimal/pull/198)
-- Performance optimization of Abs and Round methods [#240](https://github.com/shopspring/decimal/pull/240)
-- Additional tests (CI) for ppc64le architecture [#188](https://github.com/shopspring/decimal/pull/188)
-
-#### BUGFIXES
-- Fix rounding in FormatFloat fallback path (roundShortest method, fix taken from Go main repository) [#161](https://github.com/shopspring/decimal/pull/161)
-- Add slice range checks to UnmarshalBinary method [#232](https://github.com/shopspring/decimal/pull/232)
-
-## Decimal v1.2.0
-
-#### BREAKING
-- Drop support for Go version older than 1.7 [#172](https://github.com/shopspring/decimal/pull/172)
-
-#### FEATURES
-- Add NewFromInt and NewFromInt32 initializers [#72](https://github.com/shopspring/decimal/pull/72)
-- Add support for Go modules [#157](https://github.com/shopspring/decimal/pull/157)
-- Add BigInt, BigFloat helper methods [#171](https://github.com/shopspring/decimal/pull/171)
-
-#### ENHANCEMENTS
-- Memory usage optimization [#160](https://github.com/shopspring/decimal/pull/160)
-- Updated travis CI golang versions [#156](https://github.com/shopspring/decimal/pull/156)
-- Update documentation [#173](https://github.com/shopspring/decimal/pull/173)
-- Improve code quality [#174](https://github.com/shopspring/decimal/pull/174)
-
-#### BUGFIXES
-- Revert remove insignificant digits [#159](https://github.com/shopspring/decimal/pull/159)
-- Remove 15 interval for RoundCash [#166](https://github.com/shopspring/decimal/pull/166)
diff --git a/vendor/github.com/shopspring/decimal/LICENSE b/vendor/github.com/shopspring/decimal/LICENSE
deleted file mode 100644
index ad2148aaf9..0000000000
--- a/vendor/github.com/shopspring/decimal/LICENSE
+++ /dev/null
@@ -1,45 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Spring, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-- Based on https://github.com/oguzbilgic/fpd, which has the following license:
-"""
-The MIT License (MIT)
-
-Copyright (c) 2013 Oguz Bilgic
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
diff --git a/vendor/github.com/shopspring/decimal/README.md b/vendor/github.com/shopspring/decimal/README.md
deleted file mode 100644
index 318c9df581..0000000000
--- a/vendor/github.com/shopspring/decimal/README.md
+++ /dev/null
@@ -1,139 +0,0 @@
-# decimal
-
-[](https://github.com/shopspring/decimal/actions/workflows/ci.yml)
-[](https://godoc.org/github.com/shopspring/decimal)
-[](https://goreportcard.com/report/github.com/shopspring/decimal)
-
-Arbitrary-precision fixed-point decimal numbers in go.
-
-_Note:_ Decimal library can "only" represent numbers with a maximum of 2^31 digits after the decimal point.
-
-## Features
-
- * The zero-value is 0, and is safe to use without initialization
- * Addition, subtraction, multiplication with no loss of precision
- * Division with specified precision
- * Database/sql serialization/deserialization
- * JSON and XML serialization/deserialization
-
-## Install
-
-Run `go get github.com/shopspring/decimal`
-
-## Requirements
-
-Decimal library requires Go version `>=1.10`
-
-## Documentation
-
-http://godoc.org/github.com/shopspring/decimal
-
-
-## Usage
-
-```go
-package main
-
-import (
- "fmt"
- "github.com/shopspring/decimal"
-)
-
-func main() {
- price, err := decimal.NewFromString("136.02")
- if err != nil {
- panic(err)
- }
-
- quantity := decimal.NewFromInt(3)
-
- fee, _ := decimal.NewFromString(".035")
- taxRate, _ := decimal.NewFromString(".08875")
-
- subtotal := price.Mul(quantity)
-
- preTax := subtotal.Mul(fee.Add(decimal.NewFromFloat(1)))
-
- total := preTax.Mul(taxRate.Add(decimal.NewFromFloat(1)))
-
- fmt.Println("Subtotal:", subtotal) // Subtotal: 408.06
- fmt.Println("Pre-tax:", preTax) // Pre-tax: 422.3421
- fmt.Println("Taxes:", total.Sub(preTax)) // Taxes: 37.482861375
- fmt.Println("Total:", total) // Total: 459.824961375
- fmt.Println("Tax rate:", total.Sub(preTax).Div(preTax)) // Tax rate: 0.08875
-}
-```
-
-## Alternative libraries
-
-When working with decimal numbers, you might face problems this library is not perfectly suited for.
-Fortunately, thanks to the wonderful community we have a dozen other libraries that you can choose from.
-Explore other alternatives to find the one that best fits your needs :)
-
-* [cockroachdb/apd](https://github.com/cockroachdb/apd) - arbitrary precision, mutable and rich API similar to `big.Int`, more performant than this library
-* [alpacahq/alpacadecimal](https://github.com/alpacahq/alpacadecimal) - high performance, low precision (12 digits), fully compatible API with this library
-* [govalues/decimal](https://github.com/govalues/decimal) - high performance, zero-allocation, low precision (19 digits)
-* [greatcloak/decimal](https://github.com/greatcloak/decimal) - fork focusing on billing and e-commerce web application related use cases, includes out-of-the-box BSON marshaling support
-
-## FAQ
-
-#### Why don't you just use float64?
-
-Because float64 (or any binary floating point type, actually) can't represent
-numbers such as `0.1` exactly.
-
-Consider this code: http://play.golang.org/p/TQBd4yJe6B You might expect that
-it prints out `10`, but it actually prints `9.999999999999831`. Over time,
-these small errors can really add up!
-
-#### Why don't you just use big.Rat?
-
-big.Rat is fine for representing rational numbers, but Decimal is better for
-representing money. Why? Here's a (contrived) example:
-
-Let's say you use big.Rat, and you have two numbers, x and y, both
-representing 1/3, and you have `z = 1 - x - y = 1/3`. If you print each one
-out, the string output has to stop somewhere (let's say it stops at 3 decimal
-digits, for simplicity), so you'll get 0.333, 0.333, and 0.333. But where did
-the other 0.001 go?
-
-Here's the above example as code: http://play.golang.org/p/lCZZs0w9KE
-
-With Decimal, the strings being printed out represent the number exactly. So,
-if you have `x = y = 1/3` (with precision 3), they will actually be equal to
-0.333, and when you do `z = 1 - x - y`, `z` will be equal to .334. No money is
-unaccounted for!
-
-You still have to be careful. If you want to split a number `N` 3 ways, you
-can't just send `N/3` to three different people. You have to pick one to send
-`N - (2/3*N)` to. That person will receive the fraction of a penny remainder.
-
-But, it is much easier to be careful with Decimal than with big.Rat.
-
-#### Why isn't the API similar to big.Int's?
-
-big.Int's API is built to reduce the number of memory allocations for maximal
-performance. This makes sense for its use-case, but the trade-off is that the
-API is awkward and easy to misuse.
-
-For example, to add two big.Ints, you do: `z := new(big.Int).Add(x, y)`. A
-developer unfamiliar with this API might try to do `z := a.Add(a, b)`. This
-modifies `a` and sets `z` as an alias for `a`, which they might not expect. It
-also modifies any other aliases to `a`.
-
-Here's an example of the subtle bugs you can introduce with big.Int's API:
-https://play.golang.org/p/x2R_78pa8r
-
-In contrast, it's difficult to make such mistakes with decimal. Decimals
-behave like other go numbers types: even though `a = b` will not deep copy
-`b` into `a`, it is impossible to modify a Decimal, since all Decimal methods
-return new Decimals and do not modify the originals. The downside is that
-this causes extra allocations, so Decimal is less performant. My assumption
-is that if you're using Decimals, you probably care more about correctness
-than performance.
-
-## License
-
-The MIT License (MIT)
-
-This is a heavily modified fork of [fpd.Decimal](https://github.com/oguzbilgic/fpd), which was also released under the MIT License.
diff --git a/vendor/github.com/shopspring/decimal/const.go b/vendor/github.com/shopspring/decimal/const.go
deleted file mode 100644
index e5d6fa87e8..0000000000
--- a/vendor/github.com/shopspring/decimal/const.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package decimal
-
-import (
- "strings"
-)
-
-const (
- strLn10 = "2.302585092994045684017991454684364207601101488628772976033327900967572609677352480235997205089598298341967784042286248633409525465082806756666287369098781689482907208325554680843799894826233198528393505308965377732628846163366222287698219886746543667474404243274365155048934314939391479619404400222105101714174800368808401264708068556774321622835522011480466371565912137345074785694768346361679210180644507064800027750268491674655058685693567342067058113642922455440575892572420824131469568901675894025677631135691929203337658714166023010570308963457207544037084746994016826928280848118428931484852494864487192780967627127577539702766860595249671667418348570442250719796500471495105049221477656763693866297697952211071826454973477266242570942932258279850258550978526538320760672631716430950599508780752371033310119785754733154142180842754386359177811705430982748238504564801909561029929182431823752535770975053956518769751037497088869218020518933950723853920514463419726528728696511086257149219884997874887377134568620916705849807828059751193854445009978131146915934666241071846692310107598438319191292230792503747298650929009880391941702654416816335727555703151596113564846546190897042819763365836983716328982174407366009162177850541779276367731145041782137660111010731042397832521894898817597921798666394319523936855916447118246753245630912528778330963604262982153040874560927760726641354787576616262926568298704957954913954918049209069438580790032763017941503117866862092408537949861264933479354871737451675809537088281067452440105892444976479686075120275724181874989395971643105518848195288330746699317814634930000321200327765654130472621883970596794457943468343218395304414844803701305753674262153675579814770458031413637793236291560128185336498466942261465206459942072917119370602444929358037007718981097362533224548366988505528285966192805098447175198503666680874970496982273220244823343097169111136813588418696549323714996941979687803008850408979618598756579894836445212043698216415292987811742973332588607915912510967187510929248475023930572665446276200923068791518135803477701295593646298412366497023355174586195564772461857717369368404676577047874319780573853271810933883496338813069945569399346101090745616033312247949360455361849123333063704751724871276379140924398331810164737823379692265637682071706935846394531616949411701841938119405416449466111274712819705817783293841742231409930022911502362192186723337268385688273533371925103412930705632544426611429765388301822384091026198582888433587455960453004548370789052578473166283701953392231047527564998119228742789713715713228319641003422124210082180679525276689858180956119208391760721080919923461516952599099473782780648128058792731993893453415320185969711021407542282796298237068941764740642225757212455392526179373652434440560595336591539160312524480149313234572453879524389036839236450507881731359711238145323701508413491122324390927681724749607955799151363982881058285740538000653371655553014196332241918087621018204919492651483892"
-)
-
-var (
- ln10 = newConstApproximation(strLn10)
-)
-
-type constApproximation struct {
- exact Decimal
- approximations []Decimal
-}
-
-func newConstApproximation(value string) constApproximation {
- parts := strings.Split(value, ".")
- coeff, fractional := parts[0], parts[1]
-
- coeffLen := len(coeff)
- maxPrecision := len(fractional)
-
- var approximations []Decimal
- for p := 1; p < maxPrecision; p *= 2 {
- r := RequireFromString(value[:coeffLen+p])
- approximations = append(approximations, r)
- }
-
- return constApproximation{
- RequireFromString(value),
- approximations,
- }
-}
-
-// Returns the smallest approximation available that's at least as precise
-// as the passed precision (places after decimal point), i.e. Floor[ log2(precision) ] + 1
-func (c constApproximation) withPrecision(precision int32) Decimal {
- i := 0
-
- if precision >= 1 {
- i++
- }
-
- for precision >= 16 {
- precision /= 16
- i += 4
- }
-
- for precision >= 2 {
- precision /= 2
- i++
- }
-
- if i >= len(c.approximations) {
- return c.exact
- }
-
- return c.approximations[i]
-}
diff --git a/vendor/github.com/shopspring/decimal/decimal-go.go b/vendor/github.com/shopspring/decimal/decimal-go.go
deleted file mode 100644
index 9958d69020..0000000000
--- a/vendor/github.com/shopspring/decimal/decimal-go.go
+++ /dev/null
@@ -1,415 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Multiprecision decimal numbers.
-// For floating-point formatting only; not general purpose.
-// Only operations are assign and (binary) left/right shift.
-// Can do binary floating point in multiprecision decimal precisely
-// because 2 divides 10; cannot do decimal floating point
-// in multiprecision binary precisely.
-
-package decimal
-
-type decimal struct {
- d [800]byte // digits, big-endian representation
- nd int // number of digits used
- dp int // decimal point
- neg bool // negative flag
- trunc bool // discarded nonzero digits beyond d[:nd]
-}
-
-func (a *decimal) String() string {
- n := 10 + a.nd
- if a.dp > 0 {
- n += a.dp
- }
- if a.dp < 0 {
- n += -a.dp
- }
-
- buf := make([]byte, n)
- w := 0
- switch {
- case a.nd == 0:
- return "0"
-
- case a.dp <= 0:
- // zeros fill space between decimal point and digits
- buf[w] = '0'
- w++
- buf[w] = '.'
- w++
- w += digitZero(buf[w : w+-a.dp])
- w += copy(buf[w:], a.d[0:a.nd])
-
- case a.dp < a.nd:
- // decimal point in middle of digits
- w += copy(buf[w:], a.d[0:a.dp])
- buf[w] = '.'
- w++
- w += copy(buf[w:], a.d[a.dp:a.nd])
-
- default:
- // zeros fill space between digits and decimal point
- w += copy(buf[w:], a.d[0:a.nd])
- w += digitZero(buf[w : w+a.dp-a.nd])
- }
- return string(buf[0:w])
-}
-
-func digitZero(dst []byte) int {
- for i := range dst {
- dst[i] = '0'
- }
- return len(dst)
-}
-
-// trim trailing zeros from number.
-// (They are meaningless; the decimal point is tracked
-// independent of the number of digits.)
-func trim(a *decimal) {
- for a.nd > 0 && a.d[a.nd-1] == '0' {
- a.nd--
- }
- if a.nd == 0 {
- a.dp = 0
- }
-}
-
-// Assign v to a.
-func (a *decimal) Assign(v uint64) {
- var buf [24]byte
-
- // Write reversed decimal in buf.
- n := 0
- for v > 0 {
- v1 := v / 10
- v -= 10 * v1
- buf[n] = byte(v + '0')
- n++
- v = v1
- }
-
- // Reverse again to produce forward decimal in a.d.
- a.nd = 0
- for n--; n >= 0; n-- {
- a.d[a.nd] = buf[n]
- a.nd++
- }
- a.dp = a.nd
- trim(a)
-}
-
-// Maximum shift that we can do in one pass without overflow.
-// A uint has 32 or 64 bits, and we have to be able to accommodate 9<> 63)
-const maxShift = uintSize - 4
-
-// Binary shift right (/ 2) by k bits. k <= maxShift to avoid overflow.
-func rightShift(a *decimal, k uint) {
- r := 0 // read pointer
- w := 0 // write pointer
-
- // Pick up enough leading digits to cover first shift.
- var n uint
- for ; n>>k == 0; r++ {
- if r >= a.nd {
- if n == 0 {
- // a == 0; shouldn't get here, but handle anyway.
- a.nd = 0
- return
- }
- for n>>k == 0 {
- n = n * 10
- r++
- }
- break
- }
- c := uint(a.d[r])
- n = n*10 + c - '0'
- }
- a.dp -= r - 1
-
- var mask uint = (1 << k) - 1
-
- // Pick up a digit, put down a digit.
- for ; r < a.nd; r++ {
- c := uint(a.d[r])
- dig := n >> k
- n &= mask
- a.d[w] = byte(dig + '0')
- w++
- n = n*10 + c - '0'
- }
-
- // Put down extra digits.
- for n > 0 {
- dig := n >> k
- n &= mask
- if w < len(a.d) {
- a.d[w] = byte(dig + '0')
- w++
- } else if dig > 0 {
- a.trunc = true
- }
- n = n * 10
- }
-
- a.nd = w
- trim(a)
-}
-
-// Cheat sheet for left shift: table indexed by shift count giving
-// number of new digits that will be introduced by that shift.
-//
-// For example, leftcheats[4] = {2, "625"}. That means that
-// if we are shifting by 4 (multiplying by 16), it will add 2 digits
-// when the string prefix is "625" through "999", and one fewer digit
-// if the string prefix is "000" through "624".
-//
-// Credit for this trick goes to Ken.
-
-type leftCheat struct {
- delta int // number of new digits
- cutoff string // minus one digit if original < a.
-}
-
-var leftcheats = []leftCheat{
- // Leading digits of 1/2^i = 5^i.
- // 5^23 is not an exact 64-bit floating point number,
- // so have to use bc for the math.
- // Go up to 60 to be large enough for 32bit and 64bit platforms.
- /*
- seq 60 | sed 's/^/5^/' | bc |
- awk 'BEGIN{ print "\t{ 0, \"\" }," }
- {
- log2 = log(2)/log(10)
- printf("\t{ %d, \"%s\" },\t// * %d\n",
- int(log2*NR+1), $0, 2**NR)
- }'
- */
- {0, ""},
- {1, "5"}, // * 2
- {1, "25"}, // * 4
- {1, "125"}, // * 8
- {2, "625"}, // * 16
- {2, "3125"}, // * 32
- {2, "15625"}, // * 64
- {3, "78125"}, // * 128
- {3, "390625"}, // * 256
- {3, "1953125"}, // * 512
- {4, "9765625"}, // * 1024
- {4, "48828125"}, // * 2048
- {4, "244140625"}, // * 4096
- {4, "1220703125"}, // * 8192
- {5, "6103515625"}, // * 16384
- {5, "30517578125"}, // * 32768
- {5, "152587890625"}, // * 65536
- {6, "762939453125"}, // * 131072
- {6, "3814697265625"}, // * 262144
- {6, "19073486328125"}, // * 524288
- {7, "95367431640625"}, // * 1048576
- {7, "476837158203125"}, // * 2097152
- {7, "2384185791015625"}, // * 4194304
- {7, "11920928955078125"}, // * 8388608
- {8, "59604644775390625"}, // * 16777216
- {8, "298023223876953125"}, // * 33554432
- {8, "1490116119384765625"}, // * 67108864
- {9, "7450580596923828125"}, // * 134217728
- {9, "37252902984619140625"}, // * 268435456
- {9, "186264514923095703125"}, // * 536870912
- {10, "931322574615478515625"}, // * 1073741824
- {10, "4656612873077392578125"}, // * 2147483648
- {10, "23283064365386962890625"}, // * 4294967296
- {10, "116415321826934814453125"}, // * 8589934592
- {11, "582076609134674072265625"}, // * 17179869184
- {11, "2910383045673370361328125"}, // * 34359738368
- {11, "14551915228366851806640625"}, // * 68719476736
- {12, "72759576141834259033203125"}, // * 137438953472
- {12, "363797880709171295166015625"}, // * 274877906944
- {12, "1818989403545856475830078125"}, // * 549755813888
- {13, "9094947017729282379150390625"}, // * 1099511627776
- {13, "45474735088646411895751953125"}, // * 2199023255552
- {13, "227373675443232059478759765625"}, // * 4398046511104
- {13, "1136868377216160297393798828125"}, // * 8796093022208
- {14, "5684341886080801486968994140625"}, // * 17592186044416
- {14, "28421709430404007434844970703125"}, // * 35184372088832
- {14, "142108547152020037174224853515625"}, // * 70368744177664
- {15, "710542735760100185871124267578125"}, // * 140737488355328
- {15, "3552713678800500929355621337890625"}, // * 281474976710656
- {15, "17763568394002504646778106689453125"}, // * 562949953421312
- {16, "88817841970012523233890533447265625"}, // * 1125899906842624
- {16, "444089209850062616169452667236328125"}, // * 2251799813685248
- {16, "2220446049250313080847263336181640625"}, // * 4503599627370496
- {16, "11102230246251565404236316680908203125"}, // * 9007199254740992
- {17, "55511151231257827021181583404541015625"}, // * 18014398509481984
- {17, "277555756156289135105907917022705078125"}, // * 36028797018963968
- {17, "1387778780781445675529539585113525390625"}, // * 72057594037927936
- {18, "6938893903907228377647697925567626953125"}, // * 144115188075855872
- {18, "34694469519536141888238489627838134765625"}, // * 288230376151711744
- {18, "173472347597680709441192448139190673828125"}, // * 576460752303423488
- {19, "867361737988403547205962240695953369140625"}, // * 1152921504606846976
-}
-
-// Is the leading prefix of b lexicographically less than s?
-func prefixIsLessThan(b []byte, s string) bool {
- for i := 0; i < len(s); i++ {
- if i >= len(b) {
- return true
- }
- if b[i] != s[i] {
- return b[i] < s[i]
- }
- }
- return false
-}
-
-// Binary shift left (* 2) by k bits. k <= maxShift to avoid overflow.
-func leftShift(a *decimal, k uint) {
- delta := leftcheats[k].delta
- if prefixIsLessThan(a.d[0:a.nd], leftcheats[k].cutoff) {
- delta--
- }
-
- r := a.nd // read index
- w := a.nd + delta // write index
-
- // Pick up a digit, put down a digit.
- var n uint
- for r--; r >= 0; r-- {
- n += (uint(a.d[r]) - '0') << k
- quo := n / 10
- rem := n - 10*quo
- w--
- if w < len(a.d) {
- a.d[w] = byte(rem + '0')
- } else if rem != 0 {
- a.trunc = true
- }
- n = quo
- }
-
- // Put down extra digits.
- for n > 0 {
- quo := n / 10
- rem := n - 10*quo
- w--
- if w < len(a.d) {
- a.d[w] = byte(rem + '0')
- } else if rem != 0 {
- a.trunc = true
- }
- n = quo
- }
-
- a.nd += delta
- if a.nd >= len(a.d) {
- a.nd = len(a.d)
- }
- a.dp += delta
- trim(a)
-}
-
-// Binary shift left (k > 0) or right (k < 0).
-func (a *decimal) Shift(k int) {
- switch {
- case a.nd == 0:
- // nothing to do: a == 0
- case k > 0:
- for k > maxShift {
- leftShift(a, maxShift)
- k -= maxShift
- }
- leftShift(a, uint(k))
- case k < 0:
- for k < -maxShift {
- rightShift(a, maxShift)
- k += maxShift
- }
- rightShift(a, uint(-k))
- }
-}
-
-// If we chop a at nd digits, should we round up?
-func shouldRoundUp(a *decimal, nd int) bool {
- if nd < 0 || nd >= a.nd {
- return false
- }
- if a.d[nd] == '5' && nd+1 == a.nd { // exactly halfway - round to even
- // if we truncated, a little higher than what's recorded - always round up
- if a.trunc {
- return true
- }
- return nd > 0 && (a.d[nd-1]-'0')%2 != 0
- }
- // not halfway - digit tells all
- return a.d[nd] >= '5'
-}
-
-// Round a to nd digits (or fewer).
-// If nd is zero, it means we're rounding
-// just to the left of the digits, as in
-// 0.09 -> 0.1.
-func (a *decimal) Round(nd int) {
- if nd < 0 || nd >= a.nd {
- return
- }
- if shouldRoundUp(a, nd) {
- a.RoundUp(nd)
- } else {
- a.RoundDown(nd)
- }
-}
-
-// Round a down to nd digits (or fewer).
-func (a *decimal) RoundDown(nd int) {
- if nd < 0 || nd >= a.nd {
- return
- }
- a.nd = nd
- trim(a)
-}
-
-// Round a up to nd digits (or fewer).
-func (a *decimal) RoundUp(nd int) {
- if nd < 0 || nd >= a.nd {
- return
- }
-
- // round up
- for i := nd - 1; i >= 0; i-- {
- c := a.d[i]
- if c < '9' { // can stop after this digit
- a.d[i]++
- a.nd = i + 1
- return
- }
- }
-
- // Number is all 9s.
- // Change to single 1 with adjusted decimal point.
- a.d[0] = '1'
- a.nd = 1
- a.dp++
-}
-
-// Extract integer part, rounded appropriately.
-// No guarantees about overflow.
-func (a *decimal) RoundedInteger() uint64 {
- if a.dp > 20 {
- return 0xFFFFFFFFFFFFFFFF
- }
- var i int
- n := uint64(0)
- for i = 0; i < a.dp && i < a.nd; i++ {
- n = n*10 + uint64(a.d[i]-'0')
- }
- for ; i < a.dp; i++ {
- n *= 10
- }
- if shouldRoundUp(a, a.dp) {
- n++
- }
- return n
-}
diff --git a/vendor/github.com/shopspring/decimal/decimal.go b/vendor/github.com/shopspring/decimal/decimal.go
deleted file mode 100644
index a37a2301ef..0000000000
--- a/vendor/github.com/shopspring/decimal/decimal.go
+++ /dev/null
@@ -1,2339 +0,0 @@
-// Package decimal implements an arbitrary precision fixed-point decimal.
-//
-// The zero-value of a Decimal is 0, as you would expect.
-//
-// The best way to create a new Decimal is to use decimal.NewFromString, ex:
-//
-// n, err := decimal.NewFromString("-123.4567")
-// n.String() // output: "-123.4567"
-//
-// To use Decimal as part of a struct:
-//
-// type StructName struct {
-// Number Decimal
-// }
-//
-// Note: This can "only" represent numbers with a maximum of 2^31 digits after the decimal point.
-package decimal
-
-import (
- "database/sql/driver"
- "encoding/binary"
- "fmt"
- "math"
- "math/big"
- "regexp"
- "strconv"
- "strings"
-)
-
-// DivisionPrecision is the number of decimal places in the result when it
-// doesn't divide exactly.
-//
-// Example:
-//
-// d1 := decimal.NewFromFloat(2).Div(decimal.NewFromFloat(3))
-// d1.String() // output: "0.6666666666666667"
-// d2 := decimal.NewFromFloat(2).Div(decimal.NewFromFloat(30000))
-// d2.String() // output: "0.0000666666666667"
-// d3 := decimal.NewFromFloat(20000).Div(decimal.NewFromFloat(3))
-// d3.String() // output: "6666.6666666666666667"
-// decimal.DivisionPrecision = 3
-// d4 := decimal.NewFromFloat(2).Div(decimal.NewFromFloat(3))
-// d4.String() // output: "0.667"
-var DivisionPrecision = 16
-
-// PowPrecisionNegativeExponent specifies the maximum precision of the result (digits after decimal point)
-// when calculating decimal power. Only used for cases where the exponent is a negative number.
-// This constant applies to Pow, PowInt32 and PowBigInt methods, PowWithPrecision method is not constrained by it.
-//
-// Example:
-//
-// d1, err := decimal.NewFromFloat(15.2).PowInt32(-2)
-// d1.String() // output: "0.0043282548476454"
-//
-// decimal.PowPrecisionNegativeExponent = 24
-// d2, err := decimal.NewFromFloat(15.2).PowInt32(-2)
-// d2.String() // output: "0.004328254847645429362881"
-var PowPrecisionNegativeExponent = 16
-
-// MarshalJSONWithoutQuotes should be set to true if you want the decimal to
-// be JSON marshaled as a number, instead of as a string.
-// WARNING: this is dangerous for decimals with many digits, since many JSON
-// unmarshallers (ex: Javascript's) will unmarshal JSON numbers to IEEE 754
-// double-precision floating point numbers, which means you can potentially
-// silently lose precision.
-var MarshalJSONWithoutQuotes = false
-
-// ExpMaxIterations specifies the maximum number of iterations needed to calculate
-// precise natural exponent value using ExpHullAbrham method.
-var ExpMaxIterations = 1000
-
-// Zero constant, to make computations faster.
-// Zero should never be compared with == or != directly, please use decimal.Equal or decimal.Cmp instead.
-var Zero = New(0, 1)
-
-var zeroInt = big.NewInt(0)
-var oneInt = big.NewInt(1)
-var twoInt = big.NewInt(2)
-var fourInt = big.NewInt(4)
-var fiveInt = big.NewInt(5)
-var tenInt = big.NewInt(10)
-var twentyInt = big.NewInt(20)
-
-var factorials = []Decimal{New(1, 0)}
-
-// Decimal represents a fixed-point decimal. It is immutable.
-// number = value * 10 ^ exp
-type Decimal struct {
- value *big.Int
-
- // NOTE(vadim): this must be an int32, because we cast it to float64 during
- // calculations. If exp is 64 bit, we might lose precision.
- // If we cared about being able to represent every possible decimal, we
- // could make exp a *big.Int but it would hurt performance and numbers
- // like that are unrealistic.
- exp int32
-}
-
-// New returns a new fixed-point decimal, value * 10 ^ exp.
-func New(value int64, exp int32) Decimal {
- return Decimal{
- value: big.NewInt(value),
- exp: exp,
- }
-}
-
-// NewFromInt converts an int64 to Decimal.
-//
-// Example:
-//
-// NewFromInt(123).String() // output: "123"
-// NewFromInt(-10).String() // output: "-10"
-func NewFromInt(value int64) Decimal {
- return Decimal{
- value: big.NewInt(value),
- exp: 0,
- }
-}
-
-// NewFromInt32 converts an int32 to Decimal.
-//
-// Example:
-//
-// NewFromInt(123).String() // output: "123"
-// NewFromInt(-10).String() // output: "-10"
-func NewFromInt32(value int32) Decimal {
- return Decimal{
- value: big.NewInt(int64(value)),
- exp: 0,
- }
-}
-
-// NewFromUint64 converts an uint64 to Decimal.
-//
-// Example:
-//
-// NewFromUint64(123).String() // output: "123"
-func NewFromUint64(value uint64) Decimal {
- return Decimal{
- value: new(big.Int).SetUint64(value),
- exp: 0,
- }
-}
-
-// NewFromBigInt returns a new Decimal from a big.Int, value * 10 ^ exp
-func NewFromBigInt(value *big.Int, exp int32) Decimal {
- return Decimal{
- value: new(big.Int).Set(value),
- exp: exp,
- }
-}
-
-// NewFromBigRat returns a new Decimal from a big.Rat. The numerator and
-// denominator are divided and rounded to the given precision.
-//
-// Example:
-//
-// d1 := NewFromBigRat(big.NewRat(0, 1), 0) // output: "0"
-// d2 := NewFromBigRat(big.NewRat(4, 5), 1) // output: "0.8"
-// d3 := NewFromBigRat(big.NewRat(1000, 3), 3) // output: "333.333"
-// d4 := NewFromBigRat(big.NewRat(2, 7), 4) // output: "0.2857"
-func NewFromBigRat(value *big.Rat, precision int32) Decimal {
- return Decimal{
- value: new(big.Int).Set(value.Num()),
- exp: 0,
- }.DivRound(Decimal{
- value: new(big.Int).Set(value.Denom()),
- exp: 0,
- }, precision)
-}
-
-// NewFromString returns a new Decimal from a string representation.
-// Trailing zeroes are not trimmed.
-//
-// Example:
-//
-// d, err := NewFromString("-123.45")
-// d2, err := NewFromString(".0001")
-// d3, err := NewFromString("1.47000")
-func NewFromString(value string) (Decimal, error) {
- originalInput := value
- var intString string
- var exp int64
-
- // Check if number is using scientific notation
- eIndex := strings.IndexAny(value, "Ee")
- if eIndex != -1 {
- expInt, err := strconv.ParseInt(value[eIndex+1:], 10, 32)
- if err != nil {
- if e, ok := err.(*strconv.NumError); ok && e.Err == strconv.ErrRange {
- return Decimal{}, fmt.Errorf("can't convert %s to decimal: fractional part too long", value)
- }
- return Decimal{}, fmt.Errorf("can't convert %s to decimal: exponent is not numeric", value)
- }
- value = value[:eIndex]
- exp = expInt
- }
-
- pIndex := -1
- vLen := len(value)
- for i := 0; i < vLen; i++ {
- if value[i] == '.' {
- if pIndex > -1 {
- return Decimal{}, fmt.Errorf("can't convert %s to decimal: too many .s", value)
- }
- pIndex = i
- }
- }
-
- if pIndex == -1 {
- // There is no decimal point, we can just parse the original string as
- // an int
- intString = value
- } else {
- if pIndex+1 < vLen {
- intString = value[:pIndex] + value[pIndex+1:]
- } else {
- intString = value[:pIndex]
- }
- expInt := -len(value[pIndex+1:])
- exp += int64(expInt)
- }
-
- var dValue *big.Int
- // strconv.ParseInt is faster than new(big.Int).SetString so this is just a shortcut for strings we know won't overflow
- if len(intString) <= 18 {
- parsed64, err := strconv.ParseInt(intString, 10, 64)
- if err != nil {
- return Decimal{}, fmt.Errorf("can't convert %s to decimal", value)
- }
- dValue = big.NewInt(parsed64)
- } else {
- dValue = new(big.Int)
- _, ok := dValue.SetString(intString, 10)
- if !ok {
- return Decimal{}, fmt.Errorf("can't convert %s to decimal", value)
- }
- }
-
- if exp < math.MinInt32 || exp > math.MaxInt32 {
- // NOTE(vadim): I doubt a string could realistically be this long
- return Decimal{}, fmt.Errorf("can't convert %s to decimal: fractional part too long", originalInput)
- }
-
- return Decimal{
- value: dValue,
- exp: int32(exp),
- }, nil
-}
-
-// NewFromFormattedString returns a new Decimal from a formatted string representation.
-// The second argument - replRegexp, is a regular expression that is used to find characters that should be
-// removed from given decimal string representation. All matched characters will be replaced with an empty string.
-//
-// Example:
-//
-// r := regexp.MustCompile("[$,]")
-// d1, err := NewFromFormattedString("$5,125.99", r)
-//
-// r2 := regexp.MustCompile("[_]")
-// d2, err := NewFromFormattedString("1_000_000", r2)
-//
-// r3 := regexp.MustCompile("[USD\\s]")
-// d3, err := NewFromFormattedString("5000 USD", r3)
-func NewFromFormattedString(value string, replRegexp *regexp.Regexp) (Decimal, error) {
- parsedValue := replRegexp.ReplaceAllString(value, "")
- d, err := NewFromString(parsedValue)
- if err != nil {
- return Decimal{}, err
- }
- return d, nil
-}
-
-// RequireFromString returns a new Decimal from a string representation
-// or panics if NewFromString had returned an error.
-//
-// Example:
-//
-// d := RequireFromString("-123.45")
-// d2 := RequireFromString(".0001")
-func RequireFromString(value string) Decimal {
- dec, err := NewFromString(value)
- if err != nil {
- panic(err)
- }
- return dec
-}
-
-// NewFromFloat converts a float64 to Decimal.
-//
-// The converted number will contain the number of significant digits that can be
-// represented in a float with reliable roundtrip.
-// This is typically 15 digits, but may be more in some cases.
-// See https://www.exploringbinary.com/decimal-precision-of-binary-floating-point-numbers/ for more information.
-//
-// For slightly faster conversion, use NewFromFloatWithExponent where you can specify the precision in absolute terms.
-//
-// NOTE: this will panic on NaN, +/-inf
-func NewFromFloat(value float64) Decimal {
- if value == 0 {
- return New(0, 0)
- }
- return newFromFloat(value, math.Float64bits(value), &float64info)
-}
-
-// NewFromFloat32 converts a float32 to Decimal.
-//
-// The converted number will contain the number of significant digits that can be
-// represented in a float with reliable roundtrip.
-// This is typically 6-8 digits depending on the input.
-// See https://www.exploringbinary.com/decimal-precision-of-binary-floating-point-numbers/ for more information.
-//
-// For slightly faster conversion, use NewFromFloatWithExponent where you can specify the precision in absolute terms.
-//
-// NOTE: this will panic on NaN, +/-inf
-func NewFromFloat32(value float32) Decimal {
- if value == 0 {
- return New(0, 0)
- }
- // XOR is workaround for https://github.com/golang/go/issues/26285
- a := math.Float32bits(value) ^ 0x80808080
- return newFromFloat(float64(value), uint64(a)^0x80808080, &float32info)
-}
-
-func newFromFloat(val float64, bits uint64, flt *floatInfo) Decimal {
- if math.IsNaN(val) || math.IsInf(val, 0) {
- panic(fmt.Sprintf("Cannot create a Decimal from %v", val))
- }
- exp := int(bits>>flt.mantbits) & (1<>(flt.expbits+flt.mantbits) != 0
-
- roundShortest(&d, mant, exp, flt)
- // If less than 19 digits, we can do calculation in an int64.
- if d.nd < 19 {
- tmp := int64(0)
- m := int64(1)
- for i := d.nd - 1; i >= 0; i-- {
- tmp += m * int64(d.d[i]-'0')
- m *= 10
- }
- if d.neg {
- tmp *= -1
- }
- return Decimal{value: big.NewInt(tmp), exp: int32(d.dp) - int32(d.nd)}
- }
- dValue := new(big.Int)
- dValue, ok := dValue.SetString(string(d.d[:d.nd]), 10)
- if ok {
- return Decimal{value: dValue, exp: int32(d.dp) - int32(d.nd)}
- }
-
- return NewFromFloatWithExponent(val, int32(d.dp)-int32(d.nd))
-}
-
-// NewFromFloatWithExponent converts a float64 to Decimal, with an arbitrary
-// number of fractional digits.
-//
-// Example:
-//
-// NewFromFloatWithExponent(123.456, -2).String() // output: "123.46"
-func NewFromFloatWithExponent(value float64, exp int32) Decimal {
- if math.IsNaN(value) || math.IsInf(value, 0) {
- panic(fmt.Sprintf("Cannot create a Decimal from %v", value))
- }
-
- bits := math.Float64bits(value)
- mant := bits & (1<<52 - 1)
- exp2 := int32((bits >> 52) & (1<<11 - 1))
- sign := bits >> 63
-
- if exp2 == 0 {
- // specials
- if mant == 0 {
- return Decimal{}
- }
- // subnormal
- exp2++
- } else {
- // normal
- mant |= 1 << 52
- }
-
- exp2 -= 1023 + 52
-
- // normalizing base-2 values
- for mant&1 == 0 {
- mant = mant >> 1
- exp2++
- }
-
- // maximum number of fractional base-10 digits to represent 2^N exactly cannot be more than -N if N<0
- if exp < 0 && exp < exp2 {
- if exp2 < 0 {
- exp = exp2
- } else {
- exp = 0
- }
- }
-
- // representing 10^M * 2^N as 5^M * 2^(M+N)
- exp2 -= exp
-
- temp := big.NewInt(1)
- dMant := big.NewInt(int64(mant))
-
- // applying 5^M
- if exp > 0 {
- temp = temp.SetInt64(int64(exp))
- temp = temp.Exp(fiveInt, temp, nil)
- } else if exp < 0 {
- temp = temp.SetInt64(-int64(exp))
- temp = temp.Exp(fiveInt, temp, nil)
- dMant = dMant.Mul(dMant, temp)
- temp = temp.SetUint64(1)
- }
-
- // applying 2^(M+N)
- if exp2 > 0 {
- dMant = dMant.Lsh(dMant, uint(exp2))
- } else if exp2 < 0 {
- temp = temp.Lsh(temp, uint(-exp2))
- }
-
- // rounding and downscaling
- if exp > 0 || exp2 < 0 {
- halfDown := new(big.Int).Rsh(temp, 1)
- dMant = dMant.Add(dMant, halfDown)
- dMant = dMant.Quo(dMant, temp)
- }
-
- if sign == 1 {
- dMant = dMant.Neg(dMant)
- }
-
- return Decimal{
- value: dMant,
- exp: exp,
- }
-}
-
-// Copy returns a copy of decimal with the same value and exponent, but a different pointer to value.
-func (d Decimal) Copy() Decimal {
- d.ensureInitialized()
- return Decimal{
- value: new(big.Int).Set(d.value),
- exp: d.exp,
- }
-}
-
-// rescale returns a rescaled version of the decimal. Returned
-// decimal may be less precise if the given exponent is bigger
-// than the initial exponent of the Decimal.
-// NOTE: this will truncate, NOT round
-//
-// Example:
-//
-// d := New(12345, -4)
-// d2 := d.rescale(-1)
-// d3 := d2.rescale(-4)
-// println(d1)
-// println(d2)
-// println(d3)
-//
-// Output:
-//
-// 1.2345
-// 1.2
-// 1.2000
-func (d Decimal) rescale(exp int32) Decimal {
- d.ensureInitialized()
-
- if d.exp == exp {
- return Decimal{
- new(big.Int).Set(d.value),
- d.exp,
- }
- }
-
- // NOTE(vadim): must convert exps to float64 before - to prevent overflow
- diff := math.Abs(float64(exp) - float64(d.exp))
- value := new(big.Int).Set(d.value)
-
- expScale := new(big.Int).Exp(tenInt, big.NewInt(int64(diff)), nil)
- if exp > d.exp {
- value = value.Quo(value, expScale)
- } else if exp < d.exp {
- value = value.Mul(value, expScale)
- }
-
- return Decimal{
- value: value,
- exp: exp,
- }
-}
-
-// Abs returns the absolute value of the decimal.
-func (d Decimal) Abs() Decimal {
- if !d.IsNegative() {
- return d
- }
- d.ensureInitialized()
- d2Value := new(big.Int).Abs(d.value)
- return Decimal{
- value: d2Value,
- exp: d.exp,
- }
-}
-
-// Add returns d + d2.
-func (d Decimal) Add(d2 Decimal) Decimal {
- rd, rd2 := RescalePair(d, d2)
-
- d3Value := new(big.Int).Add(rd.value, rd2.value)
- return Decimal{
- value: d3Value,
- exp: rd.exp,
- }
-}
-
-// Sub returns d - d2.
-func (d Decimal) Sub(d2 Decimal) Decimal {
- rd, rd2 := RescalePair(d, d2)
-
- d3Value := new(big.Int).Sub(rd.value, rd2.value)
- return Decimal{
- value: d3Value,
- exp: rd.exp,
- }
-}
-
-// Neg returns -d.
-func (d Decimal) Neg() Decimal {
- d.ensureInitialized()
- val := new(big.Int).Neg(d.value)
- return Decimal{
- value: val,
- exp: d.exp,
- }
-}
-
-// Mul returns d * d2.
-func (d Decimal) Mul(d2 Decimal) Decimal {
- d.ensureInitialized()
- d2.ensureInitialized()
-
- expInt64 := int64(d.exp) + int64(d2.exp)
- if expInt64 > math.MaxInt32 || expInt64 < math.MinInt32 {
- // NOTE(vadim): better to panic than give incorrect results, as
- // Decimals are usually used for money
- panic(fmt.Sprintf("exponent %v overflows an int32!", expInt64))
- }
-
- d3Value := new(big.Int).Mul(d.value, d2.value)
- return Decimal{
- value: d3Value,
- exp: int32(expInt64),
- }
-}
-
-// Shift shifts the decimal in base 10.
-// It shifts left when shift is positive and right if shift is negative.
-// In simpler terms, the given value for shift is added to the exponent
-// of the decimal.
-func (d Decimal) Shift(shift int32) Decimal {
- d.ensureInitialized()
- return Decimal{
- value: new(big.Int).Set(d.value),
- exp: d.exp + shift,
- }
-}
-
-// Div returns d / d2. If it doesn't divide exactly, the result will have
-// DivisionPrecision digits after the decimal point.
-func (d Decimal) Div(d2 Decimal) Decimal {
- return d.DivRound(d2, int32(DivisionPrecision))
-}
-
-// QuoRem does division with remainder
-// d.QuoRem(d2,precision) returns quotient q and remainder r such that
-//
-// d = d2 * q + r, q an integer multiple of 10^(-precision)
-// 0 <= r < abs(d2) * 10 ^(-precision) if d>=0
-// 0 >= r > -abs(d2) * 10 ^(-precision) if d<0
-//
-// Note that precision<0 is allowed as input.
-func (d Decimal) QuoRem(d2 Decimal, precision int32) (Decimal, Decimal) {
- d.ensureInitialized()
- d2.ensureInitialized()
- if d2.value.Sign() == 0 {
- panic("decimal division by 0")
- }
- scale := -precision
- e := int64(d.exp) - int64(d2.exp) - int64(scale)
- if e > math.MaxInt32 || e < math.MinInt32 {
- panic("overflow in decimal QuoRem")
- }
- var aa, bb, expo big.Int
- var scalerest int32
- // d = a 10^ea
- // d2 = b 10^eb
- if e < 0 {
- aa = *d.value
- expo.SetInt64(-e)
- bb.Exp(tenInt, &expo, nil)
- bb.Mul(d2.value, &bb)
- scalerest = d.exp
- // now aa = a
- // bb = b 10^(scale + eb - ea)
- } else {
- expo.SetInt64(e)
- aa.Exp(tenInt, &expo, nil)
- aa.Mul(d.value, &aa)
- bb = *d2.value
- scalerest = scale + d2.exp
- // now aa = a ^ (ea - eb - scale)
- // bb = b
- }
- var q, r big.Int
- q.QuoRem(&aa, &bb, &r)
- dq := Decimal{value: &q, exp: scale}
- dr := Decimal{value: &r, exp: scalerest}
- return dq, dr
-}
-
-// DivRound divides and rounds to a given precision
-// i.e. to an integer multiple of 10^(-precision)
-//
-// for a positive quotient digit 5 is rounded up, away from 0
-// if the quotient is negative then digit 5 is rounded down, away from 0
-//
-// Note that precision<0 is allowed as input.
-func (d Decimal) DivRound(d2 Decimal, precision int32) Decimal {
- // QuoRem already checks initialization
- q, r := d.QuoRem(d2, precision)
- // the actual rounding decision is based on comparing r*10^precision and d2/2
- // instead compare 2 r 10 ^precision and d2
- var rv2 big.Int
- rv2.Abs(r.value)
- rv2.Lsh(&rv2, 1)
- // now rv2 = abs(r.value) * 2
- r2 := Decimal{value: &rv2, exp: r.exp + precision}
- // r2 is now 2 * r * 10 ^ precision
- var c = r2.Cmp(d2.Abs())
-
- if c < 0 {
- return q
- }
-
- if d.value.Sign()*d2.value.Sign() < 0 {
- return q.Sub(New(1, -precision))
- }
-
- return q.Add(New(1, -precision))
-}
-
-// Mod returns d % d2.
-func (d Decimal) Mod(d2 Decimal) Decimal {
- _, r := d.QuoRem(d2, 0)
- return r
-}
-
-// Pow returns d to the power of d2.
-// When exponent is negative the returned decimal will have maximum precision of PowPrecisionNegativeExponent places after decimal point.
-//
-// Pow returns 0 (zero-value of Decimal) instead of error for power operation edge cases, to handle those edge cases use PowWithPrecision
-// Edge cases not handled by Pow:
-// - 0 ** 0 => undefined value
-// - 0 ** y, where y < 0 => infinity
-// - x ** y, where x < 0 and y is non-integer decimal => imaginary value
-//
-// Example:
-//
-// d1 := decimal.NewFromFloat(4.0)
-// d2 := decimal.NewFromFloat(4.0)
-// res1 := d1.Pow(d2)
-// res1.String() // output: "256"
-//
-// d3 := decimal.NewFromFloat(5.0)
-// d4 := decimal.NewFromFloat(5.73)
-// res2 := d3.Pow(d4)
-// res2.String() // output: "10118.08037125"
-func (d Decimal) Pow(d2 Decimal) Decimal {
- baseSign := d.Sign()
- expSign := d2.Sign()
-
- if baseSign == 0 {
- if expSign == 0 {
- return Decimal{}
- }
- if expSign == 1 {
- return Decimal{zeroInt, 0}
- }
- if expSign == -1 {
- return Decimal{}
- }
- }
-
- if expSign == 0 {
- return Decimal{oneInt, 0}
- }
-
- // TODO: optimize extraction of fractional part
- one := Decimal{oneInt, 0}
- expIntPart, expFracPart := d2.QuoRem(one, 0)
-
- if baseSign == -1 && !expFracPart.IsZero() {
- return Decimal{}
- }
-
- intPartPow, _ := d.PowBigInt(expIntPart.value)
-
- // if exponent is an integer we don't need to calculate d1**frac(d2)
- if expFracPart.value.Sign() == 0 {
- return intPartPow
- }
-
- // TODO: optimize NumDigits for more performant precision adjustment
- digitsBase := d.NumDigits()
- digitsExponent := d2.NumDigits()
-
- precision := digitsBase
-
- if digitsExponent > precision {
- precision += digitsExponent
- }
-
- precision += 6
-
- // Calculate x ** frac(y), where
- // x ** frac(y) = exp(ln(x ** frac(y)) = exp(ln(x) * frac(y))
- fracPartPow, err := d.Abs().Ln(-d.exp + int32(precision))
- if err != nil {
- return Decimal{}
- }
-
- fracPartPow = fracPartPow.Mul(expFracPart)
-
- fracPartPow, err = fracPartPow.ExpTaylor(-d.exp + int32(precision))
- if err != nil {
- return Decimal{}
- }
-
- // Join integer and fractional part,
- // base ** (expBase + expFrac) = base ** expBase * base ** expFrac
- res := intPartPow.Mul(fracPartPow)
-
- return res
-}
-
-// PowWithPrecision returns d to the power of d2.
-// Precision parameter specifies minimum precision of the result (digits after decimal point).
-// Returned decimal is not rounded to 'precision' places after decimal point.
-//
-// PowWithPrecision returns error when:
-// - 0 ** 0 => undefined value
-// - 0 ** y, where y < 0 => infinity
-// - x ** y, where x < 0 and y is non-integer decimal => imaginary value
-//
-// Example:
-//
-// d1 := decimal.NewFromFloat(4.0)
-// d2 := decimal.NewFromFloat(4.0)
-// res1, err := d1.PowWithPrecision(d2, 2)
-// res1.String() // output: "256"
-//
-// d3 := decimal.NewFromFloat(5.0)
-// d4 := decimal.NewFromFloat(5.73)
-// res2, err := d3.PowWithPrecision(d4, 5)
-// res2.String() // output: "10118.080371595015625"
-//
-// d5 := decimal.NewFromFloat(-3.0)
-// d6 := decimal.NewFromFloat(-6.0)
-// res3, err := d5.PowWithPrecision(d6, 10)
-// res3.String() // output: "0.0013717421"
-func (d Decimal) PowWithPrecision(d2 Decimal, precision int32) (Decimal, error) {
- baseSign := d.Sign()
- expSign := d2.Sign()
-
- if baseSign == 0 {
- if expSign == 0 {
- return Decimal{}, fmt.Errorf("cannot represent undefined value of 0**0")
- }
- if expSign == 1 {
- return Decimal{zeroInt, 0}, nil
- }
- if expSign == -1 {
- return Decimal{}, fmt.Errorf("cannot represent infinity value of 0 ** y, where y < 0")
- }
- }
-
- if expSign == 0 {
- return Decimal{oneInt, 0}, nil
- }
-
- // TODO: optimize extraction of fractional part
- one := Decimal{oneInt, 0}
- expIntPart, expFracPart := d2.QuoRem(one, 0)
-
- if baseSign == -1 && !expFracPart.IsZero() {
- return Decimal{}, fmt.Errorf("cannot represent imaginary value of x ** y, where x < 0 and y is non-integer decimal")
- }
-
- intPartPow, _ := d.powBigIntWithPrecision(expIntPart.value, precision)
-
- // if exponent is an integer we don't need to calculate d1**frac(d2)
- if expFracPart.value.Sign() == 0 {
- return intPartPow, nil
- }
-
- // TODO: optimize NumDigits for more performant precision adjustment
- digitsBase := d.NumDigits()
- digitsExponent := d2.NumDigits()
-
- if int32(digitsBase) > precision {
- precision = int32(digitsBase)
- }
- if int32(digitsExponent) > precision {
- precision += int32(digitsExponent)
- }
- // increase precision by 10 to compensate for errors in further calculations
- precision += 10
-
- // Calculate x ** frac(y), where
- // x ** frac(y) = exp(ln(x ** frac(y)) = exp(ln(x) * frac(y))
- fracPartPow, err := d.Abs().Ln(precision)
- if err != nil {
- return Decimal{}, err
- }
-
- fracPartPow = fracPartPow.Mul(expFracPart)
-
- fracPartPow, err = fracPartPow.ExpTaylor(precision)
- if err != nil {
- return Decimal{}, err
- }
-
- // Join integer and fractional part,
- // base ** (expBase + expFrac) = base ** expBase * base ** expFrac
- res := intPartPow.Mul(fracPartPow)
-
- return res, nil
-}
-
-// PowInt32 returns d to the power of exp, where exp is int32.
-// Only returns error when d and exp is 0, thus result is undefined.
-//
-// When exponent is negative the returned decimal will have maximum precision of PowPrecisionNegativeExponent places after decimal point.
-//
-// Example:
-//
-// d1, err := decimal.NewFromFloat(4.0).PowInt32(4)
-// d1.String() // output: "256"
-//
-// d2, err := decimal.NewFromFloat(3.13).PowInt32(5)
-// d2.String() // output: "300.4150512793"
-func (d Decimal) PowInt32(exp int32) (Decimal, error) {
- if d.IsZero() && exp == 0 {
- return Decimal{}, fmt.Errorf("cannot represent undefined value of 0**0")
- }
-
- isExpNeg := exp < 0
- exp = abs(exp)
-
- n, result := d, New(1, 0)
-
- for exp > 0 {
- if exp%2 == 1 {
- result = result.Mul(n)
- }
- exp /= 2
-
- if exp > 0 {
- n = n.Mul(n)
- }
- }
-
- if isExpNeg {
- return New(1, 0).DivRound(result, int32(PowPrecisionNegativeExponent)), nil
- }
-
- return result, nil
-}
-
-// PowBigInt returns d to the power of exp, where exp is big.Int.
-// Only returns error when d and exp is 0, thus result is undefined.
-//
-// When exponent is negative the returned decimal will have maximum precision of PowPrecisionNegativeExponent places after decimal point.
-//
-// Example:
-//
-// d1, err := decimal.NewFromFloat(3.0).PowBigInt(big.NewInt(3))
-// d1.String() // output: "27"
-//
-// d2, err := decimal.NewFromFloat(629.25).PowBigInt(big.NewInt(5))
-// d2.String() // output: "98654323103449.5673828125"
-func (d Decimal) PowBigInt(exp *big.Int) (Decimal, error) {
- return d.powBigIntWithPrecision(exp, int32(PowPrecisionNegativeExponent))
-}
-
-func (d Decimal) powBigIntWithPrecision(exp *big.Int, precision int32) (Decimal, error) {
- if d.IsZero() && exp.Sign() == 0 {
- return Decimal{}, fmt.Errorf("cannot represent undefined value of 0**0")
- }
-
- tmpExp := new(big.Int).Set(exp)
- isExpNeg := exp.Sign() < 0
-
- if isExpNeg {
- tmpExp.Abs(tmpExp)
- }
-
- n, result := d, New(1, 0)
-
- for tmpExp.Sign() > 0 {
- if tmpExp.Bit(0) == 1 {
- result = result.Mul(n)
- }
- tmpExp.Rsh(tmpExp, 1)
-
- if tmpExp.Sign() > 0 {
- n = n.Mul(n)
- }
- }
-
- if isExpNeg {
- return New(1, 0).DivRound(result, precision), nil
- }
-
- return result, nil
-}
-
-// ExpHullAbrham calculates the natural exponent of decimal (e to the power of d) using Hull-Abraham algorithm.
-// OverallPrecision argument specifies the overall precision of the result (integer part + decimal part).
-//
-// ExpHullAbrham is faster than ExpTaylor for small precision values, but it is much slower for large precision values.
-//
-// Example:
-//
-// NewFromFloat(26.1).ExpHullAbrham(2).String() // output: "220000000000"
-// NewFromFloat(26.1).ExpHullAbrham(20).String() // output: "216314672147.05767284"
-func (d Decimal) ExpHullAbrham(overallPrecision uint32) (Decimal, error) {
- // Algorithm based on Variable precision exponential function.
- // ACM Transactions on Mathematical Software by T. E. Hull & A. Abrham.
- if d.IsZero() {
- return Decimal{oneInt, 0}, nil
- }
-
- currentPrecision := overallPrecision
-
- // Algorithm does not work if currentPrecision * 23 < |x|.
- // Precision is automatically increased in such cases, so the value can be calculated precisely.
- // If newly calculated precision is higher than ExpMaxIterations the currentPrecision will not be changed.
- f := d.Abs().InexactFloat64()
- if ncp := f / 23; ncp > float64(currentPrecision) && ncp < float64(ExpMaxIterations) {
- currentPrecision = uint32(math.Ceil(ncp))
- }
-
- // fail if abs(d) beyond an over/underflow threshold
- overflowThreshold := New(23*int64(currentPrecision), 0)
- if d.Abs().Cmp(overflowThreshold) > 0 {
- return Decimal{}, fmt.Errorf("over/underflow threshold, exp(x) cannot be calculated precisely")
- }
-
- // Return 1 if abs(d) small enough; this also avoids later over/underflow
- overflowThreshold2 := New(9, -int32(currentPrecision)-1)
- if d.Abs().Cmp(overflowThreshold2) <= 0 {
- return Decimal{oneInt, d.exp}, nil
- }
-
- // t is the smallest integer >= 0 such that the corresponding abs(d/k) < 1
- t := d.exp + int32(d.NumDigits()) // Add d.NumDigits because the paper assumes that d.value [0.1, 1)
-
- if t < 0 {
- t = 0
- }
-
- k := New(1, t) // reduction factor
- r := Decimal{new(big.Int).Set(d.value), d.exp - t} // reduced argument
- p := int32(currentPrecision) + t + 2 // precision for calculating the sum
-
- // Determine n, the number of therms for calculating sum
- // use first Newton step (1.435p - 1.182) / log10(p/abs(r))
- // for solving appropriate equation, along with directed
- // roundings and simple rational bound for log10(p/abs(r))
- rf := r.Abs().InexactFloat64()
- pf := float64(p)
- nf := math.Ceil((1.453*pf - 1.182) / math.Log10(pf/rf))
- if nf > float64(ExpMaxIterations) || math.IsNaN(nf) {
- return Decimal{}, fmt.Errorf("exact value cannot be calculated in <=ExpMaxIterations iterations")
- }
- n := int64(nf)
-
- tmp := New(0, 0)
- sum := New(1, 0)
- one := New(1, 0)
- for i := n - 1; i > 0; i-- {
- tmp.value.SetInt64(i)
- sum = sum.Mul(r.DivRound(tmp, p))
- sum = sum.Add(one)
- }
-
- ki := k.IntPart()
- res := New(1, 0)
- for i := ki; i > 0; i-- {
- res = res.Mul(sum)
- }
-
- resNumDigits := int32(res.NumDigits())
-
- var roundDigits int32
- if resNumDigits > abs(res.exp) {
- roundDigits = int32(currentPrecision) - resNumDigits - res.exp
- } else {
- roundDigits = int32(currentPrecision)
- }
-
- res = res.Round(roundDigits)
-
- return res, nil
-}
-
-// ExpTaylor calculates the natural exponent of decimal (e to the power of d) using Taylor series expansion.
-// Precision argument specifies how precise the result must be (number of digits after decimal point).
-// Negative precision is allowed.
-//
-// ExpTaylor is much faster for large precision values than ExpHullAbrham.
-//
-// Example:
-//
-// d, err := NewFromFloat(26.1).ExpTaylor(2).String()
-// d.String() // output: "216314672147.06"
-//
-// NewFromFloat(26.1).ExpTaylor(20).String()
-// d.String() // output: "216314672147.05767284062928674083"
-//
-// NewFromFloat(26.1).ExpTaylor(-10).String()
-// d.String() // output: "220000000000"
-func (d Decimal) ExpTaylor(precision int32) (Decimal, error) {
- // Note(mwoss): Implementation can be optimized by exclusively using big.Int API only
- if d.IsZero() {
- return Decimal{oneInt, 0}.Round(precision), nil
- }
-
- var epsilon Decimal
- var divPrecision int32
- if precision < 0 {
- epsilon = New(1, -1)
- divPrecision = 8
- } else {
- epsilon = New(1, -precision-1)
- divPrecision = precision + 1
- }
-
- decAbs := d.Abs()
- pow := d.Abs()
- factorial := New(1, 0)
-
- result := New(1, 0)
-
- for i := int64(1); ; {
- step := pow.DivRound(factorial, divPrecision)
- result = result.Add(step)
-
- // Stop Taylor series when current step is smaller than epsilon
- if step.Cmp(epsilon) < 0 {
- break
- }
-
- pow = pow.Mul(decAbs)
-
- i++
-
- // Calculate next factorial number or retrieve cached value
- if len(factorials) >= int(i) && !factorials[i-1].IsZero() {
- factorial = factorials[i-1]
- } else {
- // To avoid any race conditions, firstly the zero value is appended to a slice to create
- // a spot for newly calculated factorial. After that, the zero value is replaced by calculated
- // factorial using the index notation.
- factorial = factorials[i-2].Mul(New(i, 0))
- factorials = append(factorials, Zero)
- factorials[i-1] = factorial
- }
- }
-
- if d.Sign() < 0 {
- result = New(1, 0).DivRound(result, precision+1)
- }
-
- result = result.Round(precision)
- return result, nil
-}
-
-// Ln calculates natural logarithm of d.
-// Precision argument specifies how precise the result must be (number of digits after decimal point).
-// Negative precision is allowed.
-//
-// Example:
-//
-// d1, err := NewFromFloat(13.3).Ln(2)
-// d1.String() // output: "2.59"
-//
-// d2, err := NewFromFloat(579.161).Ln(10)
-// d2.String() // output: "6.3615805046"
-func (d Decimal) Ln(precision int32) (Decimal, error) {
- // Algorithm based on The Use of Iteration Methods for Approximating the Natural Logarithm,
- // James F. Epperson, The American Mathematical Monthly, Vol. 96, No. 9, November 1989, pp. 831-835.
- if d.IsNegative() {
- return Decimal{}, fmt.Errorf("cannot calculate natural logarithm for negative decimals")
- }
-
- if d.IsZero() {
- return Decimal{}, fmt.Errorf("cannot represent natural logarithm of 0, result: -infinity")
- }
-
- calcPrecision := precision + 2
- z := d.Copy()
-
- var comp1, comp3, comp2, comp4, reduceAdjust Decimal
- comp1 = z.Sub(Decimal{oneInt, 0})
- comp3 = Decimal{oneInt, -1}
-
- // for decimal in range [0.9, 1.1] where ln(d) is close to 0
- usePowerSeries := false
-
- if comp1.Abs().Cmp(comp3) <= 0 {
- usePowerSeries = true
- } else {
- // reduce input decimal to range [0.1, 1)
- expDelta := int32(z.NumDigits()) + z.exp
- z.exp -= expDelta
-
- // Input decimal was reduced by factor of 10^expDelta, thus we will need to add
- // ln(10^expDelta) = expDelta * ln(10)
- // to the result to compensate that
- ln10 := ln10.withPrecision(calcPrecision)
- reduceAdjust = NewFromInt32(expDelta)
- reduceAdjust = reduceAdjust.Mul(ln10)
-
- comp1 = z.Sub(Decimal{oneInt, 0})
-
- if comp1.Abs().Cmp(comp3) <= 0 {
- usePowerSeries = true
- } else {
- // initial estimate using floats
- zFloat := z.InexactFloat64()
- comp1 = NewFromFloat(math.Log(zFloat))
- }
- }
-
- epsilon := Decimal{oneInt, -calcPrecision}
-
- if usePowerSeries {
- // Power Series - https://en.wikipedia.org/wiki/Logarithm#Power_series
- // Calculating n-th term of formula: ln(z+1) = 2 sum [ 1 / (2n+1) * (z / (z+2))^(2n+1) ]
- // until the difference between current and next term is smaller than epsilon.
- // Coverage quite fast for decimals close to 1.0
-
- // z + 2
- comp2 = comp1.Add(Decimal{twoInt, 0})
- // z / (z + 2)
- comp3 = comp1.DivRound(comp2, calcPrecision)
- // 2 * (z / (z + 2))
- comp1 = comp3.Add(comp3)
- comp2 = comp1.Copy()
-
- for n := 1; ; n++ {
- // 2 * (z / (z+2))^(2n+1)
- comp2 = comp2.Mul(comp3).Mul(comp3)
-
- // 1 / (2n+1) * 2 * (z / (z+2))^(2n+1)
- comp4 = NewFromInt(int64(2*n + 1))
- comp4 = comp2.DivRound(comp4, calcPrecision)
-
- // comp1 = 2 sum [ 1 / (2n+1) * (z / (z+2))^(2n+1) ]
- comp1 = comp1.Add(comp4)
-
- if comp4.Abs().Cmp(epsilon) <= 0 {
- break
- }
- }
- } else {
- // Halley's Iteration.
- // Calculating n-th term of formula: a_(n+1) = a_n - 2 * (exp(a_n) - z) / (exp(a_n) + z),
- // until the difference between current and next term is smaller than epsilon
- var prevStep Decimal
- maxIters := calcPrecision*2 + 10
-
- for i := int32(0); i < maxIters; i++ {
- // exp(a_n)
- comp3, _ = comp1.ExpTaylor(calcPrecision)
- // exp(a_n) - z
- comp2 = comp3.Sub(z)
- // 2 * (exp(a_n) - z)
- comp2 = comp2.Add(comp2)
- // exp(a_n) + z
- comp4 = comp3.Add(z)
- // 2 * (exp(a_n) - z) / (exp(a_n) + z)
- comp3 = comp2.DivRound(comp4, calcPrecision)
- // comp1 = a_(n+1) = a_n - 2 * (exp(a_n) - z) / (exp(a_n) + z)
- comp1 = comp1.Sub(comp3)
-
- if prevStep.Add(comp3).IsZero() {
- // If iteration steps oscillate we should return early and prevent an infinity loop
- // NOTE(mwoss): This should be quite a rare case, returning error is not necessary
- break
- }
-
- if comp3.Abs().Cmp(epsilon) <= 0 {
- break
- }
-
- prevStep = comp3
- }
- }
-
- comp1 = comp1.Add(reduceAdjust)
-
- return comp1.Round(precision), nil
-}
-
-// NumDigits returns the number of digits of the decimal coefficient (d.Value)
-func (d Decimal) NumDigits() int {
- if d.value == nil {
- return 1
- }
-
- if d.value.IsInt64() {
- i64 := d.value.Int64()
- // restrict fast path to integers with exact conversion to float64
- if i64 <= (1<<53) && i64 >= -(1<<53) {
- if i64 == 0 {
- return 1
- }
- return int(math.Log10(math.Abs(float64(i64)))) + 1
- }
- }
-
- estimatedNumDigits := int(float64(d.value.BitLen()) / math.Log2(10))
-
- // estimatedNumDigits (lg10) may be off by 1, need to verify
- digitsBigInt := big.NewInt(int64(estimatedNumDigits))
- errorCorrectionUnit := digitsBigInt.Exp(tenInt, digitsBigInt, nil)
-
- if d.value.CmpAbs(errorCorrectionUnit) >= 0 {
- return estimatedNumDigits + 1
- }
-
- return estimatedNumDigits
-}
-
-// IsInteger returns true when decimal can be represented as an integer value, otherwise, it returns false.
-func (d Decimal) IsInteger() bool {
- // The most typical case, all decimal with exponent higher or equal 0 can be represented as integer
- if d.exp >= 0 {
- return true
- }
- // When the exponent is negative we have to check every number after the decimal place
- // If all of them are zeroes, we are sure that given decimal can be represented as an integer
- var r big.Int
- q := new(big.Int).Set(d.value)
- for z := abs(d.exp); z > 0; z-- {
- q.QuoRem(q, tenInt, &r)
- if r.Cmp(zeroInt) != 0 {
- return false
- }
- }
- return true
-}
-
-// Abs calculates absolute value of any int32. Used for calculating absolute value of decimal's exponent.
-func abs(n int32) int32 {
- if n < 0 {
- return -n
- }
- return n
-}
-
-// Cmp compares the numbers represented by d and d2 and returns:
-//
-// -1 if d < d2
-// 0 if d == d2
-// +1 if d > d2
-func (d Decimal) Cmp(d2 Decimal) int {
- d.ensureInitialized()
- d2.ensureInitialized()
-
- if d.exp == d2.exp {
- return d.value.Cmp(d2.value)
- }
-
- rd, rd2 := RescalePair(d, d2)
-
- return rd.value.Cmp(rd2.value)
-}
-
-// Compare compares the numbers represented by d and d2 and returns:
-//
-// -1 if d < d2
-// 0 if d == d2
-// +1 if d > d2
-func (d Decimal) Compare(d2 Decimal) int {
- return d.Cmp(d2)
-}
-
-// Equal returns whether the numbers represented by d and d2 are equal.
-func (d Decimal) Equal(d2 Decimal) bool {
- return d.Cmp(d2) == 0
-}
-
-// Deprecated: Equals is deprecated, please use Equal method instead.
-func (d Decimal) Equals(d2 Decimal) bool {
- return d.Equal(d2)
-}
-
-// GreaterThan (GT) returns true when d is greater than d2.
-func (d Decimal) GreaterThan(d2 Decimal) bool {
- return d.Cmp(d2) == 1
-}
-
-// GreaterThanOrEqual (GTE) returns true when d is greater than or equal to d2.
-func (d Decimal) GreaterThanOrEqual(d2 Decimal) bool {
- cmp := d.Cmp(d2)
- return cmp == 1 || cmp == 0
-}
-
-// LessThan (LT) returns true when d is less than d2.
-func (d Decimal) LessThan(d2 Decimal) bool {
- return d.Cmp(d2) == -1
-}
-
-// LessThanOrEqual (LTE) returns true when d is less than or equal to d2.
-func (d Decimal) LessThanOrEqual(d2 Decimal) bool {
- cmp := d.Cmp(d2)
- return cmp == -1 || cmp == 0
-}
-
-// Sign returns:
-//
-// -1 if d < 0
-// 0 if d == 0
-// +1 if d > 0
-func (d Decimal) Sign() int {
- if d.value == nil {
- return 0
- }
- return d.value.Sign()
-}
-
-// IsPositive return
-//
-// true if d > 0
-// false if d == 0
-// false if d < 0
-func (d Decimal) IsPositive() bool {
- return d.Sign() == 1
-}
-
-// IsNegative return
-//
-// true if d < 0
-// false if d == 0
-// false if d > 0
-func (d Decimal) IsNegative() bool {
- return d.Sign() == -1
-}
-
-// IsZero return
-//
-// true if d == 0
-// false if d > 0
-// false if d < 0
-func (d Decimal) IsZero() bool {
- return d.Sign() == 0
-}
-
-// Exponent returns the exponent, or scale component of the decimal.
-func (d Decimal) Exponent() int32 {
- return d.exp
-}
-
-// Coefficient returns the coefficient of the decimal. It is scaled by 10^Exponent()
-func (d Decimal) Coefficient() *big.Int {
- d.ensureInitialized()
- // we copy the coefficient so that mutating the result does not mutate the Decimal.
- return new(big.Int).Set(d.value)
-}
-
-// CoefficientInt64 returns the coefficient of the decimal as int64. It is scaled by 10^Exponent()
-// If coefficient cannot be represented in an int64, the result will be undefined.
-func (d Decimal) CoefficientInt64() int64 {
- d.ensureInitialized()
- return d.value.Int64()
-}
-
-// IntPart returns the integer component of the decimal.
-func (d Decimal) IntPart() int64 {
- scaledD := d.rescale(0)
- return scaledD.value.Int64()
-}
-
-// BigInt returns integer component of the decimal as a BigInt.
-func (d Decimal) BigInt() *big.Int {
- scaledD := d.rescale(0)
- return scaledD.value
-}
-
-// BigFloat returns decimal as BigFloat.
-// Be aware that casting decimal to BigFloat might cause a loss of precision.
-func (d Decimal) BigFloat() *big.Float {
- f := &big.Float{}
- f.SetString(d.String())
- return f
-}
-
-// Rat returns a rational number representation of the decimal.
-func (d Decimal) Rat() *big.Rat {
- d.ensureInitialized()
- if d.exp <= 0 {
- // NOTE(vadim): must negate after casting to prevent int32 overflow
- denom := new(big.Int).Exp(tenInt, big.NewInt(-int64(d.exp)), nil)
- return new(big.Rat).SetFrac(d.value, denom)
- }
-
- mul := new(big.Int).Exp(tenInt, big.NewInt(int64(d.exp)), nil)
- num := new(big.Int).Mul(d.value, mul)
- return new(big.Rat).SetFrac(num, oneInt)
-}
-
-// Float64 returns the nearest float64 value for d and a bool indicating
-// whether f represents d exactly.
-// For more details, see the documentation for big.Rat.Float64
-func (d Decimal) Float64() (f float64, exact bool) {
- return d.Rat().Float64()
-}
-
-// InexactFloat64 returns the nearest float64 value for d.
-// It doesn't indicate if the returned value represents d exactly.
-func (d Decimal) InexactFloat64() float64 {
- f, _ := d.Float64()
- return f
-}
-
-// String returns the string representation of the decimal
-// with the fixed point.
-//
-// Example:
-//
-// d := New(-12345, -3)
-// println(d.String())
-//
-// Output:
-//
-// -12.345
-func (d Decimal) String() string {
- return d.string(true)
-}
-
-// StringFixed returns a rounded fixed-point string with places digits after
-// the decimal point.
-//
-// Example:
-//
-// NewFromFloat(0).StringFixed(2) // output: "0.00"
-// NewFromFloat(0).StringFixed(0) // output: "0"
-// NewFromFloat(5.45).StringFixed(0) // output: "5"
-// NewFromFloat(5.45).StringFixed(1) // output: "5.5"
-// NewFromFloat(5.45).StringFixed(2) // output: "5.45"
-// NewFromFloat(5.45).StringFixed(3) // output: "5.450"
-// NewFromFloat(545).StringFixed(-1) // output: "550"
-func (d Decimal) StringFixed(places int32) string {
- rounded := d.Round(places)
- return rounded.string(false)
-}
-
-// StringFixedBank returns a banker rounded fixed-point string with places digits
-// after the decimal point.
-//
-// Example:
-//
-// NewFromFloat(0).StringFixedBank(2) // output: "0.00"
-// NewFromFloat(0).StringFixedBank(0) // output: "0"
-// NewFromFloat(5.45).StringFixedBank(0) // output: "5"
-// NewFromFloat(5.45).StringFixedBank(1) // output: "5.4"
-// NewFromFloat(5.45).StringFixedBank(2) // output: "5.45"
-// NewFromFloat(5.45).StringFixedBank(3) // output: "5.450"
-// NewFromFloat(545).StringFixedBank(-1) // output: "540"
-func (d Decimal) StringFixedBank(places int32) string {
- rounded := d.RoundBank(places)
- return rounded.string(false)
-}
-
-// StringFixedCash returns a Swedish/Cash rounded fixed-point string. For
-// more details see the documentation at function RoundCash.
-func (d Decimal) StringFixedCash(interval uint8) string {
- rounded := d.RoundCash(interval)
- return rounded.string(false)
-}
-
-// Round rounds the decimal to places decimal places.
-// If places < 0, it will round the integer part to the nearest 10^(-places).
-//
-// Example:
-//
-// NewFromFloat(5.45).Round(1).String() // output: "5.5"
-// NewFromFloat(545).Round(-1).String() // output: "550"
-func (d Decimal) Round(places int32) Decimal {
- if d.exp == -places {
- return d
- }
- // truncate to places + 1
- ret := d.rescale(-places - 1)
-
- // add sign(d) * 0.5
- if ret.value.Sign() < 0 {
- ret.value.Sub(ret.value, fiveInt)
- } else {
- ret.value.Add(ret.value, fiveInt)
- }
-
- // floor for positive numbers, ceil for negative numbers
- _, m := ret.value.DivMod(ret.value, tenInt, new(big.Int))
- ret.exp++
- if ret.value.Sign() < 0 && m.Cmp(zeroInt) != 0 {
- ret.value.Add(ret.value, oneInt)
- }
-
- return ret
-}
-
-// RoundCeil rounds the decimal towards +infinity.
-//
-// Example:
-//
-// NewFromFloat(545).RoundCeil(-2).String() // output: "600"
-// NewFromFloat(500).RoundCeil(-2).String() // output: "500"
-// NewFromFloat(1.1001).RoundCeil(2).String() // output: "1.11"
-// NewFromFloat(-1.454).RoundCeil(1).String() // output: "-1.4"
-func (d Decimal) RoundCeil(places int32) Decimal {
- if d.exp >= -places {
- return d
- }
-
- rescaled := d.rescale(-places)
- if d.Equal(rescaled) {
- return d
- }
-
- if d.value.Sign() > 0 {
- rescaled.value.Add(rescaled.value, oneInt)
- }
-
- return rescaled
-}
-
-// RoundFloor rounds the decimal towards -infinity.
-//
-// Example:
-//
-// NewFromFloat(545).RoundFloor(-2).String() // output: "500"
-// NewFromFloat(-500).RoundFloor(-2).String() // output: "-500"
-// NewFromFloat(1.1001).RoundFloor(2).String() // output: "1.1"
-// NewFromFloat(-1.454).RoundFloor(1).String() // output: "-1.5"
-func (d Decimal) RoundFloor(places int32) Decimal {
- if d.exp >= -places {
- return d
- }
-
- rescaled := d.rescale(-places)
- if d.Equal(rescaled) {
- return d
- }
-
- if d.value.Sign() < 0 {
- rescaled.value.Sub(rescaled.value, oneInt)
- }
-
- return rescaled
-}
-
-// RoundUp rounds the decimal away from zero.
-//
-// Example:
-//
-// NewFromFloat(545).RoundUp(-2).String() // output: "600"
-// NewFromFloat(500).RoundUp(-2).String() // output: "500"
-// NewFromFloat(1.1001).RoundUp(2).String() // output: "1.11"
-// NewFromFloat(-1.454).RoundUp(1).String() // output: "-1.5"
-func (d Decimal) RoundUp(places int32) Decimal {
- if d.exp >= -places {
- return d
- }
-
- rescaled := d.rescale(-places)
- if d.Equal(rescaled) {
- return d
- }
-
- if d.value.Sign() > 0 {
- rescaled.value.Add(rescaled.value, oneInt)
- } else if d.value.Sign() < 0 {
- rescaled.value.Sub(rescaled.value, oneInt)
- }
-
- return rescaled
-}
-
-// RoundDown rounds the decimal towards zero.
-//
-// Example:
-//
-// NewFromFloat(545).RoundDown(-2).String() // output: "500"
-// NewFromFloat(-500).RoundDown(-2).String() // output: "-500"
-// NewFromFloat(1.1001).RoundDown(2).String() // output: "1.1"
-// NewFromFloat(-1.454).RoundDown(1).String() // output: "-1.4"
-func (d Decimal) RoundDown(places int32) Decimal {
- if d.exp >= -places {
- return d
- }
-
- rescaled := d.rescale(-places)
- if d.Equal(rescaled) {
- return d
- }
- return rescaled
-}
-
-// RoundBank rounds the decimal to places decimal places.
-// If the final digit to round is equidistant from the nearest two integers the
-// rounded value is taken as the even number
-//
-// If places < 0, it will round the integer part to the nearest 10^(-places).
-//
-// Examples:
-//
-// NewFromFloat(5.45).RoundBank(1).String() // output: "5.4"
-// NewFromFloat(545).RoundBank(-1).String() // output: "540"
-// NewFromFloat(5.46).RoundBank(1).String() // output: "5.5"
-// NewFromFloat(546).RoundBank(-1).String() // output: "550"
-// NewFromFloat(5.55).RoundBank(1).String() // output: "5.6"
-// NewFromFloat(555).RoundBank(-1).String() // output: "560"
-func (d Decimal) RoundBank(places int32) Decimal {
-
- round := d.Round(places)
- remainder := d.Sub(round).Abs()
-
- half := New(5, -places-1)
- if remainder.Cmp(half) == 0 && round.value.Bit(0) != 0 {
- if round.value.Sign() < 0 {
- round.value.Add(round.value, oneInt)
- } else {
- round.value.Sub(round.value, oneInt)
- }
- }
-
- return round
-}
-
-// RoundCash aka Cash/Penny/öre rounding rounds decimal to a specific
-// interval. The amount payable for a cash transaction is rounded to the nearest
-// multiple of the minimum currency unit available. The following intervals are
-// available: 5, 10, 25, 50 and 100; any other number throws a panic.
-//
-// 5: 5 cent rounding 3.43 => 3.45
-// 10: 10 cent rounding 3.45 => 3.50 (5 gets rounded up)
-// 25: 25 cent rounding 3.41 => 3.50
-// 50: 50 cent rounding 3.75 => 4.00
-// 100: 100 cent rounding 3.50 => 4.00
-//
-// For more details: https://en.wikipedia.org/wiki/Cash_rounding
-func (d Decimal) RoundCash(interval uint8) Decimal {
- var iVal *big.Int
- switch interval {
- case 5:
- iVal = twentyInt
- case 10:
- iVal = tenInt
- case 25:
- iVal = fourInt
- case 50:
- iVal = twoInt
- case 100:
- iVal = oneInt
- default:
- panic(fmt.Sprintf("Decimal does not support this Cash rounding interval `%d`. Supported: 5, 10, 25, 50, 100", interval))
- }
- dVal := Decimal{
- value: iVal,
- }
-
- // TODO: optimize those calculations to reduce the high allocations (~29 allocs).
- return d.Mul(dVal).Round(0).Div(dVal).Truncate(2)
-}
-
-// Floor returns the nearest integer value less than or equal to d.
-func (d Decimal) Floor() Decimal {
- d.ensureInitialized()
-
- if d.exp >= 0 {
- return d
- }
-
- exp := big.NewInt(10)
-
- // NOTE(vadim): must negate after casting to prevent int32 overflow
- exp.Exp(exp, big.NewInt(-int64(d.exp)), nil)
-
- z := new(big.Int).Div(d.value, exp)
- return Decimal{value: z, exp: 0}
-}
-
-// Ceil returns the nearest integer value greater than or equal to d.
-func (d Decimal) Ceil() Decimal {
- d.ensureInitialized()
-
- if d.exp >= 0 {
- return d
- }
-
- exp := big.NewInt(10)
-
- // NOTE(vadim): must negate after casting to prevent int32 overflow
- exp.Exp(exp, big.NewInt(-int64(d.exp)), nil)
-
- z, m := new(big.Int).DivMod(d.value, exp, new(big.Int))
- if m.Cmp(zeroInt) != 0 {
- z.Add(z, oneInt)
- }
- return Decimal{value: z, exp: 0}
-}
-
-// Truncate truncates off digits from the number, without rounding.
-//
-// NOTE: precision is the last digit that will not be truncated (must be >= 0).
-//
-// Example:
-//
-// decimal.NewFromString("123.456").Truncate(2).String() // "123.45"
-func (d Decimal) Truncate(precision int32) Decimal {
- d.ensureInitialized()
- if precision >= 0 && -precision > d.exp {
- return d.rescale(-precision)
- }
- return d
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-func (d *Decimal) UnmarshalJSON(decimalBytes []byte) error {
- if string(decimalBytes) == "null" {
- return nil
- }
-
- str, err := unquoteIfQuoted(decimalBytes)
- if err != nil {
- return fmt.Errorf("error decoding string '%s': %s", decimalBytes, err)
- }
-
- decimal, err := NewFromString(str)
- *d = decimal
- if err != nil {
- return fmt.Errorf("error decoding string '%s': %s", str, err)
- }
- return nil
-}
-
-// MarshalJSON implements the json.Marshaler interface.
-func (d Decimal) MarshalJSON() ([]byte, error) {
- var str string
- if MarshalJSONWithoutQuotes {
- str = d.String()
- } else {
- str = "\"" + d.String() + "\""
- }
- return []byte(str), nil
-}
-
-// UnmarshalBinary implements the encoding.BinaryUnmarshaler interface. As a string representation
-// is already used when encoding to text, this method stores that string as []byte
-func (d *Decimal) UnmarshalBinary(data []byte) error {
- // Verify we have at least 4 bytes for the exponent. The GOB encoded value
- // may be empty.
- if len(data) < 4 {
- return fmt.Errorf("error decoding binary %v: expected at least 4 bytes, got %d", data, len(data))
- }
-
- // Extract the exponent
- d.exp = int32(binary.BigEndian.Uint32(data[:4]))
-
- // Extract the value
- d.value = new(big.Int)
- if err := d.value.GobDecode(data[4:]); err != nil {
- return fmt.Errorf("error decoding binary %v: %s", data, err)
- }
-
- return nil
-}
-
-// MarshalBinary implements the encoding.BinaryMarshaler interface.
-func (d Decimal) MarshalBinary() (data []byte, err error) {
- // exp is written first, but encode value first to know output size
- var valueData []byte
- if valueData, err = d.value.GobEncode(); err != nil {
- return nil, err
- }
-
- // Write the exponent in front, since it's a fixed size
- expData := make([]byte, 4, len(valueData)+4)
- binary.BigEndian.PutUint32(expData, uint32(d.exp))
-
- // Return the byte array
- return append(expData, valueData...), nil
-}
-
-// Scan implements the sql.Scanner interface for database deserialization.
-func (d *Decimal) Scan(value interface{}) error {
- // first try to see if the data is stored in database as a Numeric datatype
- switch v := value.(type) {
-
- case float32:
- *d = NewFromFloat(float64(v))
- return nil
-
- case float64:
- // numeric in sqlite3 sends us float64
- *d = NewFromFloat(v)
- return nil
-
- case int64:
- // at least in sqlite3 when the value is 0 in db, the data is sent
- // to us as an int64 instead of a float64 ...
- *d = New(v, 0)
- return nil
-
- case uint64:
- // while clickhouse may send 0 in db as uint64
- *d = NewFromUint64(v)
- return nil
-
- default:
- // default is trying to interpret value stored as string
- str, err := unquoteIfQuoted(v)
- if err != nil {
- return err
- }
- *d, err = NewFromString(str)
- return err
- }
-}
-
-// Value implements the driver.Valuer interface for database serialization.
-func (d Decimal) Value() (driver.Value, error) {
- return d.String(), nil
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface for XML
-// deserialization.
-func (d *Decimal) UnmarshalText(text []byte) error {
- str := string(text)
-
- dec, err := NewFromString(str)
- *d = dec
- if err != nil {
- return fmt.Errorf("error decoding string '%s': %s", str, err)
- }
-
- return nil
-}
-
-// MarshalText implements the encoding.TextMarshaler interface for XML
-// serialization.
-func (d Decimal) MarshalText() (text []byte, err error) {
- return []byte(d.String()), nil
-}
-
-// GobEncode implements the gob.GobEncoder interface for gob serialization.
-func (d Decimal) GobEncode() ([]byte, error) {
- return d.MarshalBinary()
-}
-
-// GobDecode implements the gob.GobDecoder interface for gob serialization.
-func (d *Decimal) GobDecode(data []byte) error {
- return d.UnmarshalBinary(data)
-}
-
-// StringScaled first scales the decimal then calls .String() on it.
-//
-// Deprecated: buggy and unintuitive. Use StringFixed instead.
-func (d Decimal) StringScaled(exp int32) string {
- return d.rescale(exp).String()
-}
-
-func (d Decimal) string(trimTrailingZeros bool) string {
- if d.exp >= 0 {
- return d.rescale(0).value.String()
- }
-
- abs := new(big.Int).Abs(d.value)
- str := abs.String()
-
- var intPart, fractionalPart string
-
- // NOTE(vadim): this cast to int will cause bugs if d.exp == INT_MIN
- // and you are on a 32-bit machine. Won't fix this super-edge case.
- dExpInt := int(d.exp)
- if len(str) > -dExpInt {
- intPart = str[:len(str)+dExpInt]
- fractionalPart = str[len(str)+dExpInt:]
- } else {
- intPart = "0"
-
- num0s := -dExpInt - len(str)
- fractionalPart = strings.Repeat("0", num0s) + str
- }
-
- if trimTrailingZeros {
- i := len(fractionalPart) - 1
- for ; i >= 0; i-- {
- if fractionalPart[i] != '0' {
- break
- }
- }
- fractionalPart = fractionalPart[:i+1]
- }
-
- number := intPart
- if len(fractionalPart) > 0 {
- number += "." + fractionalPart
- }
-
- if d.value.Sign() < 0 {
- return "-" + number
- }
-
- return number
-}
-
-func (d *Decimal) ensureInitialized() {
- if d.value == nil {
- d.value = new(big.Int)
- }
-}
-
-// Min returns the smallest Decimal that was passed in the arguments.
-//
-// To call this function with an array, you must do:
-//
-// Min(arr[0], arr[1:]...)
-//
-// This makes it harder to accidentally call Min with 0 arguments.
-func Min(first Decimal, rest ...Decimal) Decimal {
- ans := first
- for _, item := range rest {
- if item.Cmp(ans) < 0 {
- ans = item
- }
- }
- return ans
-}
-
-// Max returns the largest Decimal that was passed in the arguments.
-//
-// To call this function with an array, you must do:
-//
-// Max(arr[0], arr[1:]...)
-//
-// This makes it harder to accidentally call Max with 0 arguments.
-func Max(first Decimal, rest ...Decimal) Decimal {
- ans := first
- for _, item := range rest {
- if item.Cmp(ans) > 0 {
- ans = item
- }
- }
- return ans
-}
-
-// Sum returns the combined total of the provided first and rest Decimals
-func Sum(first Decimal, rest ...Decimal) Decimal {
- total := first
- for _, item := range rest {
- total = total.Add(item)
- }
-
- return total
-}
-
-// Avg returns the average value of the provided first and rest Decimals
-func Avg(first Decimal, rest ...Decimal) Decimal {
- count := New(int64(len(rest)+1), 0)
- sum := Sum(first, rest...)
- return sum.Div(count)
-}
-
-// RescalePair rescales two decimals to common exponential value (minimal exp of both decimals)
-func RescalePair(d1 Decimal, d2 Decimal) (Decimal, Decimal) {
- d1.ensureInitialized()
- d2.ensureInitialized()
-
- if d1.exp < d2.exp {
- return d1, d2.rescale(d1.exp)
- } else if d1.exp > d2.exp {
- return d1.rescale(d2.exp), d2
- }
-
- return d1, d2
-}
-
-func unquoteIfQuoted(value interface{}) (string, error) {
- var bytes []byte
-
- switch v := value.(type) {
- case string:
- bytes = []byte(v)
- case []byte:
- bytes = v
- default:
- return "", fmt.Errorf("could not convert value '%+v' to byte array of type '%T'", value, value)
- }
-
- // If the amount is quoted, strip the quotes
- if len(bytes) > 2 && bytes[0] == '"' && bytes[len(bytes)-1] == '"' {
- bytes = bytes[1 : len(bytes)-1]
- }
- return string(bytes), nil
-}
-
-// NullDecimal represents a nullable decimal with compatibility for
-// scanning null values from the database.
-type NullDecimal struct {
- Decimal Decimal
- Valid bool
-}
-
-func NewNullDecimal(d Decimal) NullDecimal {
- return NullDecimal{
- Decimal: d,
- Valid: true,
- }
-}
-
-// Scan implements the sql.Scanner interface for database deserialization.
-func (d *NullDecimal) Scan(value interface{}) error {
- if value == nil {
- d.Valid = false
- return nil
- }
- d.Valid = true
- return d.Decimal.Scan(value)
-}
-
-// Value implements the driver.Valuer interface for database serialization.
-func (d NullDecimal) Value() (driver.Value, error) {
- if !d.Valid {
- return nil, nil
- }
- return d.Decimal.Value()
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface.
-func (d *NullDecimal) UnmarshalJSON(decimalBytes []byte) error {
- if string(decimalBytes) == "null" {
- d.Valid = false
- return nil
- }
- d.Valid = true
- return d.Decimal.UnmarshalJSON(decimalBytes)
-}
-
-// MarshalJSON implements the json.Marshaler interface.
-func (d NullDecimal) MarshalJSON() ([]byte, error) {
- if !d.Valid {
- return []byte("null"), nil
- }
- return d.Decimal.MarshalJSON()
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface for XML
-// deserialization
-func (d *NullDecimal) UnmarshalText(text []byte) error {
- str := string(text)
-
- // check for empty XML or XML without body e.g.,
- if str == "" {
- d.Valid = false
- return nil
- }
- if err := d.Decimal.UnmarshalText(text); err != nil {
- d.Valid = false
- return err
- }
- d.Valid = true
- return nil
-}
-
-// MarshalText implements the encoding.TextMarshaler interface for XML
-// serialization.
-func (d NullDecimal) MarshalText() (text []byte, err error) {
- if !d.Valid {
- return []byte{}, nil
- }
- return d.Decimal.MarshalText()
-}
-
-// Trig functions
-
-// Atan returns the arctangent, in radians, of x.
-func (d Decimal) Atan() Decimal {
- if d.Equal(NewFromFloat(0.0)) {
- return d
- }
- if d.GreaterThan(NewFromFloat(0.0)) {
- return d.satan()
- }
- return d.Neg().satan().Neg()
-}
-
-func (d Decimal) xatan() Decimal {
- P0 := NewFromFloat(-8.750608600031904122785e-01)
- P1 := NewFromFloat(-1.615753718733365076637e+01)
- P2 := NewFromFloat(-7.500855792314704667340e+01)
- P3 := NewFromFloat(-1.228866684490136173410e+02)
- P4 := NewFromFloat(-6.485021904942025371773e+01)
- Q0 := NewFromFloat(2.485846490142306297962e+01)
- Q1 := NewFromFloat(1.650270098316988542046e+02)
- Q2 := NewFromFloat(4.328810604912902668951e+02)
- Q3 := NewFromFloat(4.853903996359136964868e+02)
- Q4 := NewFromFloat(1.945506571482613964425e+02)
- z := d.Mul(d)
- b1 := P0.Mul(z).Add(P1).Mul(z).Add(P2).Mul(z).Add(P3).Mul(z).Add(P4).Mul(z)
- b2 := z.Add(Q0).Mul(z).Add(Q1).Mul(z).Add(Q2).Mul(z).Add(Q3).Mul(z).Add(Q4)
- z = b1.Div(b2)
- z = d.Mul(z).Add(d)
- return z
-}
-
-// satan reduces its argument (known to be positive)
-// to the range [0, 0.66] and calls xatan.
-func (d Decimal) satan() Decimal {
- Morebits := NewFromFloat(6.123233995736765886130e-17) // pi/2 = PIO2 + Morebits
- Tan3pio8 := NewFromFloat(2.41421356237309504880) // tan(3*pi/8)
- pi := NewFromFloat(3.14159265358979323846264338327950288419716939937510582097494459)
-
- if d.LessThanOrEqual(NewFromFloat(0.66)) {
- return d.xatan()
- }
- if d.GreaterThan(Tan3pio8) {
- return pi.Div(NewFromFloat(2.0)).Sub(NewFromFloat(1.0).Div(d).xatan()).Add(Morebits)
- }
- return pi.Div(NewFromFloat(4.0)).Add((d.Sub(NewFromFloat(1.0)).Div(d.Add(NewFromFloat(1.0)))).xatan()).Add(NewFromFloat(0.5).Mul(Morebits))
-}
-
-// sin coefficients
-var _sin = [...]Decimal{
- NewFromFloat(1.58962301576546568060e-10), // 0x3de5d8fd1fd19ccd
- NewFromFloat(-2.50507477628578072866e-8), // 0xbe5ae5e5a9291f5d
- NewFromFloat(2.75573136213857245213e-6), // 0x3ec71de3567d48a1
- NewFromFloat(-1.98412698295895385996e-4), // 0xbf2a01a019bfdf03
- NewFromFloat(8.33333333332211858878e-3), // 0x3f8111111110f7d0
- NewFromFloat(-1.66666666666666307295e-1), // 0xbfc5555555555548
-}
-
-// Sin returns the sine of the radian argument x.
-func (d Decimal) Sin() Decimal {
- PI4A := NewFromFloat(7.85398125648498535156e-1) // 0x3fe921fb40000000, Pi/4 split into three parts
- PI4B := NewFromFloat(3.77489470793079817668e-8) // 0x3e64442d00000000,
- PI4C := NewFromFloat(2.69515142907905952645e-15) // 0x3ce8469898cc5170,
- M4PI := NewFromFloat(1.273239544735162542821171882678754627704620361328125) // 4/pi
-
- if d.Equal(NewFromFloat(0.0)) {
- return d
- }
- // make argument positive but save the sign
- sign := false
- if d.LessThan(NewFromFloat(0.0)) {
- d = d.Neg()
- sign = true
- }
-
- j := d.Mul(M4PI).IntPart() // integer part of x/(Pi/4), as integer for tests on the phase angle
- y := NewFromFloat(float64(j)) // integer part of x/(Pi/4), as float
-
- // map zeros to origin
- if j&1 == 1 {
- j++
- y = y.Add(NewFromFloat(1.0))
- }
- j &= 7 // octant modulo 2Pi radians (360 degrees)
- // reflect in x axis
- if j > 3 {
- sign = !sign
- j -= 4
- }
- z := d.Sub(y.Mul(PI4A)).Sub(y.Mul(PI4B)).Sub(y.Mul(PI4C)) // Extended precision modular arithmetic
- zz := z.Mul(z)
-
- if j == 1 || j == 2 {
- w := zz.Mul(zz).Mul(_cos[0].Mul(zz).Add(_cos[1]).Mul(zz).Add(_cos[2]).Mul(zz).Add(_cos[3]).Mul(zz).Add(_cos[4]).Mul(zz).Add(_cos[5]))
- y = NewFromFloat(1.0).Sub(NewFromFloat(0.5).Mul(zz)).Add(w)
- } else {
- y = z.Add(z.Mul(zz).Mul(_sin[0].Mul(zz).Add(_sin[1]).Mul(zz).Add(_sin[2]).Mul(zz).Add(_sin[3]).Mul(zz).Add(_sin[4]).Mul(zz).Add(_sin[5])))
- }
- if sign {
- y = y.Neg()
- }
- return y
-}
-
-// cos coefficients
-var _cos = [...]Decimal{
- NewFromFloat(-1.13585365213876817300e-11), // 0xbda8fa49a0861a9b
- NewFromFloat(2.08757008419747316778e-9), // 0x3e21ee9d7b4e3f05
- NewFromFloat(-2.75573141792967388112e-7), // 0xbe927e4f7eac4bc6
- NewFromFloat(2.48015872888517045348e-5), // 0x3efa01a019c844f5
- NewFromFloat(-1.38888888888730564116e-3), // 0xbf56c16c16c14f91
- NewFromFloat(4.16666666666665929218e-2), // 0x3fa555555555554b
-}
-
-// Cos returns the cosine of the radian argument x.
-func (d Decimal) Cos() Decimal {
-
- PI4A := NewFromFloat(7.85398125648498535156e-1) // 0x3fe921fb40000000, Pi/4 split into three parts
- PI4B := NewFromFloat(3.77489470793079817668e-8) // 0x3e64442d00000000,
- PI4C := NewFromFloat(2.69515142907905952645e-15) // 0x3ce8469898cc5170,
- M4PI := NewFromFloat(1.273239544735162542821171882678754627704620361328125) // 4/pi
-
- // make argument positive
- sign := false
- if d.LessThan(NewFromFloat(0.0)) {
- d = d.Neg()
- }
-
- j := d.Mul(M4PI).IntPart() // integer part of x/(Pi/4), as integer for tests on the phase angle
- y := NewFromFloat(float64(j)) // integer part of x/(Pi/4), as float
-
- // map zeros to origin
- if j&1 == 1 {
- j++
- y = y.Add(NewFromFloat(1.0))
- }
- j &= 7 // octant modulo 2Pi radians (360 degrees)
- // reflect in x axis
- if j > 3 {
- sign = !sign
- j -= 4
- }
- if j > 1 {
- sign = !sign
- }
-
- z := d.Sub(y.Mul(PI4A)).Sub(y.Mul(PI4B)).Sub(y.Mul(PI4C)) // Extended precision modular arithmetic
- zz := z.Mul(z)
-
- if j == 1 || j == 2 {
- y = z.Add(z.Mul(zz).Mul(_sin[0].Mul(zz).Add(_sin[1]).Mul(zz).Add(_sin[2]).Mul(zz).Add(_sin[3]).Mul(zz).Add(_sin[4]).Mul(zz).Add(_sin[5])))
- } else {
- w := zz.Mul(zz).Mul(_cos[0].Mul(zz).Add(_cos[1]).Mul(zz).Add(_cos[2]).Mul(zz).Add(_cos[3]).Mul(zz).Add(_cos[4]).Mul(zz).Add(_cos[5]))
- y = NewFromFloat(1.0).Sub(NewFromFloat(0.5).Mul(zz)).Add(w)
- }
- if sign {
- y = y.Neg()
- }
- return y
-}
-
-var _tanP = [...]Decimal{
- NewFromFloat(-1.30936939181383777646e+4), // 0xc0c992d8d24f3f38
- NewFromFloat(1.15351664838587416140e+6), // 0x413199eca5fc9ddd
- NewFromFloat(-1.79565251976484877988e+7), // 0xc1711fead3299176
-}
-var _tanQ = [...]Decimal{
- NewFromFloat(1.00000000000000000000e+0),
- NewFromFloat(1.36812963470692954678e+4), //0x40cab8a5eeb36572
- NewFromFloat(-1.32089234440210967447e+6), //0xc13427bc582abc96
- NewFromFloat(2.50083801823357915839e+7), //0x4177d98fc2ead8ef
- NewFromFloat(-5.38695755929454629881e+7), //0xc189afe03cbe5a31
-}
-
-// Tan returns the tangent of the radian argument x.
-func (d Decimal) Tan() Decimal {
-
- PI4A := NewFromFloat(7.85398125648498535156e-1) // 0x3fe921fb40000000, Pi/4 split into three parts
- PI4B := NewFromFloat(3.77489470793079817668e-8) // 0x3e64442d00000000,
- PI4C := NewFromFloat(2.69515142907905952645e-15) // 0x3ce8469898cc5170,
- M4PI := NewFromFloat(1.273239544735162542821171882678754627704620361328125) // 4/pi
-
- if d.Equal(NewFromFloat(0.0)) {
- return d
- }
-
- // make argument positive but save the sign
- sign := false
- if d.LessThan(NewFromFloat(0.0)) {
- d = d.Neg()
- sign = true
- }
-
- j := d.Mul(M4PI).IntPart() // integer part of x/(Pi/4), as integer for tests on the phase angle
- y := NewFromFloat(float64(j)) // integer part of x/(Pi/4), as float
-
- // map zeros to origin
- if j&1 == 1 {
- j++
- y = y.Add(NewFromFloat(1.0))
- }
-
- z := d.Sub(y.Mul(PI4A)).Sub(y.Mul(PI4B)).Sub(y.Mul(PI4C)) // Extended precision modular arithmetic
- zz := z.Mul(z)
-
- if zz.GreaterThan(NewFromFloat(1e-14)) {
- w := zz.Mul(_tanP[0].Mul(zz).Add(_tanP[1]).Mul(zz).Add(_tanP[2]))
- x := zz.Add(_tanQ[1]).Mul(zz).Add(_tanQ[2]).Mul(zz).Add(_tanQ[3]).Mul(zz).Add(_tanQ[4])
- y = z.Add(z.Mul(w.Div(x)))
- } else {
- y = z
- }
- if j&2 == 2 {
- y = NewFromFloat(-1.0).Div(y)
- }
- if sign {
- y = y.Neg()
- }
- return y
-}
diff --git a/vendor/github.com/shopspring/decimal/rounding.go b/vendor/github.com/shopspring/decimal/rounding.go
deleted file mode 100644
index d4b0cd0079..0000000000
--- a/vendor/github.com/shopspring/decimal/rounding.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Multiprecision decimal numbers.
-// For floating-point formatting only; not general purpose.
-// Only operations are assign and (binary) left/right shift.
-// Can do binary floating point in multiprecision decimal precisely
-// because 2 divides 10; cannot do decimal floating point
-// in multiprecision binary precisely.
-
-package decimal
-
-type floatInfo struct {
- mantbits uint
- expbits uint
- bias int
-}
-
-var float32info = floatInfo{23, 8, -127}
-var float64info = floatInfo{52, 11, -1023}
-
-// roundShortest rounds d (= mant * 2^exp) to the shortest number of digits
-// that will let the original floating point value be precisely reconstructed.
-func roundShortest(d *decimal, mant uint64, exp int, flt *floatInfo) {
- // If mantissa is zero, the number is zero; stop now.
- if mant == 0 {
- d.nd = 0
- return
- }
-
- // Compute upper and lower such that any decimal number
- // between upper and lower (possibly inclusive)
- // will round to the original floating point number.
-
- // We may see at once that the number is already shortest.
- //
- // Suppose d is not denormal, so that 2^exp <= d < 10^dp.
- // The closest shorter number is at least 10^(dp-nd) away.
- // The lower/upper bounds computed below are at distance
- // at most 2^(exp-mantbits).
- //
- // So the number is already shortest if 10^(dp-nd) > 2^(exp-mantbits),
- // or equivalently log2(10)*(dp-nd) > exp-mantbits.
- // It is true if 332/100*(dp-nd) >= exp-mantbits (log2(10) > 3.32).
- minexp := flt.bias + 1 // minimum possible exponent
- if exp > minexp && 332*(d.dp-d.nd) >= 100*(exp-int(flt.mantbits)) {
- // The number is already shortest.
- return
- }
-
- // d = mant << (exp - mantbits)
- // Next highest floating point number is mant+1 << exp-mantbits.
- // Our upper bound is halfway between, mant*2+1 << exp-mantbits-1.
- upper := new(decimal)
- upper.Assign(mant*2 + 1)
- upper.Shift(exp - int(flt.mantbits) - 1)
-
- // d = mant << (exp - mantbits)
- // Next lowest floating point number is mant-1 << exp-mantbits,
- // unless mant-1 drops the significant bit and exp is not the minimum exp,
- // in which case the next lowest is mant*2-1 << exp-mantbits-1.
- // Either way, call it mantlo << explo-mantbits.
- // Our lower bound is halfway between, mantlo*2+1 << explo-mantbits-1.
- var mantlo uint64
- var explo int
- if mant > 1<= d.nd {
- break
- }
- li := ui - upper.dp + lower.dp
- l := byte('0') // lower digit
- if li >= 0 && li < lower.nd {
- l = lower.d[li]
- }
- m := byte('0') // middle digit
- if mi >= 0 {
- m = d.d[mi]
- }
- u := byte('0') // upper digit
- if ui < upper.nd {
- u = upper.d[ui]
- }
-
- // Okay to round down (truncate) if lower has a different digit
- // or if lower is inclusive and is exactly the result of rounding
- // down (i.e., and we have reached the final digit of lower).
- okdown := l != m || inclusive && li+1 == lower.nd
-
- switch {
- case upperdelta == 0 && m+1 < u:
- // Example:
- // m = 12345xxx
- // u = 12347xxx
- upperdelta = 2
- case upperdelta == 0 && m != u:
- // Example:
- // m = 12345xxx
- // u = 12346xxx
- upperdelta = 1
- case upperdelta == 1 && (m != '9' || u != '0'):
- // Example:
- // m = 1234598x
- // u = 1234600x
- upperdelta = 2
- }
- // Okay to round up if upper has a different digit and either upper
- // is inclusive or upper is bigger than the result of rounding up.
- okup := upperdelta > 0 && (inclusive || upperdelta > 1 || ui+1 < upper.nd)
-
- // If it's okay to do either, then round to the nearest one.
- // If it's okay to do only one, do it.
- switch {
- case okdown && okup:
- d.Round(mi + 1)
- return
- case okdown:
- d.RoundDown(mi + 1)
- return
- case okup:
- d.RoundUp(mi + 1)
- return
- }
- }
-}
diff --git a/vendor/github.com/zcalusic/sysinfo/README.md b/vendor/github.com/zcalusic/sysinfo/README.md
index 83cdfe555c..7d72066a5c 100644
--- a/vendor/github.com/zcalusic/sysinfo/README.md
+++ b/vendor/github.com/zcalusic/sysinfo/README.md
@@ -1,6 +1,5 @@
# Sysinfo
-[](https://github.com/zcalusic/sysinfo/actions/workflows/test.yaml)
[](https://goreportcard.com/report/github.com/zcalusic/sysinfo)
[](https://godoc.org/github.com/zcalusic/sysinfo)
[](https://github.com/zcalusic/sysinfo/blob/master/LICENSE)
@@ -8,8 +7,8 @@
[](https://www.linuxfoundation.org/)
Package sysinfo is a Go library providing Linux OS / kernel / hardware system information. It's completely standalone,
-has no dependencies on the host system, doesn't execute external programs, doesn't even import other Go libraries. It
-collects only "inventory type" information, things that don't change often.
+has no dependencies on the host system and doesn't execute external programs. It collects only "inventory type"
+information, things that don't change often.
## Code Example
diff --git a/vendor/github.com/zcalusic/sysinfo/os.go b/vendor/github.com/zcalusic/sysinfo/os.go
index 82486eda75..9d24a43fa9 100644
--- a/vendor/github.com/zcalusic/sysinfo/os.go
+++ b/vendor/github.com/zcalusic/sysinfo/os.go
@@ -25,7 +25,9 @@ var (
reID = regexp.MustCompile(`^ID=(.*)$`)
reVersionID = regexp.MustCompile(`^VERSION_ID=(.*)$`)
reUbuntu = regexp.MustCompile(`[\( ]([\d\.]+)`)
+ reAlma = regexp.MustCompile(`^AlmaLinux release ([\d\.]+)`)
reCentOS = regexp.MustCompile(`^CentOS( Linux)? release ([\d\.]+)`)
+ reRocky = regexp.MustCompile(`^Rocky Linux release ([\d\.]+)`)
reRedHat = regexp.MustCompile(`[\( ]([\d\.]+)`)
)
@@ -61,12 +63,29 @@ func (si *SysInfo) getOSInfo() {
if m := reUbuntu.FindStringSubmatch(si.OS.Name); m != nil {
si.OS.Release = m[1]
}
+ case "almalinux":
+ if release := slurpFile("/etc/almalinux-release"); release != "" {
+ if m := reAlma.FindStringSubmatch(release); m != nil {
+ si.OS.Release = m[1]
+ }
+ }
+
+ si.OS.Version = strings.Split(si.OS.Release, ".")[0]
case "centos":
if release := slurpFile("/etc/centos-release"); release != "" {
if m := reCentOS.FindStringSubmatch(release); m != nil {
si.OS.Release = m[2]
}
}
+ case "rocky":
+ if release := slurpFile("/etc/rocky-release"); release != "" {
+ if m := reRocky.FindStringSubmatch(release); m != nil {
+ si.OS.Release = m[1]
+ }
+ }
+
+ si.OS.Version = strings.Split(si.OS.Release, ".")[0]
+
case "rhel":
if release := slurpFile("/etc/redhat-release"); release != "" {
if m := reRedHat.FindStringSubmatch(release); m != nil {
diff --git a/vendor/github.com/zcalusic/sysinfo/version.go b/vendor/github.com/zcalusic/sysinfo/version.go
index 67a0767dbb..9320a72d4d 100644
--- a/vendor/github.com/zcalusic/sysinfo/version.go
+++ b/vendor/github.com/zcalusic/sysinfo/version.go
@@ -5,4 +5,4 @@
package sysinfo
// Version of the sysinfo library.
-const Version = "1.1.0"
+const Version = "1.1.2"
diff --git a/vendor/golang.org/x/crypto/bcrypt/base64.go b/vendor/golang.org/x/crypto/bcrypt/base64.go
deleted file mode 100644
index fc31160908..0000000000
--- a/vendor/golang.org/x/crypto/bcrypt/base64.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bcrypt
-
-import "encoding/base64"
-
-const alphabet = "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-
-var bcEncoding = base64.NewEncoding(alphabet)
-
-func base64Encode(src []byte) []byte {
- n := bcEncoding.EncodedLen(len(src))
- dst := make([]byte, n)
- bcEncoding.Encode(dst, src)
- for dst[n-1] == '=' {
- n--
- }
- return dst[:n]
-}
-
-func base64Decode(src []byte) ([]byte, error) {
- numOfEquals := 4 - (len(src) % 4)
- for i := 0; i < numOfEquals; i++ {
- src = append(src, '=')
- }
-
- dst := make([]byte, bcEncoding.DecodedLen(len(src)))
- n, err := bcEncoding.Decode(dst, src)
- if err != nil {
- return nil, err
- }
- return dst[:n], nil
-}
diff --git a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
deleted file mode 100644
index dc9311870a..0000000000
--- a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package bcrypt implements Provos and Mazières's bcrypt adaptive hashing
-// algorithm. See http://www.usenix.org/event/usenix99/provos/provos.pdf
-package bcrypt
-
-// The code is a port of Provos and Mazières's C implementation.
-import (
- "crypto/rand"
- "crypto/subtle"
- "errors"
- "fmt"
- "io"
- "strconv"
-
- "golang.org/x/crypto/blowfish"
-)
-
-const (
- MinCost int = 4 // the minimum allowable cost as passed in to GenerateFromPassword
- MaxCost int = 31 // the maximum allowable cost as passed in to GenerateFromPassword
- DefaultCost int = 10 // the cost that will actually be set if a cost below MinCost is passed into GenerateFromPassword
-)
-
-// The error returned from CompareHashAndPassword when a password and hash do
-// not match.
-var ErrMismatchedHashAndPassword = errors.New("crypto/bcrypt: hashedPassword is not the hash of the given password")
-
-// The error returned from CompareHashAndPassword when a hash is too short to
-// be a bcrypt hash.
-var ErrHashTooShort = errors.New("crypto/bcrypt: hashedSecret too short to be a bcrypted password")
-
-// The error returned from CompareHashAndPassword when a hash was created with
-// a bcrypt algorithm newer than this implementation.
-type HashVersionTooNewError byte
-
-func (hv HashVersionTooNewError) Error() string {
- return fmt.Sprintf("crypto/bcrypt: bcrypt algorithm version '%c' requested is newer than current version '%c'", byte(hv), majorVersion)
-}
-
-// The error returned from CompareHashAndPassword when a hash starts with something other than '$'
-type InvalidHashPrefixError byte
-
-func (ih InvalidHashPrefixError) Error() string {
- return fmt.Sprintf("crypto/bcrypt: bcrypt hashes must start with '$', but hashedSecret started with '%c'", byte(ih))
-}
-
-type InvalidCostError int
-
-func (ic InvalidCostError) Error() string {
- return fmt.Sprintf("crypto/bcrypt: cost %d is outside allowed range (%d,%d)", int(ic), MinCost, MaxCost)
-}
-
-const (
- majorVersion = '2'
- minorVersion = 'a'
- maxSaltSize = 16
- maxCryptedHashSize = 23
- encodedSaltSize = 22
- encodedHashSize = 31
- minHashSize = 59
-)
-
-// magicCipherData is an IV for the 64 Blowfish encryption calls in
-// bcrypt(). It's the string "OrpheanBeholderScryDoubt" in big-endian bytes.
-var magicCipherData = []byte{
- 0x4f, 0x72, 0x70, 0x68,
- 0x65, 0x61, 0x6e, 0x42,
- 0x65, 0x68, 0x6f, 0x6c,
- 0x64, 0x65, 0x72, 0x53,
- 0x63, 0x72, 0x79, 0x44,
- 0x6f, 0x75, 0x62, 0x74,
-}
-
-type hashed struct {
- hash []byte
- salt []byte
- cost int // allowed range is MinCost to MaxCost
- major byte
- minor byte
-}
-
-// ErrPasswordTooLong is returned when the password passed to
-// GenerateFromPassword is too long (i.e. > 72 bytes).
-var ErrPasswordTooLong = errors.New("bcrypt: password length exceeds 72 bytes")
-
-// GenerateFromPassword returns the bcrypt hash of the password at the given
-// cost. If the cost given is less than MinCost, the cost will be set to
-// DefaultCost, instead. Use CompareHashAndPassword, as defined in this package,
-// to compare the returned hashed password with its cleartext version.
-// GenerateFromPassword does not accept passwords longer than 72 bytes, which
-// is the longest password bcrypt will operate on.
-func GenerateFromPassword(password []byte, cost int) ([]byte, error) {
- if len(password) > 72 {
- return nil, ErrPasswordTooLong
- }
- p, err := newFromPassword(password, cost)
- if err != nil {
- return nil, err
- }
- return p.Hash(), nil
-}
-
-// CompareHashAndPassword compares a bcrypt hashed password with its possible
-// plaintext equivalent. Returns nil on success, or an error on failure.
-func CompareHashAndPassword(hashedPassword, password []byte) error {
- p, err := newFromHash(hashedPassword)
- if err != nil {
- return err
- }
-
- otherHash, err := bcrypt(password, p.cost, p.salt)
- if err != nil {
- return err
- }
-
- otherP := &hashed{otherHash, p.salt, p.cost, p.major, p.minor}
- if subtle.ConstantTimeCompare(p.Hash(), otherP.Hash()) == 1 {
- return nil
- }
-
- return ErrMismatchedHashAndPassword
-}
-
-// Cost returns the hashing cost used to create the given hashed
-// password. When, in the future, the hashing cost of a password system needs
-// to be increased in order to adjust for greater computational power, this
-// function allows one to establish which passwords need to be updated.
-func Cost(hashedPassword []byte) (int, error) {
- p, err := newFromHash(hashedPassword)
- if err != nil {
- return 0, err
- }
- return p.cost, nil
-}
-
-func newFromPassword(password []byte, cost int) (*hashed, error) {
- if cost < MinCost {
- cost = DefaultCost
- }
- p := new(hashed)
- p.major = majorVersion
- p.minor = minorVersion
-
- err := checkCost(cost)
- if err != nil {
- return nil, err
- }
- p.cost = cost
-
- unencodedSalt := make([]byte, maxSaltSize)
- _, err = io.ReadFull(rand.Reader, unencodedSalt)
- if err != nil {
- return nil, err
- }
-
- p.salt = base64Encode(unencodedSalt)
- hash, err := bcrypt(password, p.cost, p.salt)
- if err != nil {
- return nil, err
- }
- p.hash = hash
- return p, err
-}
-
-func newFromHash(hashedSecret []byte) (*hashed, error) {
- if len(hashedSecret) < minHashSize {
- return nil, ErrHashTooShort
- }
- p := new(hashed)
- n, err := p.decodeVersion(hashedSecret)
- if err != nil {
- return nil, err
- }
- hashedSecret = hashedSecret[n:]
- n, err = p.decodeCost(hashedSecret)
- if err != nil {
- return nil, err
- }
- hashedSecret = hashedSecret[n:]
-
- // The "+2" is here because we'll have to append at most 2 '=' to the salt
- // when base64 decoding it in expensiveBlowfishSetup().
- p.salt = make([]byte, encodedSaltSize, encodedSaltSize+2)
- copy(p.salt, hashedSecret[:encodedSaltSize])
-
- hashedSecret = hashedSecret[encodedSaltSize:]
- p.hash = make([]byte, len(hashedSecret))
- copy(p.hash, hashedSecret)
-
- return p, nil
-}
-
-func bcrypt(password []byte, cost int, salt []byte) ([]byte, error) {
- cipherData := make([]byte, len(magicCipherData))
- copy(cipherData, magicCipherData)
-
- c, err := expensiveBlowfishSetup(password, uint32(cost), salt)
- if err != nil {
- return nil, err
- }
-
- for i := 0; i < 24; i += 8 {
- for j := 0; j < 64; j++ {
- c.Encrypt(cipherData[i:i+8], cipherData[i:i+8])
- }
- }
-
- // Bug compatibility with C bcrypt implementations. We only encode 23 of
- // the 24 bytes encrypted.
- hsh := base64Encode(cipherData[:maxCryptedHashSize])
- return hsh, nil
-}
-
-func expensiveBlowfishSetup(key []byte, cost uint32, salt []byte) (*blowfish.Cipher, error) {
- csalt, err := base64Decode(salt)
- if err != nil {
- return nil, err
- }
-
- // Bug compatibility with C bcrypt implementations. They use the trailing
- // NULL in the key string during expansion.
- // We copy the key to prevent changing the underlying array.
- ckey := append(key[:len(key):len(key)], 0)
-
- c, err := blowfish.NewSaltedCipher(ckey, csalt)
- if err != nil {
- return nil, err
- }
-
- var i, rounds uint64
- rounds = 1 << cost
- for i = 0; i < rounds; i++ {
- blowfish.ExpandKey(ckey, c)
- blowfish.ExpandKey(csalt, c)
- }
-
- return c, nil
-}
-
-func (p *hashed) Hash() []byte {
- arr := make([]byte, 60)
- arr[0] = '$'
- arr[1] = p.major
- n := 2
- if p.minor != 0 {
- arr[2] = p.minor
- n = 3
- }
- arr[n] = '$'
- n++
- copy(arr[n:], []byte(fmt.Sprintf("%02d", p.cost)))
- n += 2
- arr[n] = '$'
- n++
- copy(arr[n:], p.salt)
- n += encodedSaltSize
- copy(arr[n:], p.hash)
- n += encodedHashSize
- return arr[:n]
-}
-
-func (p *hashed) decodeVersion(sbytes []byte) (int, error) {
- if sbytes[0] != '$' {
- return -1, InvalidHashPrefixError(sbytes[0])
- }
- if sbytes[1] > majorVersion {
- return -1, HashVersionTooNewError(sbytes[1])
- }
- p.major = sbytes[1]
- n := 3
- if sbytes[2] != '$' {
- p.minor = sbytes[2]
- n++
- }
- return n, nil
-}
-
-// sbytes should begin where decodeVersion left off.
-func (p *hashed) decodeCost(sbytes []byte) (int, error) {
- cost, err := strconv.Atoi(string(sbytes[0:2]))
- if err != nil {
- return -1, err
- }
- err = checkCost(cost)
- if err != nil {
- return -1, err
- }
- p.cost = cost
- return 3, nil
-}
-
-func (p *hashed) String() string {
- return fmt.Sprintf("&{hash: %#v, salt: %#v, cost: %d, major: %c, minor: %c}", string(p.hash), p.salt, p.cost, p.major, p.minor)
-}
-
-func checkCost(cost int) error {
- if cost < MinCost || cost > MaxCost {
- return InvalidCostError(cost)
- }
- return nil
-}
diff --git a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
deleted file mode 100644
index 28cd99c7f3..0000000000
--- a/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC
-2898 / PKCS #5 v2.0.
-
-A key derivation function is useful when encrypting data based on a password
-or any other not-fully-random data. It uses a pseudorandom function to derive
-a secure encryption key based on the password.
-
-While v2.0 of the standard defines only one pseudorandom function to use,
-HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved
-Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To
-choose, you can pass the `New` functions from the different SHA packages to
-pbkdf2.Key.
-*/
-package pbkdf2
-
-import (
- "crypto/hmac"
- "hash"
-)
-
-// Key derives a key from the password, salt and iteration count, returning a
-// []byte of length keylen that can be used as cryptographic key. The key is
-// derived based on the method described as PBKDF2 with the HMAC variant using
-// the supplied hash function.
-//
-// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you
-// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by
-// doing:
-//
-// dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New)
-//
-// Remember to get a good random salt. At least 8 bytes is recommended by the
-// RFC.
-//
-// Using a higher iteration count will increase the cost of an exhaustive
-// search but will also make derivation proportionally slower.
-func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
- prf := hmac.New(h, password)
- hashLen := prf.Size()
- numBlocks := (keyLen + hashLen - 1) / hashLen
-
- var buf [4]byte
- dk := make([]byte, 0, numBlocks*hashLen)
- U := make([]byte, hashLen)
- for block := 1; block <= numBlocks; block++ {
- // N.B.: || means concatenation, ^ means XOR
- // for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter
- // U_1 = PRF(password, salt || uint(i))
- prf.Reset()
- prf.Write(salt)
- buf[0] = byte(block >> 24)
- buf[1] = byte(block >> 16)
- buf[2] = byte(block >> 8)
- buf[3] = byte(block)
- prf.Write(buf[:4])
- dk = prf.Sum(dk)
- T := dk[len(dk)-hashLen:]
- copy(U, T)
-
- // U_n = PRF(password, U_(n-1))
- for n := 2; n <= iter; n++ {
- prf.Reset()
- prf.Write(U)
- U = U[:0]
- U = prf.Sum(U)
- for x := range U {
- T[x] ^= U[x]
- }
- }
- }
- return dk[:keyLen]
-}
diff --git a/vendor/golang.org/x/crypto/scrypt/scrypt.go b/vendor/golang.org/x/crypto/scrypt/scrypt.go
deleted file mode 100644
index 76fa40fb20..0000000000
--- a/vendor/golang.org/x/crypto/scrypt/scrypt.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package scrypt implements the scrypt key derivation function as defined in
-// Colin Percival's paper "Stronger Key Derivation via Sequential Memory-Hard
-// Functions" (https://www.tarsnap.com/scrypt/scrypt.pdf).
-package scrypt
-
-import (
- "crypto/sha256"
- "encoding/binary"
- "errors"
- "math/bits"
-
- "golang.org/x/crypto/pbkdf2"
-)
-
-const maxInt = int(^uint(0) >> 1)
-
-// blockCopy copies n numbers from src into dst.
-func blockCopy(dst, src []uint32, n int) {
- copy(dst, src[:n])
-}
-
-// blockXOR XORs numbers from dst with n numbers from src.
-func blockXOR(dst, src []uint32, n int) {
- for i, v := range src[:n] {
- dst[i] ^= v
- }
-}
-
-// salsaXOR applies Salsa20/8 to the XOR of 16 numbers from tmp and in,
-// and puts the result into both tmp and out.
-func salsaXOR(tmp *[16]uint32, in, out []uint32) {
- w0 := tmp[0] ^ in[0]
- w1 := tmp[1] ^ in[1]
- w2 := tmp[2] ^ in[2]
- w3 := tmp[3] ^ in[3]
- w4 := tmp[4] ^ in[4]
- w5 := tmp[5] ^ in[5]
- w6 := tmp[6] ^ in[6]
- w7 := tmp[7] ^ in[7]
- w8 := tmp[8] ^ in[8]
- w9 := tmp[9] ^ in[9]
- w10 := tmp[10] ^ in[10]
- w11 := tmp[11] ^ in[11]
- w12 := tmp[12] ^ in[12]
- w13 := tmp[13] ^ in[13]
- w14 := tmp[14] ^ in[14]
- w15 := tmp[15] ^ in[15]
-
- x0, x1, x2, x3, x4, x5, x6, x7, x8 := w0, w1, w2, w3, w4, w5, w6, w7, w8
- x9, x10, x11, x12, x13, x14, x15 := w9, w10, w11, w12, w13, w14, w15
-
- for i := 0; i < 8; i += 2 {
- x4 ^= bits.RotateLeft32(x0+x12, 7)
- x8 ^= bits.RotateLeft32(x4+x0, 9)
- x12 ^= bits.RotateLeft32(x8+x4, 13)
- x0 ^= bits.RotateLeft32(x12+x8, 18)
-
- x9 ^= bits.RotateLeft32(x5+x1, 7)
- x13 ^= bits.RotateLeft32(x9+x5, 9)
- x1 ^= bits.RotateLeft32(x13+x9, 13)
- x5 ^= bits.RotateLeft32(x1+x13, 18)
-
- x14 ^= bits.RotateLeft32(x10+x6, 7)
- x2 ^= bits.RotateLeft32(x14+x10, 9)
- x6 ^= bits.RotateLeft32(x2+x14, 13)
- x10 ^= bits.RotateLeft32(x6+x2, 18)
-
- x3 ^= bits.RotateLeft32(x15+x11, 7)
- x7 ^= bits.RotateLeft32(x3+x15, 9)
- x11 ^= bits.RotateLeft32(x7+x3, 13)
- x15 ^= bits.RotateLeft32(x11+x7, 18)
-
- x1 ^= bits.RotateLeft32(x0+x3, 7)
- x2 ^= bits.RotateLeft32(x1+x0, 9)
- x3 ^= bits.RotateLeft32(x2+x1, 13)
- x0 ^= bits.RotateLeft32(x3+x2, 18)
-
- x6 ^= bits.RotateLeft32(x5+x4, 7)
- x7 ^= bits.RotateLeft32(x6+x5, 9)
- x4 ^= bits.RotateLeft32(x7+x6, 13)
- x5 ^= bits.RotateLeft32(x4+x7, 18)
-
- x11 ^= bits.RotateLeft32(x10+x9, 7)
- x8 ^= bits.RotateLeft32(x11+x10, 9)
- x9 ^= bits.RotateLeft32(x8+x11, 13)
- x10 ^= bits.RotateLeft32(x9+x8, 18)
-
- x12 ^= bits.RotateLeft32(x15+x14, 7)
- x13 ^= bits.RotateLeft32(x12+x15, 9)
- x14 ^= bits.RotateLeft32(x13+x12, 13)
- x15 ^= bits.RotateLeft32(x14+x13, 18)
- }
- x0 += w0
- x1 += w1
- x2 += w2
- x3 += w3
- x4 += w4
- x5 += w5
- x6 += w6
- x7 += w7
- x8 += w8
- x9 += w9
- x10 += w10
- x11 += w11
- x12 += w12
- x13 += w13
- x14 += w14
- x15 += w15
-
- out[0], tmp[0] = x0, x0
- out[1], tmp[1] = x1, x1
- out[2], tmp[2] = x2, x2
- out[3], tmp[3] = x3, x3
- out[4], tmp[4] = x4, x4
- out[5], tmp[5] = x5, x5
- out[6], tmp[6] = x6, x6
- out[7], tmp[7] = x7, x7
- out[8], tmp[8] = x8, x8
- out[9], tmp[9] = x9, x9
- out[10], tmp[10] = x10, x10
- out[11], tmp[11] = x11, x11
- out[12], tmp[12] = x12, x12
- out[13], tmp[13] = x13, x13
- out[14], tmp[14] = x14, x14
- out[15], tmp[15] = x15, x15
-}
-
-func blockMix(tmp *[16]uint32, in, out []uint32, r int) {
- blockCopy(tmp[:], in[(2*r-1)*16:], 16)
- for i := 0; i < 2*r; i += 2 {
- salsaXOR(tmp, in[i*16:], out[i*8:])
- salsaXOR(tmp, in[i*16+16:], out[i*8+r*16:])
- }
-}
-
-func integer(b []uint32, r int) uint64 {
- j := (2*r - 1) * 16
- return uint64(b[j]) | uint64(b[j+1])<<32
-}
-
-func smix(b []byte, r, N int, v, xy []uint32) {
- var tmp [16]uint32
- R := 32 * r
- x := xy
- y := xy[R:]
-
- j := 0
- for i := 0; i < R; i++ {
- x[i] = binary.LittleEndian.Uint32(b[j:])
- j += 4
- }
- for i := 0; i < N; i += 2 {
- blockCopy(v[i*R:], x, R)
- blockMix(&tmp, x, y, r)
-
- blockCopy(v[(i+1)*R:], y, R)
- blockMix(&tmp, y, x, r)
- }
- for i := 0; i < N; i += 2 {
- j := int(integer(x, r) & uint64(N-1))
- blockXOR(x, v[j*R:], R)
- blockMix(&tmp, x, y, r)
-
- j = int(integer(y, r) & uint64(N-1))
- blockXOR(y, v[j*R:], R)
- blockMix(&tmp, y, x, r)
- }
- j = 0
- for _, v := range x[:R] {
- binary.LittleEndian.PutUint32(b[j:], v)
- j += 4
- }
-}
-
-// Key derives a key from the password, salt, and cost parameters, returning
-// a byte slice of length keyLen that can be used as cryptographic key.
-//
-// N is a CPU/memory cost parameter, which must be a power of two greater than 1.
-// r and p must satisfy r * p < 2³⁰. If the parameters do not satisfy the
-// limits, the function returns a nil byte slice and an error.
-//
-// For example, you can get a derived key for e.g. AES-256 (which needs a
-// 32-byte key) by doing:
-//
-// dk, err := scrypt.Key([]byte("some password"), salt, 32768, 8, 1, 32)
-//
-// The recommended parameters for interactive logins as of 2017 are N=32768, r=8
-// and p=1. The parameters N, r, and p should be increased as memory latency and
-// CPU parallelism increases; consider setting N to the highest power of 2 you
-// can derive within 100 milliseconds. Remember to get a good random salt.
-func Key(password, salt []byte, N, r, p, keyLen int) ([]byte, error) {
- if N <= 1 || N&(N-1) != 0 {
- return nil, errors.New("scrypt: N must be > 1 and a power of 2")
- }
- if uint64(r)*uint64(p) >= 1<<30 || r > maxInt/128/p || r > maxInt/256 || N > maxInt/128/r {
- return nil, errors.New("scrypt: parameters are too large")
- }
-
- xy := make([]uint32, 64*r)
- v := make([]uint32, 32*N*r)
- b := pbkdf2.Key(password, salt, 1, p*128*r, sha256.New)
-
- for i := 0; i < p; i++ {
- smix(b[i*128*r:], r, N, v, xy)
- }
-
- return pbkdf2.Key(password, b, 1, keyLen, sha256.New), nil
-}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 0f136ffbfe..d5a172d6c6 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,17 +1,5 @@
-# dario.cat/mergo v1.0.1
-## explicit; go 1.13
-dario.cat/mergo
# github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1
## explicit; go 1.16
-# github.com/Masterminds/goutils v1.1.1
-## explicit
-github.com/Masterminds/goutils
-# github.com/Masterminds/semver/v3 v3.3.0
-## explicit; go 1.21
-github.com/Masterminds/semver/v3
-# github.com/Masterminds/sprig/v3 v3.3.0
-## explicit; go 1.21
-github.com/Masterminds/sprig/v3
# github.com/Microsoft/go-winio v0.6.2
## explicit; go 1.21
github.com/Microsoft/go-winio
@@ -261,9 +249,6 @@ github.com/hashicorp/hcl/hcl/token
github.com/hashicorp/hcl/json/parser
github.com/hashicorp/hcl/json/scanner
github.com/hashicorp/hcl/json/token
-# github.com/huandu/xstrings v1.5.0
-## explicit; go 1.12
-github.com/huandu/xstrings
# github.com/inconshreveable/mousetrap v1.1.0
## explicit; go 1.18
github.com/inconshreveable/mousetrap
@@ -320,18 +305,12 @@ github.com/magiconair/properties
# github.com/mauromorales/xpasswd v0.4.0
## explicit; go 1.20
github.com/mauromorales/xpasswd/pkg/users
-# github.com/mitchellh/copystructure v1.2.0
-## explicit; go 1.15
-github.com/mitchellh/copystructure
# github.com/mitchellh/go-homedir v1.1.0
## explicit
github.com/mitchellh/go-homedir
# github.com/mitchellh/mapstructure v1.5.0
## explicit; go 1.14
github.com/mitchellh/mapstructure
-# github.com/mitchellh/reflectwalk v1.0.2
-## explicit
-github.com/mitchellh/reflectwalk
# github.com/moby/sys/mountinfo v0.7.1
## explicit; go 1.16
github.com/moby/sys/mountinfo
@@ -423,8 +402,8 @@ github.com/pkg/xattr
# github.com/rancher-sandbox/linuxkit v1.0.2
## explicit; go 1.18
github.com/rancher-sandbox/linuxkit/providers
-# github.com/rancher/yip v1.9.3
-## explicit; go 1.21
+# github.com/rancher/yip v1.9.5
+## explicit; go 1.22.0
github.com/rancher/yip/pkg/dag
github.com/rancher/yip/pkg/executor
github.com/rancher/yip/pkg/logger
@@ -447,9 +426,6 @@ github.com/sanity-io/litter
# github.com/satori/go.uuid v1.2.0
## explicit
github.com/satori/go.uuid
-# github.com/shopspring/decimal v1.4.0
-## explicit; go 1.10
-github.com/shopspring/decimal
# github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af
## explicit; go 1.13
github.com/sirupsen/logrus
@@ -521,7 +497,7 @@ github.com/vmware/vmw-guestinfo/message
github.com/vmware/vmw-guestinfo/rpcout
github.com/vmware/vmw-guestinfo/rpcvmx
github.com/vmware/vmw-guestinfo/vmcheck
-# github.com/zcalusic/sysinfo v1.1.0
+# github.com/zcalusic/sysinfo v1.1.2
## explicit; go 1.22
github.com/zcalusic/sysinfo
github.com/zcalusic/sysinfo/cpuid
@@ -564,7 +540,6 @@ go.uber.org/atomic
go.uber.org/multierr
# golang.org/x/crypto v0.27.0
## explicit; go 1.20
-golang.org/x/crypto/bcrypt
golang.org/x/crypto/blowfish
golang.org/x/crypto/chacha20
golang.org/x/crypto/cryptobyte
@@ -572,8 +547,6 @@ golang.org/x/crypto/cryptobyte/asn1
golang.org/x/crypto/curve25519
golang.org/x/crypto/internal/alias
golang.org/x/crypto/internal/poly1305
-golang.org/x/crypto/pbkdf2
-golang.org/x/crypto/scrypt
golang.org/x/crypto/ssh
golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
# golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
@@ -583,7 +556,7 @@ golang.org/x/exp/slices
golang.org/x/exp/slog
golang.org/x/exp/slog/internal
golang.org/x/exp/slog/internal/buffer
-# golang.org/x/net v0.28.0
+# golang.org/x/net v0.29.0
## explicit; go 1.18
golang.org/x/net/context
golang.org/x/net/html
@@ -621,8 +594,8 @@ golang.org/x/text/language
golang.org/x/text/runes
golang.org/x/text/transform
golang.org/x/text/unicode/norm
-# golang.org/x/tools v0.24.0
-## explicit; go 1.19
+# golang.org/x/tools v0.25.0
+## explicit; go 1.22.0
golang.org/x/tools/cover
golang.org/x/tools/go/ast/inspector
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c