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-06-05 00:45:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fortio (Old) and /work/SRC/openSUSE:Factory/.fortio.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fortio" Sun Jun 5 00:45:45 2022 rev:15 rq:980800 version:1.32.3 Changes: -------- --- /work/SRC/openSUSE:Factory/fortio/fortio.changes 2022-05-31 15:48:35.916036672 +0200 +++ /work/SRC/openSUSE:Factory/.fortio.new.1548/fortio.changes 2022-06-05 00:45:48.936383576 +0200 @@ -1,0 +2,7 @@ +Sat Jun 04 18:59:38 UTC 2022 - ka...@b1-systems.de + +- BuildRequire go1.18 +- Update to version 1.32.3: + * golang 1.18.3, go get -u + keep latest yaml + pin github actions + ... (#585) + +------------------------------------------------------------------- Old: ---- fortio-1.32.2.tar.gz New: ---- fortio-1.32.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fortio.spec ++++++ --- /var/tmp/diff_new_pack.jioexm/_old 2022-06-05 00:45:49.552384098 +0200 +++ /var/tmp/diff_new_pack.jioexm/_new 2022-06-05 00:45:49.556384101 +0200 @@ -19,14 +19,14 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: fortio -Version: 1.32.2 +Version: 1.32.3 Release: 0 Summary: Load testing library, command line tool, advanced echo server and web UI License: Apache-2.0 URL: https://github.com/fortio/fortio Source: fortio-%{version}.tar.gz Source1: vendor.tar.gz -BuildRequires: go >= 1.17 +BuildRequires: go >= 1.18 %description Fortio (????????????) started as, and is, Istio's load testing tool and now graduated to be its own project. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.jioexm/_old 2022-06-05 00:45:49.596384135 +0200 +++ /var/tmp/diff_new_pack.jioexm/_new 2022-06-05 00:45:49.600384138 +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.32.2</param> + <param name="revision">v1.32.3</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.32.2.tar.gz</param> + <param name="archive">fortio-1.32.3.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.jioexm/_old 2022-06-05 00:45:49.624384159 +0200 +++ /var/tmp/diff_new_pack.jioexm/_new 2022-06-05 00:45:49.624384159 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/fortio/fortio</param> - <param name="changesrevision">6b4e2d4870971679f0b586ad1082ad0b9fb4b162</param></service></servicedata> + <param name="changesrevision">56fa5ab3bb0f93af404e124cf17f3f341450adc4</param></service></servicedata> (No newline at EOF) ++++++ fortio-1.32.2.tar.gz -> fortio-1.32.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/.circleci/config.yml new/fortio-1.32.3/.circleci/config.yml --- old/fortio-1.32.2/.circleci/config.yml 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/.circleci/config.yml 2022-06-02 18:35:56.000000000 +0200 @@ -7,7 +7,7 @@ defaultEnv: &defaultEnv docker: # specify the version - - image: docker.io/fortio/fortio.build:v40 + - image: docker.io/fortio/fortio.build:v41 working_directory: /go/src/fortio.org/fortio jobs: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/.github/dependabot.yml new/fortio-1.32.3/.github/dependabot.yml --- old/fortio-1.32.2/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/fortio-1.32.3/.github/dependabot.yml 2022-06-02 18:35:56.000000000 +0200 @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: gomod + directory: / + schedule: + interval: daily diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/.github/workflows/codeql-analysis.yml new/fortio-1.32.3/.github/workflows/codeql-analysis.yml --- old/fortio-1.32.2/.github/workflows/codeql-analysis.yml 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/.github/workflows/codeql-analysis.yml 2022-06-02 18:35:56.000000000 +0200 @@ -11,6 +11,8 @@ # name: "CodeQL" +permissions: {} + on: push: branches: [ master ] @@ -37,34 +39,31 @@ # Learn more about CodeQL language support at https://git.io/codeql-language-support steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ?????? Command-line programs to run using the OS shell. - # ???? https://git.io/JvXDl - - # ?????? If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release + - name: Checkout repository + uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # pin@v2 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@a6611b86918424d4588efe7d6dbe18fe52d42518 # pin@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@a6611b86918424d4588efe7d6dbe18fe52d42518 # pin@v1 + + # ?????? Command-line programs to run using the OS shell. + # ???? https://git.io/JvXDl + # ?????? If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + #- run: | + # make bootstrap + # make release + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@a6611b86918424d4588efe7d6dbe18fe52d42518 # pin@v1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/.github/workflows/main.yml new/fortio-1.32.3/.github/workflows/main.yml --- old/fortio-1.32.2/.github/workflows/main.yml 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/.github/workflows/main.yml 2022-06-02 18:35:56.000000000 +0200 @@ -1,12 +1,16 @@ - name: Release +permissions: + actions: read + contents: write + packages: write + on: push: tags: - # so a vX.Y.Z-test1 doesn't trigger build - - 'v[0-9]+.[0-9]+.[0-9]+' - - 'v[0-9]+.[0-9]+.[0-9]+-pre*' + # so a vX.Y.Z-test1 doesn't trigger build + - 'v[0-9]+.[0-9]+.[0-9]+' + - 'v[0-9]+.[0-9]+.[0-9]+-pre*' # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -18,20 +22,20 @@ # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # pin@v2 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 # pin@v1 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # pin@v1 - name: Available platforms run: echo ${{ steps.buildx.outputs.platforms }} - name: Log in to Docker Hub - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 # pin@f054a8b539a109f9f41c372932f1ae047eff08c9 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_TOKEN }} @@ -48,7 +52,7 @@ echo "Version $VERSION, Package version $PACKAGE_VERSION" - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc # pin@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: context: . platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x @@ -57,7 +61,7 @@ - name: Create Release id: create_release - uses: actions/create-release@v1 + uses: actions/create-release@0cb9c9b65d5d1901c1f53e5e66eaf4afd303e70e # pin@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token with: @@ -70,7 +74,7 @@ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | tag_name="${GITHUB_REF##*/}" - echo "tag_name=$tag_name" + echo "will use tag_name=$tag_name" # tends to fail and not find the release somehow; add a small sleep... (yuck) sleep 10 gh release upload "${tag_name}" release/*.{tgz,zip,rpm,deb,gz} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/.github/workflows/manual-build.yml new/fortio-1.32.3/.github/workflows/manual-build.yml --- old/fortio-1.32.2/.github/workflows/manual-build.yml 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/.github/workflows/manual-build.yml 2022-06-02 18:35:56.000000000 +0200 @@ -1,6 +1,10 @@ - name: Manual Release Update/Rebuild +permissions: + actions: read + contents: write + packages: write + on: workflow_dispatch: inputs: @@ -17,16 +21,16 @@ run: | echo "tag is ${{ github.event.inputs.tag }}" - - uses: actions/checkout@v2 + - uses: actions/checkout@7884fcad6b5d53d10323aee724dc68d8b9096a2e # pin@v2 with: ref: ${{ github.event.inputs.tag }} - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@27d0a4f181a40b142cce983c5393082c365d1480 # pin@v1 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@f211e3e9ded2d9377c8cadc4489a4e38014bc4c9 # pin@v1 - name: Build id: build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/.github/workflows/test.yml new/fortio-1.32.3/.github/workflows/test.yml --- old/fortio-1.32.2/.github/workflows/test.yml 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/.github/workflows/test.yml 2022-06-02 18:35:56.000000000 +0200 @@ -1,6 +1,8 @@ name: Test Tags +permissions: {} + on: push: tags: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/Dockerfile new/fortio-1.32.3/Dockerfile --- old/fortio-1.32.2/Dockerfile 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/Dockerfile 2022-06-02 18:35:56.000000000 +0200 @@ -1,5 +1,5 @@ # Build the binaries in larger image -FROM docker.io/fortio/fortio.build:v40 as build +FROM docker.io/fortio/fortio.build:v41 as build WORKDIR /go/src/fortio.org COPY . fortio ARG MODE=install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/Dockerfile.build new/fortio-1.32.3/Dockerfile.build --- old/fortio-1.32.2/Dockerfile.build 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/Dockerfile.build 2022-06-02 18:35:56.000000000 +0200 @@ -1,5 +1,5 @@ # Dependencies and linters for build: -FROM golang:1.18.2 +FROM golang:1.18.3 # Need gcc for -race test (and some linters though those work with CGO_ENABLED=0) RUN apt-get -y update && \ apt-get --no-install-recommends -y upgrade && \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/Dockerfile.echosrv new/fortio-1.32.3/Dockerfile.echosrv --- old/fortio-1.32.2/Dockerfile.echosrv 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/Dockerfile.echosrv 2022-06-02 18:35:56.000000000 +0200 @@ -1,5 +1,5 @@ # Build the binaries in larger image -FROM docker.io/fortio/fortio.build:v40 as build +FROM docker.io/fortio/fortio.build:v41 as build WORKDIR /go/src/fortio.org COPY . fortio RUN make -C fortio official-build-version BUILD_DIR=/build OFFICIAL_TARGET=fortio.org/fortio/echosrv OFFICIAL_BIN=../echosrv.bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/Dockerfile.fcurl new/fortio-1.32.3/Dockerfile.fcurl --- old/fortio-1.32.2/Dockerfile.fcurl 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/Dockerfile.fcurl 2022-06-02 18:35:56.000000000 +0200 @@ -1,5 +1,5 @@ # Build the binaries in larger image -FROM docker.io/fortio/fortio.build:v40 as build +FROM docker.io/fortio/fortio.build:v41 as build WORKDIR /go/src/fortio.org COPY . fortio # fcurl should not need vendor/no dependencies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/Makefile new/fortio-1.32.3/Makefile --- old/fortio-1.32.2/Makefile 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/Makefile 2022-06-02 18:35:56.000000000 +0200 @@ -7,7 +7,7 @@ IMAGES=echosrv fcurl # plus the combo image / Dockerfile without ext. DOCKER_PREFIX := docker.io/fortio/fortio -BUILD_IMAGE_TAG := v40 +BUILD_IMAGE_TAG := v41 BUILDX_PLATFORMS := linux/amd64,linux/arm64,linux/ppc64le,linux/s390x BUILDX_POSTFIX := ifeq '$(shell echo $(BUILDX_PLATFORMS) | awk -F "," "{print NF-1}")' '0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/README.md new/fortio-1.32.3/README.md --- old/fortio-1.32.2/README.md 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/README.md 2022-06-02 18:35:56.000000000 +0200 @@ -6,7 +6,6 @@ [](https://godoc.org/fortio.org/fortio) [](https://codecov.io/gh/fortio/fortio) [](https://circleci.com/gh/fortio/fortio) -[](https://hub.docker.com/r/fortio/fortio) [](https://hub.docker.com/r/fortio/fortio) <img src="./ui/static/img/fortio-logo-gradient-no-bg.svg" height=109 width=167 align=right /> @@ -52,13 +51,13 @@ 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.32.2/fortio-linux_amd64-1.32.2.tgz \ +curl -L https://github.com/fortio/fortio/releases/download/v1.32.3/fortio-linux_amd64-1.32.3.tgz \ | sudo tar -C / -xvzpf - # or the debian package -wget https://github.com/fortio/fortio/releases/download/v1.32.2/fortio_1.32.2_amd64.deb -dpkg -i fortio_1.32.2_amd64.deb +wget https://github.com/fortio/fortio/releases/download/v1.32.3/fortio_1.32.3_amd64.deb +dpkg -i fortio_1.32.3_amd64.deb # or the rpm -rpm -i https://github.com/fortio/fortio/releases/download/v1.32.2/fortio-1.32.2-1.x86_64.rpm +rpm -i https://github.com/fortio/fortio/releases/download/v1.32.3/fortio-1.32.3-1.x86_64.rpm # and more, see assets in release page ``` @@ -68,7 +67,7 @@ brew install fortio ``` -On Windows, download https://github.com/fortio/fortio/releases/download/v1.32.2/fortio_win_1.32.2.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.32.3/fortio_win_1.32.3.zip and extract `fortio.exe` to any location, then using the Windows Command Prompt: ``` fortio.exe server ``` @@ -116,7 +115,7 @@ <details> <!-- use release/updateFlags.sh to update this section --> <pre> -???????????? 1.32.2 usage: +???????????? 1.32.3 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), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/Webtest.sh new/fortio-1.32.3/Webtest.sh --- old/fortio-1.32.2/Webtest.sh 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/Webtest.sh 2022-06-02 18:35:56.000000000 +0200 @@ -118,7 +118,7 @@ PPROF_URL="$BASE_URL/debug/pprof/heap?debug=1" $CURL "$PPROF_URL" | grep -i TotalAlloc # should find this in memory profile # creating dummy container to hold a volume for test certs due to remote docker bind mount limitation. -DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name $DOCKERSECVOLNAME docker.io/fortio/fortio.build:v40 sleep 120) +DOCKERCURLID=$(docker run -d -v $TEST_CERT_VOL --net host --name $DOCKERSECVOLNAME docker.io/fortio/fortio.build:v41 sleep 120) # while we have something with actual curl binary do # Test for h2c upgrade (#562) docker exec $DOCKERSECVOLNAME /usr/bin/curl -v --http2 -m 10 -d foo42 http://localhost:8080/debug | tee >(cat 1>&2) | grep foo42 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/dflag/configmap/updater.go new/fortio-1.32.3/dflag/configmap/updater.go --- old/fortio-1.32.2/dflag/configmap/updater.go 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/dflag/configmap/updater.go 2022-06-02 18:35:56.000000000 +0200 @@ -41,6 +41,7 @@ // Setup is a combination/shortcut for New+Initialize+Start. func Setup(flagSet *flag.FlagSet, dirPath string) (*Updater, error) { + log.Infof("Configmap flag value watching on %v", dirPath) u, err := New(flagSet, dirPath) if err != nil { return nil, err @@ -52,7 +53,6 @@ if err := u.Start(); err != nil { return nil, err } - log.Infof("Configmap flag value watching initialized on %v", dirPath) return u, nil } @@ -154,7 +154,7 @@ } func (u *Updater) watchForUpdates() { - log.Infof("Starting watching") + log.Infof("Background thread watching %s now running", u.dirPath) for { select { case event := <-u.watcher.Events: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/fhttp/http_client.go new/fortio-1.32.3/fhttp/http_client.go --- old/fortio-1.32.2/fhttp/http_client.go 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/fhttp/http_client.go 2022-06-02 18:35:56.000000000 +0200 @@ -46,8 +46,8 @@ // Close() cleans up connections and state - must be paired with NewClient calls. // returns how many sockets have been used (Fastclient only) Close() int - // GetIPAddress() get the ip address that DNS resolves to - GetIPAddress() string + // GetIPAddress() returns the pair hostname, ip address that DNS resolved to. + GetIPAddress() (string, string) } const ( @@ -400,8 +400,8 @@ } // GetIPAddress get the ip address that DNS resolves to when using stdClient. -func (c *Client) GetIPAddress() string { - return c.req.RemoteAddr +func (c *Client) GetIPAddress() (string, string) { + return c.req.URL.Host, c.req.RemoteAddr } // NewClient creates either a standard or fast client (depending on @@ -535,9 +535,9 @@ tlsConfig *tls.Config } -// GetIPAddress get the ip address that DNS resolves to when using fast client. -func (c *FastClient) GetIPAddress() string { - return c.dest.String() +// GetIPAddress get the hostname and ip address that DNS resolved to when using fast client. +func (c *FastClient) GetIPAddress() (string, string) { + return c.host, c.dest.String() } // Close cleans up any resources used by FastClient. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/fhttp/httprunner.go new/fortio-1.32.3/fhttp/httprunner.go --- old/fortio-1.32.2/fhttp/httprunner.go 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/fhttp/httprunner.go 2022-06-02 18:35:56.000000000 +0200 @@ -186,8 +186,8 @@ keys := []int{} for i := 0; i < numThreads; i++ { // Get the report on the IP address each thread use to send traffic - ip := httpstate[i].client.GetIPAddress() - log.Infof("[%d] %s resolve to IP address: %s\n", i, o.URL, ip) + host, ip := httpstate[i].client.GetIPAddress() + log.Infof("[%d] %s resolved to %s\n", i, host, ip) total.IPCountMap[ip]++ total.SocketCount += httpstate[i].client.Close() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/go.mod new/fortio-1.32.3/go.mod --- old/fortio-1.32.2/go.mod 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/go.mod 2022-06-02 18:35:56.000000000 +0200 @@ -6,14 +6,14 @@ github.com/fsnotify/fsnotify v1.5.4 github.com/golang/protobuf v1.5.2 github.com/google/uuid v1.3.0 - golang.org/x/net v0.0.0-20220524220425-1d687d428aca - google.golang.org/grpc v1.46.0 + golang.org/x/net v0.0.0-20220526153639-5463443f8c37 + google.golang.org/grpc v1.46.2 ) require ( - golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect - google.golang.org/protobuf v1.27.1 // indirect + google.golang.org/genproto v0.0.0-20220525015930-6ca3db687a9d // indirect + google.golang.org/protobuf v1.28.0 // indirect gopkg.in/yaml.v3 v3.0.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/go.sum new/fortio-1.32.3/go.sum --- old/fortio-1.32.2/go.sum 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/go.sum 2022-06-02 18:35:56.000000000 +0200 @@ -70,8 +70,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20220524220425-1d687d428aca h1:xTaFYiPROfpPhqrfTIDXj0ri1SpfueYT951s4bAuDO8= -golang.org/x/net v0.0.0-20220524220425-1d687d428aca/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20220526153639-5463443f8c37 h1:lUkvobShwKsOesNfWWlCS5q7fnbG1MEliIzwu886fn8= +golang.org/x/net v0.0.0-20220526153639-5463443f8c37/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -83,11 +84,17 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -103,16 +110,17 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20220525015930-6ca3db687a9d h1:8BnRR08DxAQ+e2pFx64Q3Ltg/AkrrxyG1LLa1WpomyA= +google.golang.org/genproto v0.0.0-20220525015930-6ca3db687a9d/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= -google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -124,8 +132,9 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/release/Dockerfile.in new/fortio-1.32.3/release/Dockerfile.in --- old/fortio-1.32.2/release/Dockerfile.in 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/release/Dockerfile.in 2022-06-02 18:35:56.000000000 +0200 @@ -1,5 +1,5 @@ # Concatenated after ../Dockerfile to create the tgz -FROM docker.io/fortio/fortio.build:v40 as stage +FROM docker.io/fortio/fortio.build:v41 as stage ARG archs="amd64 arm64 ppc64le s390x" ENV archs=${archs} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fortio-1.32.2/release/README.md new/fortio-1.32.3/release/README.md --- old/fortio-1.32.2/release/README.md 2022-05-26 20:18:23.000000000 +0200 +++ new/fortio-1.32.3/release/README.md 2022-06-02 18:35:56.000000000 +0200 @@ -47,3 +47,13 @@ ``` Check the diff and make lint, webtest, etc and PR + +Regularly update pinned github actions +using https://github.com/mheap/pin-github-action +``` +npm install -g pin-github-action +``` +for each action: +``` +pin-github-action .github/workflows/...yml +``` ++++++ vendor.tar.gz ++++++ ++++ 4354 lines of diff (skipped)
