Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fortio for openSUSE:Factory checked in at 2022-05-19 22:49:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fortio (Old) and /work/SRC/openSUSE:Factory/.fortio.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fortio" Thu May 19 22:49:06 2022 rev:11 rq:977923 version:1.30.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fortio/fortio.changes 2022-05-14 22:58:49.771490894 +0200 +++ /work/SRC/openSUSE:Factory/.fortio.new.1538/fortio.changes 2022-05-19 22:49:14.314328627 +0200 @@ -1,0 +2,9 @@ +Wed May 18 09:06:42 UTC 2022 - ka...@b1-systems.de + +- Update to version 1.30.1: + * prep for 1.30.1 + fix installation order leftover (#573) + * Fix that TLS servername should be port-less (#572) + * Reusable version code (#569) + * document how to do multarch tag copy + +------------------------------------------------------------------- Old: ---- fortio-1.30.0.tar.gz New: ---- fortio-1.30.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fortio.spec ++++++ --- /var/tmp/diff_new_pack.eIUi75/_old 2022-05-19 22:49:14.942329432 +0200 +++ /var/tmp/diff_new_pack.eIUi75/_new 2022-05-19 22:49:14.946329436 +0200 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: fortio -Version: 1.30.0 +Version: 1.30.1 Release: 0 Summary: Load testing library, command line tool, advanced echo server and web UI License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.eIUi75/_old 2022-05-19 22:49:14.982329482 +0200 +++ /var/tmp/diff_new_pack.eIUi75/_new 2022-05-19 22:49:14.986329488 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/fortio/fortio</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.30.0</param> + <param name="revision">v1.30.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -17,7 +17,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">fortio-1.30.0.tar.gz</param> + <param name="archive">fortio-1.30.1.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.eIUi75/_old 2022-05-19 22:49:15.006329514 +0200 +++ /var/tmp/diff_new_pack.eIUi75/_new 2022-05-19 22:49:15.010329518 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/fortio/fortio</param> - <param name="changesrevision">15150b657787587ddfe972935a0633da2251ae5a</param></service></servicedata> + <param name="changesrevision">a5dbc975c3cd6585298ecc49361b2d7fcd185528</param></service></servicedata> (No newline at EOF) ++++++ fortio-1.30.0.tar.gz -> fortio-1.30.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.30.0/README.md new/fortio-1.30.1/README.md --- old/fortio-1.30.0/README.md 2022-05-14 01:39:50.000000000 +0200 +++ new/fortio-1.30.1/README.md 2022-05-17 00:51:18.000000000 +0200 @@ -1,6 +1,7 @@ # Fortio [](https://github.com/avelino/awesome-go#networking) +[](https://bestpractices.coreinfrastructure.org/projects/6054) [](https://goreportcard.com/report/fortio.org/fortio) [](https://godoc.org/fortio.org/fortio) [](https://codecov.io/gh/fortio/fortio) @@ -40,23 +41,22 @@ docker run fortio/fortio load http://www.google.com/ # For a test run ``` -The [releases](https://github.com/fortio/fortio/releases) page has binaries for many OS/architecture combinations (see assets). - You can install from source: 1. [Install go](https://golang.org/doc/install) (golang 1.18 or later) 2. `go install fortio.org/fortio@latest` -3. you can now run `fortio` (from your gopath bin/ directory) +3. you can now run `fortio` (from your gopath bin/ directory, usually `~/go/bin`) +The [releases](https://github.com/fortio/fortio/releases) page has binaries for many OS/architecture combinations (see assets). ```shell -curl -L https://github.com/fortio/fortio/releases/download/v1.30.0/fortio-linux_amd64-1.30.0.tgz \ +curl -L https://github.com/fortio/fortio/releases/download/v1.30.1/fortio-linux_amd64-1.30.1.tgz \ | sudo tar -C / -xvzpf - # or the debian package -wget https://github.com/fortio/fortio/releases/download/v1.30.0/fortio_1.30.0_amd64.deb -dpkg -i fortio_1.30.0_amd64.deb +wget https://github.com/fortio/fortio/releases/download/v1.30.1/fortio_1.30.1_amd64.deb +dpkg -i fortio_1.30.1_amd64.deb # or the rpm -rpm -i https://github.com/fortio/fortio/releases/download/v1.30.0/fortio-1.30.0-1.x86_64.rpm +rpm -i https://github.com/fortio/fortio/releases/download/v1.30.1/fortio-1.30.1-1.x86_64.rpm # and more, see assets in release page ``` @@ -66,7 +66,7 @@ brew install fortio ``` -On Windows, download https://github.com/fortio/fortio/releases/download/v1.30.0/fortio_win_1.30.0.zip and extract `fortio.exe` to any location, then using the Windows Command Prompt: +On Windows, download https://github.com/fortio/fortio/releases/download/v1.30.1/fortio_win_1.30.1.zip and extract `fortio.exe` to any location, then using the Windows Command Prompt: ``` fortio.exe server ``` @@ -114,7 +114,7 @@ <details> <!-- use release/updateFlags.sh to update this section --> <pre> -???????????? 1.30.0 usage: +???????????? 1.30.1 usage: where command is one of: load (load testing), server (starts ui, http-echo, redirect, proxies, tcp-echo and grpc ping servers), tcp-echo (only the tcp-echo server), report (report only UI server), redirect (only the redirect server), @@ -1142,6 +1142,8 @@ standard --fix ui/static/js/fortio_chart.js ``` +New features and bug fixes should include a test. + ## See also Our wiki and the [Fortio FAQ](https://github.com/fortio/fortio/wiki/FAQ) (including for instance differences between `fortio` and `wrk` or `httpbin`) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.30.0/fhttp/http_client.go new/fortio-1.30.1/fhttp/http_client.go --- old/fortio-1.30.0/fhttp/http_client.go 2022-05-14 01:39:50.000000000 +0200 +++ new/fortio-1.30.1/fhttp/http_client.go 2022-05-17 00:51:18.000000000 +0200 @@ -629,7 +629,7 @@ host = o.hostOverride } if bc.tlsConfig != nil { - bc.tlsConfig.ServerName = host + bc.tlsConfig.ServerName = bc.hostname // Shouldn't have a port #571 } var buf bytes.Buffer buf.WriteString(method + " " + url.RequestURI() + " HTTP/" + proto + "\r\n") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.30.0/release/README.md new/fortio-1.30.1/release/README.md --- old/fortio-1.30.0/release/README.md 2022-05-14 01:39:50.000000000 +0200 +++ new/fortio-1.30.1/release/README.md 2022-05-17 00:51:18.000000000 +0200 @@ -14,19 +14,17 @@ git push -f --tags ``` -- Also push `latest_release` docker tag/image: wait for the autobuild to make it and then: - +- Also push `latest_release` docker tag/image: ```Shell - # for instance for 0.11.0: - docker image pull fortio/fortio:1.1.1 - docker tag fortio/fortio:1.1.1 fortio/fortio:latest_release - docker push fortio/fortio:latest_release + go install github.com/regclient/regclient/cmd/regctl@latest + regctl image copy fortio/fortio:1.30.0 fortio/fortio:latest_release ``` - To update the command line flags in the ../README.md; run `release/updateFlags.sh` - Update the homebrew tap `brew bump-formula-pr --tag v1.2.3 fortio` + ## How to change the build image Update [../Dockerfile.build](../Dockerfile.build) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.30.0/version/version.go new/fortio-1.30.1/version/version.go --- old/fortio-1.30.0/version/version.go 2022-05-14 01:39:50.000000000 +0200 +++ new/fortio-1.30.1/version/version.go 2022-05-17 00:51:18.000000000 +0200 @@ -29,19 +29,17 @@ fullVersion = "unknown full" ) -// Short returns the 3 digit short version string Major.Minor.Patch[-pre] +// Short returns the 3 digit short fortio version string Major.Minor.Patch +// it matches the project git tag (without the leading v) or "dev" when +// not built from tag / not `go install fortio.org/fortio@latest` // version.Short() is the overall project version (used to version json -// output too). "-pre" is added when the version doesn't match exactly -// a git tag or the build isn't from a clean source tree. (only standard -// dockerfile based build of a clean, tagged source tree should print "X.Y.Z" -// as short version). +// output too). func Short() string { return version } -// Long returns the long version and build information. -// Format is "X.Y.X[-pre] YYYY-MM-DD HH:MM SHA[-dirty]" date and time is -// the build date (UTC), sha is the git sha of the source tree. +// Long returns the long fortio version and build information. +// Format is "X.Y.X hash go-version processor os". func Long() string { return longVersion } @@ -52,19 +50,28 @@ return fullVersion } -// Carefully manually tested all the combinations in pair with Dockerfile. - -func init() { // nolint:gochecknoinits //we do need an init for this +// FromBuildInfo can be called by other programs to get their version strings (short,long and full) +// automatically added by go 1.18+ when doing `go install project@vX.Y.Z` +// and is also used for fortio itself. +func FromBuildInfo() (short, long, full string) { binfo, ok := debug.ReadBuildInfo() if !ok { - log.Errf("fortio: unexpected but no build info available") + log.Errf("fortio version module: unexpected but no build info available") return } - v := binfo.Main.Version + short = binfo.Main.Version // '(devel)' messes up the release-tests paths - if v != "(devel)" { - version = v[1:] // skip leading v + if short == "(devel)" || short == "" { + short = "dev" + } else { + short = short[1:] // skip leading v, assumes the project use `vX.Y.Z` tags. } - longVersion = version + " " + binfo.Main.Sum + " " + binfo.GoVersion + " " + runtime.GOARCH + " " + runtime.GOOS - fullVersion = fmt.Sprintf("%s\n%v", longVersion, binfo.String()) + long = short + " " + binfo.Main.Sum + " " + binfo.GoVersion + " " + runtime.GOARCH + " " + runtime.GOOS + full = fmt.Sprintf("%s\n%v", long, binfo.String()) + return +} + +// This "burns in" the fortio version. +func init() { // nolint:gochecknoinits //we do need an init for this + version, longVersion, fullVersion = FromBuildInfo() } ++++++ vendor.tar.gz ++++++