diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f0b74e..659a26b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,9 +18,9 @@ jobs: test: strategy: matrix: - os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, macos-12, macos-11] - go: [stable, 1.18.x, 1.17.x, 1.16.x, 1.15.x] - name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan }} + os: [ubuntu-22.04, ubuntu-20.04, macos-12, macos-11] + go: [stable, 1.20.x, 1.19.x, 1.18.x] + name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan runs-on: ${{ matrix.os }} steps: - name: Install Linux dependencies for testing libraries @@ -37,19 +37,17 @@ jobs: - uses: actions/checkout@v3 - name: Install Golang ${{ matrix.go }} - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: ${{ matrix.go }} cache: true - name: Test Hyperscan v4 API - if: matrix.os == 'ubuntu-18.04' run: | go test -v -tags hyperscan_v4 ./internal/hs/... ./hyperscan/... go test -race -v -tags hyperscan_v4 ./internal/hs/... ./hyperscan/... - name: Test Hyperscan v5 API - if: matrix.os != 'ubuntu-18.04' run: | go test -v ./internal/hs/... ./hyperscan/... go test -race -v ./internal/hs/... ./hyperscan/... @@ -60,47 +58,36 @@ jobs: include: - os: macos-latest go: stable - hyperscan: 5.4.0 - pcre: 8.45 + hyperscan_version: 5.4.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v54,chimera chimera: true - - os: macos-latest + - os: macos-12 go: stable - hyperscan: 5.2.1 - pcre: 8.45 + hyperscan_version: 5.2.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v52,chimera chimera: true - - os: macos-latest + - os: macos-11 go: stable - hyperscan: 5.1.1 - pcre: 8.45 + hyperscan_version: 5.1.1 + pcre_version: 8.45 build_flags: -tags chimera chimera: true - - os: ubuntu-20.04 + - os: ubuntu-22.04 go: stable - hyperscan: 5.4.0 - pcre: 8.45 + hyperscan_version: 5.4.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v54,chimera chimera: true coverage: true - os: ubuntu-20.04 go: stable - hyperscan: 5.2.1 - pcre: 8.45 + hyperscan_version: 5.2.1 + pcre_version: 8.45 build_flags: -tags hyperscan_v52,chimera chimera: true - - os: ubuntu-20.04 - go: stable - hyperscan: 5.1.1 - pcre: 8.45 - build_flags: -tags chimera - chimera: true - - os: ubuntu-18.04 - go: stable - hyperscan: 4.7.0 - pcre: 8.41 - build_flags: -tags hyperscan_v4 - name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan }} + name: Go ${{ matrix.go }} tests @ ${{ matrix.os }} for hyperscan ${{ matrix.hyperscan_version }} runs-on: ${{ matrix.os }} env: PKG_CONFIG_PATH: ${{ github.workspace }}/dist/lib/pkgconfig @@ -109,15 +96,15 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Install Hyperscan ${{ matrix.hyperscan }} with PCRE ${{ matrix.pcre }} + - name: Install Hyperscan ${{ matrix.hyperscan }} with PCRE ${{ matrix.pcre_version }} uses: flier/install-hyperscan@main with: - hyperscan_version: ${{ matrix.hyperscan }} - pcre_version: ${{ matrix.pcre }} + hyperscan_version: ${{ matrix.hyperscan_version }} + pcre_version: ${{ matrix.pcre_version }} build_static_lib: on src_dir: ${{ runner.temp }}/hyperscan/ install_prefix: ${{ github.workspace }}/dist/ - cache_key: ${{ runner.os }}-build-hyperscan-${{ matrix.hyperscan }}-pcre-${{ matrix.pcre }} + cache_key: ${{ runner.os }}-build-hyperscan-${{ matrix.hyperscan_version }}-pcre-${{ matrix.pcre_version }} - name: Install Golang ${{ matrix.go }} uses: actions/setup-go@v3 @@ -146,7 +133,7 @@ jobs: golangci: name: lint - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Install Linux dependencies run: | diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..d500dfc --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,65 @@ +name: docker + +on: + push: + branches: + - master + paths-ignore: + - "**.md" + pull_request: + paths-ignore: + - "**.md" + +jobs: + docker: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - ubuntu_version: 22.04 + hyperscan_version: 5.4.1 + pcre_version: 8.45 + go_version: 1.20.3 + build_flags: -tags hyperscan_v54,chimera + - ubuntu_version: 20.04 + hyperscan_version: 5.2.1 + pcre_version: 8.45 + go_version: 1.19.8 + build_flags: -tags hyperscan_v52,chimera + - ubuntu_version: 20.04 + hyperscan_version: 5.1.1 + pcre_version: 8.45 + build_flags: -tags chimera + go_version: 1.18.10 + - ubuntu_version: 18.04 + hyperscan_version: 4.7.0 + pcre_version: 8.42 + go_version: 1.18.10 + build_flags: -tags hyperscan_v4 + name: tests @ ubuntu ${{ matrix.ubuntu_version }} for hyperscan ${{ matrix.hyperscan_version }} w/ ${{ matrix.build_flags }} + env: + LATEST_TAG: flier/gohs:${{ matrix.hyperscan_version }} + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Build and push + uses: docker/build-push-action@v4 + with: + load: true + build-args: | + UBUNTU_VERSION=${{ matrix.ubuntu_version }} + HYPERSCAN_VERSION=${{ matrix.hyperscan_version }} + PCRE_VERSION=${{ matrix.pcre_version }} + GO_VERSION=${{ matrix.go_version }} + tags: ${{ env.LATEST_TAG }} + + - name: Test + run: | + docker run --rm ${{ env.LATEST_TAG }} test ${{ matrix.build_flags }} -v ./... diff --git a/Dockerfile b/Dockerfile index f5c3b2a..0a89ac7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,61 +1,116 @@ -ARG UBUNTU_VERSION=20.04 +# syntax=docker/dockerfile:1 -FROM ubuntu:${UBUNTU_VERSION} +ARG UBUNTU_VERSION=22.04 -ARG GO_VERSION=1.17.1 -ARG HYPERSCAN_VERSION=5.4.0 -ARG PCRE_VERSION=8.45 +FROM ubuntu:${UBUNTU_VERSION} as build # Install dependencies ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - cmake \ - libboost-dev \ - libbz2-dev \ - libpcap-dev \ - ninja-build \ - pkg-config \ - python2.7 \ - ragel \ - wget \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - -# Install golang -RUN wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz -O /go${GO_VERSION}.tar.gz && \ - rm -rf /usr/local/go && \ - tar -C /usr/local -xzf /go${GO_VERSION}.tar.gz && \ - rm /go${GO_VERSION}.tar.gz - -ENV PATH=/usr/local/go/bin:${PATH} +# hadolint ignore=DL3008 +RUN < 0 } -func (h *MatchRecorder) Handle(id uint, from, to uint64, flags uint, context interface{}) error { +func (h *MatchRecorder) Handle(id uint, from, to uint64, flags uint, _ interface{}) error { if len(h.Events) > 0 { tail := &h.Events[len(h.Events)-1] diff --git a/vendor/github.com/google/gopacket/go.mod b/vendor/github.com/google/gopacket/go.mod deleted file mode 100644 index b3dfd6f..0000000 --- a/vendor/github.com/google/gopacket/go.mod +++ /dev/null @@ -1,9 +0,0 @@ -module github.com/google/gopacket - -go 1.12 - -require ( - golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/net v0.0.0-20190620200207-3b0461eec859 - golang.org/x/sys v0.0.0-20190412213103-97732733099d -) diff --git a/vendor/github.com/google/gopacket/go.sum b/vendor/github.com/google/gopacket/go.sum deleted file mode 100644 index 4904fca..0000000 --- a/vendor/github.com/google/gopacket/go.sum +++ /dev/null @@ -1,19 +0,0 @@ -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67 h1:1Fzlr8kkDLQwqMP8GxrhptBLqZG/EDpiATneiZHY998= -golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/vendor/github.com/smartystreets/assertions/LICENSE.md b/vendor/github.com/smartystreets/assertions/LICENSE.md index 8ea6f94..e99a66d 100644 --- a/vendor/github.com/smartystreets/assertions/LICENSE.md +++ b/vendor/github.com/smartystreets/assertions/LICENSE.md @@ -1,4 +1,6 @@ -Copyright (c) 2016 SmartyStreets, LLC +MIT License + +Copyright (c) 2023 Smarty Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/github.com/smartystreets/assertions/README.md b/vendor/github.com/smartystreets/assertions/README.md index 10c8d20..b7d34d1 100644 --- a/vendor/github.com/smartystreets/assertions/README.md +++ b/vendor/github.com/smartystreets/assertions/README.md @@ -1,3 +1,5 @@ +#### SMARTY DISCLAIMER: Subject to the terms of the associated license agreement, this software is freely available for your use. This software is FREE, AS IN PUPPIES, and is a gift. Enjoy your new responsibility. This means that while we may consider enhancement requests, we may or may not choose to entertain requests at our sole and absolute discretion. + [![Build Status](https://travis-ci.org/smartystreets/assertions.svg?branch=master)](https://travis-ci.org/smartystreets/assertions) [![Code Coverage](https://codecov.io/gh/smartystreets/assertions/branch/master/graph/badge.svg)](https://codecov.io/gh/smartystreets/assertions) [![Go Report Card](https://goreportcard.com/badge/github.com/smartystreets/assertions)](https://goreportcard.com/report/github.com/smartystreets/assertions) diff --git a/vendor/github.com/smartystreets/assertions/collections.go b/vendor/github.com/smartystreets/assertions/collections.go index b534d4b..b7648c7 100644 --- a/vendor/github.com/smartystreets/assertions/collections.go +++ b/vendor/github.com/smartystreets/assertions/collections.go @@ -9,7 +9,7 @@ import ( // ShouldContain receives exactly two parameters. The first is a slice and the // second is a proposed member. Membership is determined using ShouldEqual. -func ShouldContain(actual interface{}, expected ...interface{}) string { +func ShouldContain(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -26,8 +26,8 @@ func ShouldContain(actual interface{}, expected ...interface{}) string { } // ShouldNotContain receives exactly two parameters. The first is a slice and the -// second is a proposed member. Membership is determinied using ShouldEqual. -func ShouldNotContain(actual interface{}, expected ...interface{}) string { +// second is a proposed member. Membership is determined using ShouldEqual. +func ShouldNotContain(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -44,7 +44,7 @@ func ShouldNotContain(actual interface{}, expected ...interface{}) string { // ShouldContainKey receives exactly two parameters. The first is a map and the // second is a proposed key. Keys are compared with a simple '=='. -func ShouldContainKey(actual interface{}, expected ...interface{}) string { +func ShouldContainKey(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -63,7 +63,7 @@ func ShouldContainKey(actual interface{}, expected ...interface{}) string { // ShouldNotContainKey receives exactly two parameters. The first is a map and the // second is a proposed absent key. Keys are compared with a simple '=='. -func ShouldNotContainKey(actual interface{}, expected ...interface{}) string { +func ShouldNotContainKey(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -80,14 +80,14 @@ func ShouldNotContainKey(actual interface{}, expected ...interface{}) string { return "" } -func mapKeys(m interface{}) ([]reflect.Value, bool) { +func mapKeys(m any) ([]reflect.Value, bool) { value := reflect.ValueOf(m) if value.Kind() != reflect.Map { return nil, false } return value.MapKeys(), true } -func keyFound(keys []reflect.Value, expectedKey interface{}) bool { +func keyFound(keys []reflect.Value, expectedKey any) bool { found := false for _, key := range keys { if key.Interface() == expectedKey { @@ -98,10 +98,10 @@ func keyFound(keys []reflect.Value, expectedKey interface{}) bool { } // ShouldBeIn receives at least 2 parameters. The first is a proposed member of the collection -// that is passed in either as the second parameter, or of the collection that is comprised +// that is passed in either as the second parameter, or of the collection that consists // of all the remaining parameters. This assertion ensures that the proposed member is in // the collection (using ShouldEqual). -func ShouldBeIn(actual interface{}, expected ...interface{}) string { +func ShouldBeIn(actual any, expected ...any) string { if fail := atLeast(1, expected); fail != success { return fail } @@ -111,7 +111,7 @@ func ShouldBeIn(actual interface{}, expected ...interface{}) string { } return shouldBeIn(actual, expected) } -func shouldBeIn(actual interface{}, expected interface{}) string { +func shouldBeIn(actual any, expected any) string { if matchError := oglematchers.Contains(actual).Matches(expected); matchError != nil { return fmt.Sprintf(shouldHaveBeenIn, actual, reflect.TypeOf(expected)) } @@ -119,10 +119,10 @@ func shouldBeIn(actual interface{}, expected interface{}) string { } // ShouldNotBeIn receives at least 2 parameters. The first is a proposed member of the collection -// that is passed in either as the second parameter, or of the collection that is comprised +// that is passed in either as the second parameter, or of the collection that consists // of all the remaining parameters. This assertion ensures that the proposed member is NOT in // the collection (using ShouldEqual). -func ShouldNotBeIn(actual interface{}, expected ...interface{}) string { +func ShouldNotBeIn(actual any, expected ...any) string { if fail := atLeast(1, expected); fail != success { return fail } @@ -132,17 +132,17 @@ func ShouldNotBeIn(actual interface{}, expected ...interface{}) string { } return shouldNotBeIn(actual, expected) } -func shouldNotBeIn(actual interface{}, expected interface{}) string { +func shouldNotBeIn(actual any, expected any) string { if matchError := oglematchers.Contains(actual).Matches(expected); matchError == nil { return fmt.Sprintf(shouldNotHaveBeenIn, actual, reflect.TypeOf(expected)) } return success } -// ShouldBeEmpty receives a single parameter (actual) and determines whether or not +// ShouldBeEmpty receives a single parameter (actual) and determines whether // calling len(actual) would return `0`. It obeys the rules specified by the len // function for determining length: http://golang.org/pkg/builtin/#len -func ShouldBeEmpty(actual interface{}, expected ...interface{}) string { +func ShouldBeEmpty(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -180,10 +180,10 @@ func ShouldBeEmpty(actual interface{}, expected ...interface{}) string { return fmt.Sprintf(shouldHaveBeenEmpty, actual) } -// ShouldNotBeEmpty receives a single parameter (actual) and determines whether or not +// ShouldNotBeEmpty receives a single parameter (actual) and determines whether // calling len(actual) would return a value greater than zero. It obeys the rules // specified by the `len` function for determining length: http://golang.org/pkg/builtin/#len -func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string { +func ShouldNotBeEmpty(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -198,7 +198,7 @@ func ShouldNotBeEmpty(actual interface{}, expected ...interface{}) string { // the length of, the second being the expected length. It obeys the rules // specified by the len function for determining length: // http://golang.org/pkg/builtin/#len -func ShouldHaveLength(actual interface{}, expected ...interface{}) string { +func ShouldHaveLength(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/doc.go b/vendor/github.com/smartystreets/assertions/doc.go index e706db3..1629eef 100644 --- a/vendor/github.com/smartystreets/assertions/doc.go +++ b/vendor/github.com/smartystreets/assertions/doc.go @@ -18,7 +18,7 @@ import ( "runtime" ) -// By default we use a no-op serializer. The actual Serializer provides a JSON +// By default, we use a no-op serializer. The actual Serializer provides a JSON // representation of failure results on selected assertions so the goconvey // web UI can display a convenient diff. var serializer Serializer = new(noopSerializer) @@ -38,7 +38,7 @@ func GoConveyMode(yes bool) { } type testingT interface { - Error(args ...interface{}) + Error(args ...any) } type Assertion struct { @@ -58,7 +58,7 @@ func (this *Assertion) Failed() bool { } // So calls the standalone So function and additionally, calls t.Error in failure scenarios. -func (this *Assertion) So(actual interface{}, assert SoFunc, expected ...interface{}) bool { +func (this *Assertion) So(actual any, assert SoFunc, expected ...any) bool { ok, result := So(actual, assert, expected...) if !ok { this.failed = true @@ -80,13 +80,13 @@ func (this *Assertion) So(actual interface{}, assert SoFunc, expected ...interfa // // Example: // -// if ok, message := So(x, ShouldBeGreaterThan, y); !ok { -// log.Println(message) -// } +// if ok, message := So(x, ShouldBeGreaterThan, y); !ok { +// log.Println(message) +// } // // For an alternative implementation of So (that provides more flexible return options) // see the `So` function in the package at github.com/smartystreets/assertions/assert. -func So(actual interface{}, assert SoFunc, expected ...interface{}) (bool, string) { +func So(actual any, assert SoFunc, expected ...any) (bool, string) { if result := so(actual, assert, expected...); len(result) == 0 { return true, result } else { @@ -96,7 +96,7 @@ func So(actual interface{}, assert SoFunc, expected ...interface{}) (bool, strin // so is like So, except that it only returns the string message, which is blank if the // assertion passed. Used to facilitate testing. -func so(actual interface{}, assert SoFunc, expected ...interface{}) string { +func so(actual any, assert SoFunc, expected ...any) string { return assert(actual, expected...) } @@ -104,6 +104,6 @@ func so(actual interface{}, assert SoFunc, expected ...interface{}) string { // function can handle. Any future or custom assertions should conform to this // method signature. The return value should be an empty string if the SoFunc // passes and a well-formed failure message if not. -type SoFunc func(actual interface{}, expected ...interface{}) string +type SoFunc func(actual any, expected ...any) string //////////////////////////////////////////////////////////////////////////// diff --git a/vendor/github.com/smartystreets/assertions/equal_method.go b/vendor/github.com/smartystreets/assertions/equal_method.go index c4fc38f..fb39733 100644 --- a/vendor/github.com/smartystreets/assertions/equal_method.go +++ b/vendor/github.com/smartystreets/assertions/equal_method.go @@ -3,8 +3,8 @@ package assertions import "reflect" type equalityMethodSpecification struct { - a interface{} - b interface{} + a any + b any aType reflect.Type bType reflect.Type @@ -12,7 +12,7 @@ type equalityMethodSpecification struct { equalMethod reflect.Value } -func newEqualityMethodSpecification(a, b interface{}) *equalityMethodSpecification { +func newEqualityMethodSpecification(a, b any) *equalityMethodSpecification { return &equalityMethodSpecification{ a: a, b: b, diff --git a/vendor/github.com/smartystreets/assertions/equality.go b/vendor/github.com/smartystreets/assertions/equality.go index 37a49f4..8497dee 100644 --- a/vendor/github.com/smartystreets/assertions/equality.go +++ b/vendor/github.com/smartystreets/assertions/equality.go @@ -17,13 +17,13 @@ import ( // 1. If the expected and actual values implement an Equal method in the form // `func (this T) Equal(that T) bool` then call the method. If true, they are equal. // 2. The expected and actual values are judged equal or not by oglematchers.Equals. -func ShouldEqual(actual interface{}, expected ...interface{}) string { +func ShouldEqual(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } return shouldEqual(actual, expected[0]) } -func shouldEqual(actual, expected interface{}) (message string) { +func shouldEqual(actual, expected any) (message string) { defer func() { if r := recover(); r != nil { message = serializer.serialize(expected, actual, composeEqualityMismatchMessage(expected, actual)) @@ -38,7 +38,7 @@ func shouldEqual(actual, expected interface{}) (message string) { return serializer.serialize(expected, actual, composeEqualityMismatchMessage(expected, actual)) } -func composeEqualityMismatchMessage(expected, actual interface{}) string { +func composeEqualityMismatchMessage(expected, actual any) string { var ( renderedExpected = fmt.Sprintf("%v", expected) renderedActual = fmt.Sprintf("%v", actual) @@ -55,7 +55,7 @@ func composeEqualityMismatchMessage(expected, actual interface{}) string { // ShouldNotEqual receives exactly two parameters and does an inequality check. // See ShouldEqual for details on how equality is determined. -func ShouldNotEqual(actual interface{}, expected ...interface{}) string { +func ShouldNotEqual(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if ShouldEqual(actual, expected[0]) == success { @@ -67,7 +67,7 @@ func ShouldNotEqual(actual interface{}, expected ...interface{}) string { // ShouldAlmostEqual makes sure that two parameters are close enough to being equal. // The acceptable delta may be specified with a third argument, // or a very small default delta will be used. -func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string { +func ShouldAlmostEqual(actual any, expected ...any) string { actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...) if err != "" { @@ -82,7 +82,7 @@ func ShouldAlmostEqual(actual interface{}, expected ...interface{}) string { } // ShouldNotAlmostEqual is the inverse of ShouldAlmostEqual -func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string { +func ShouldNotAlmostEqual(actual any, expected ...any) string { actualFloat, expectedFloat, deltaFloat, err := cleanAlmostEqualInput(actual, expected...) if err != "" { @@ -96,7 +96,7 @@ func ShouldNotAlmostEqual(actual interface{}, expected ...interface{}) string { } } -func cleanAlmostEqualInput(actual interface{}, expected ...interface{}) (float64, float64, float64, string) { +func cleanAlmostEqualInput(actual any, expected ...any) (float64, float64, float64, string) { deltaFloat := 0.0000000001 if len(expected) == 0 { @@ -127,7 +127,7 @@ func cleanAlmostEqualInput(actual interface{}, expected ...interface{}) (float64 } // returns the float value of any real number, or error if it is not a numerical type -func getFloat(num interface{}) (float64, error) { +func getFloat(num any) (float64, error) { numValue := reflect.ValueOf(num) numKind := numValue.Kind() @@ -152,7 +152,7 @@ func getFloat(num interface{}) (float64, error) { } // ShouldEqualJSON receives exactly two parameters and does an equality check by marshalling to JSON -func ShouldEqualJSON(actual interface{}, expected ...interface{}) string { +func ShouldEqualJSON(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } @@ -170,7 +170,7 @@ func ShouldEqualJSON(actual interface{}, expected ...interface{}) string { return ShouldEqual(actualString, expectedString) } func remarshal(value string) (string, error) { - var structured interface{} + var structured any err := json.Unmarshal([]byte(value), &structured) if err != nil { return "", err @@ -180,13 +180,17 @@ func remarshal(value string) (string, error) { } // ShouldResemble receives exactly two parameters and does a deep equal check (see reflect.DeepEqual) -func ShouldResemble(actual interface{}, expected ...interface{}) string { +func ShouldResemble(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } if matchError := oglematchers.DeepEquals(expected[0]).Matches(actual); matchError != nil { renderedExpected, renderedActual := render.Render(expected[0]), render.Render(actual) + if renderedActual == renderedExpected { + message := fmt.Sprintf(shouldHaveResembledButTypeDiff, renderedExpected, renderedActual) + return serializer.serializeDetailed(expected[0], actual, message) + } message := fmt.Sprintf(shouldHaveResembled, renderedExpected, renderedActual) + composePrettyDiff(renderedExpected, renderedActual) return serializer.serializeDetailed(expected[0], actual, message) @@ -196,7 +200,7 @@ func ShouldResemble(actual interface{}, expected ...interface{}) string { } // ShouldNotResemble receives exactly two parameters and does an inverse deep equal check (see reflect.DeepEqual) -func ShouldNotResemble(actual interface{}, expected ...interface{}) string { +func ShouldNotResemble(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } else if ShouldResemble(actual, expected[0]) == success { @@ -206,14 +210,14 @@ func ShouldNotResemble(actual interface{}, expected ...interface{}) string { } // ShouldPointTo receives exactly two parameters and checks to see that they point to the same address. -func ShouldPointTo(actual interface{}, expected ...interface{}) string { +func ShouldPointTo(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } return shouldPointTo(actual, expected[0]) } -func shouldPointTo(actual, expected interface{}) string { +func shouldPointTo(actual, expected any) string { actualValue := reflect.ValueOf(actual) expectedValue := reflect.ValueOf(expected) @@ -236,7 +240,7 @@ func shouldPointTo(actual, expected interface{}) string { } // ShouldNotPointTo receives exactly two parameters and checks to see that they point to different addresess. -func ShouldNotPointTo(actual interface{}, expected ...interface{}) string { +func ShouldNotPointTo(actual any, expected ...any) string { if message := need(1, expected); message != success { return message } @@ -250,7 +254,7 @@ func ShouldNotPointTo(actual interface{}, expected ...interface{}) string { } // ShouldBeNil receives a single parameter and ensures that it is nil. -func ShouldBeNil(actual interface{}, expected ...interface{}) string { +func ShouldBeNil(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if actual == nil { @@ -260,7 +264,7 @@ func ShouldBeNil(actual interface{}, expected ...interface{}) string { } return fmt.Sprintf(shouldHaveBeenNil, actual) } -func interfaceHasNilValue(actual interface{}) bool { +func interfaceHasNilValue(actual any) bool { value := reflect.ValueOf(actual) kind := value.Kind() nilable := kind == reflect.Slice || @@ -275,7 +279,7 @@ func interfaceHasNilValue(actual interface{}) bool { } // ShouldNotBeNil receives a single parameter and ensures that it is not nil. -func ShouldNotBeNil(actual interface{}, expected ...interface{}) string { +func ShouldNotBeNil(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if ShouldBeNil(actual) == success { @@ -285,7 +289,7 @@ func ShouldNotBeNil(actual interface{}, expected ...interface{}) string { } // ShouldBeTrue receives a single parameter and ensures that it is true. -func ShouldBeTrue(actual interface{}, expected ...interface{}) string { +func ShouldBeTrue(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if actual != true { @@ -295,7 +299,7 @@ func ShouldBeTrue(actual interface{}, expected ...interface{}) string { } // ShouldBeFalse receives a single parameter and ensures that it is false. -func ShouldBeFalse(actual interface{}, expected ...interface{}) string { +func ShouldBeFalse(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } else if actual != false { @@ -306,7 +310,7 @@ func ShouldBeFalse(actual interface{}, expected ...interface{}) string { // ShouldBeZeroValue receives a single parameter and ensures that it is // the Go equivalent of the default value, or "zero" value. -func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string { +func ShouldBeZeroValue(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -317,9 +321,9 @@ func ShouldBeZeroValue(actual interface{}, expected ...interface{}) string { return success } -// ShouldBeZeroValue receives a single parameter and ensures that it is NOT +// ShouldNotBeZeroValue receives a single parameter and ensures that it is NOT // the Go equivalent of the default value, or "zero" value. -func ShouldNotBeZeroValue(actual interface{}, expected ...interface{}) string { +func ShouldNotBeZeroValue(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/filter.go b/vendor/github.com/smartystreets/assertions/filter.go index cbf7566..f2f27b5 100644 --- a/vendor/github.com/smartystreets/assertions/filter.go +++ b/vendor/github.com/smartystreets/assertions/filter.go @@ -9,21 +9,21 @@ const ( needFewerValues = "This assertion allows %d or fewer comparison values (you provided %d)." ) -func need(needed int, expected []interface{}) string { +func need(needed int, expected []any) string { if len(expected) != needed { return fmt.Sprintf(needExactValues, needed, len(expected)) } return success } -func atLeast(minimum int, expected []interface{}) string { +func atLeast(minimum int, expected []any) string { if len(expected) < minimum { return needNonEmptyCollection } return success } -func atMost(max int, expected []interface{}) string { +func atMost(max int, expected []any) string { if len(expected) > max { return fmt.Sprintf(needFewerValues, max, len(expected)) } diff --git a/vendor/github.com/smartystreets/assertions/go.mod b/vendor/github.com/smartystreets/assertions/go.mod deleted file mode 100644 index 7570e40..0000000 --- a/vendor/github.com/smartystreets/assertions/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module github.com/smartystreets/assertions - -go 1.17 diff --git a/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go b/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go index 0dbe3bd..80b8abf 100644 --- a/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go +++ b/vendor/github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch/patch.go @@ -112,7 +112,7 @@ func (dmp *DiffMatchPatch) PatchAddContext(patch Patch, text string) Patch { } // PatchMake computes a list of patches. -func (dmp *DiffMatchPatch) PatchMake(opt ...interface{}) []Patch { +func (dmp *DiffMatchPatch) PatchMake(opt ...any) []Patch { if len(opt) == 1 { diffs, _ := opt[0].([]Diff) text1 := dmp.DiffText1(diffs) diff --git a/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go b/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go index 313611e..357b744 100644 --- a/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go +++ b/vendor/github.com/smartystreets/assertions/internal/go-render/render/render.go @@ -48,7 +48,7 @@ var typeOfFloat = reflect.TypeOf(10.1) // Render converts a structure to a string representation. Unline the "%#v" // format string, this resolves pointer types' contents in structs, maps, and // slices/arrays and prints their field values. -func Render(v interface{}) string { +func Render(v any) string { buf := bytes.Buffer{} s := (*traverseState)(nil) s.render(&buf, 0, reflect.ValueOf(v), false) @@ -296,7 +296,7 @@ func writeType(buf *bytes.Buffer, ptrs int, t reflect.Type) { if n := t.Name(); n != "" { buf.WriteString(t.String()) } else { - buf.WriteString("interface{}") + buf.WriteString("any") } case reflect.Array: diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go index 2918b51..fa4fd4b 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/any_of.go @@ -38,7 +38,7 @@ import ( // // This is akin to a logical OR operation for matchers, with non-matchers x // being treated as Equals(x). -func AnyOf(vals ...interface{}) Matcher { +func AnyOf(vals ...any) Matcher { // Get ahold of a type variable for the Matcher interface. var dummy *Matcher matcherType := reflect.TypeOf(dummy).Elem() @@ -71,7 +71,7 @@ func (m *anyOfMatcher) Description() string { return fmt.Sprintf("or(%s)", strings.Join(wrappedDescs, ", ")) } -func (m *anyOfMatcher) Matches(c interface{}) (err error) { +func (m *anyOfMatcher) Matches(c any) (err error) { err = errors.New("") // Try each matcher in turn. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go index 87f107d..cdc4e80 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/contains.go @@ -23,7 +23,7 @@ import ( // Return a matcher that matches arrays slices with at least one element that // matches the supplied argument. If the argument x is not itself a Matcher, // this is equivalent to Contains(Equals(x)). -func Contains(x interface{}) Matcher { +func Contains(x any) Matcher { var result containsMatcher var ok bool @@ -42,7 +42,7 @@ func (m *containsMatcher) Description() string { return fmt.Sprintf("contains: %s", m.elementMatcher.Description()) } -func (m *containsMatcher) Matches(candidate interface{}) error { +func (m *containsMatcher) Matches(candidate any) error { // The candidate must be a slice or an array. v := reflect.ValueOf(candidate) if v.Kind() != reflect.Slice && v.Kind() != reflect.Array { diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go index 1d91bae..8d8d264 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/deep_equals.go @@ -27,12 +27,12 @@ var byteSliceType reflect.Type = reflect.TypeOf([]byte{}) // DeepEquals returns a matcher that matches based on 'deep equality', as // defined by the reflect package. This matcher requires that values have // identical types to x. -func DeepEquals(x interface{}) Matcher { +func DeepEquals(x any) Matcher { return &deepEqualsMatcher{x} } type deepEqualsMatcher struct { - x interface{} + x any } func (m *deepEqualsMatcher) Description() string { @@ -49,7 +49,7 @@ func (m *deepEqualsMatcher) Description() string { return fmt.Sprintf("deep equals: %s", xDesc) } -func (m *deepEqualsMatcher) Matches(c interface{}) error { +func (m *deepEqualsMatcher) Matches(c any) error { // Make sure the types match. ct := reflect.TypeOf(c) xt := reflect.TypeOf(m.x) diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go index a510707..6c50976 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/equals.go @@ -28,23 +28,23 @@ import ( // matcher does not support), but for convenience the following rules also // apply: // -// * Type checking is done based on underlying types rather than actual +// - Type checking is done based on underlying types rather than actual // types, so that e.g. two aliases for string can be compared: // -// type stringAlias1 string -// type stringAlias2 string +// type stringAlias1 string +// type stringAlias2 string // -// a := "taco" -// b := stringAlias1("taco") -// c := stringAlias2("taco") +// a := "taco" +// b := stringAlias1("taco") +// c := stringAlias2("taco") // -// ExpectTrue(a == b) // Legal, passes -// ExpectTrue(b == c) // Illegal, doesn't compile +// ExpectTrue(a == b) // Legal, passes +// ExpectTrue(b == c) // Illegal, doesn't compile // -// ExpectThat(a, Equals(b)) // Passes -// ExpectThat(b, Equals(c)) // Passes +// ExpectThat(a, Equals(b)) // Passes +// ExpectThat(b, Equals(c)) // Passes // -// * Values of numeric type are treated as if they were abstract numbers, and +// - Values of numeric type are treated as if they were abstract numbers, and // compared accordingly. Therefore Equals(17) will match int(17), // int16(17), uint(17), float32(17), complex64(17), and so on. // @@ -55,7 +55,7 @@ import ( // exceptions above. Two arrays compared with this matcher must have identical // types, and their element type must itself be comparable according to Go's == // operator. -func Equals(x interface{}) Matcher { +func Equals(x any) Matcher { v := reflect.ValueOf(x) // This matcher doesn't support structs. @@ -473,7 +473,7 @@ func checkForNil(c reflect.Value) (err error) { // Public implementation //////////////////////////////////////////////////////////////////////// -func (m *equalsMatcher) Matches(candidate interface{}) error { +func (m *equalsMatcher) Matches(candidate any) error { e := m.expectedValue c := reflect.ValueOf(candidate) ek := e.Kind() diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go index 4b9d103..dbd8bc7 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_or_equal.go @@ -27,7 +27,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // GreaterOrEqual will panic. -func GreaterOrEqual(x interface{}) Matcher { +func GreaterOrEqual(x any) Matcher { desc := fmt.Sprintf("greater than or equal to %v", x) // Special case: make it clear that strings are strings. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go index 3eef321..6865559 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/greater_than.go @@ -27,7 +27,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // GreaterThan will panic. -func GreaterThan(x interface{}) Matcher { +func GreaterThan(x any) Matcher { desc := fmt.Sprintf("greater than %v", x) // Special case: make it clear that strings are strings. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go index 8402cde..30b249b 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_or_equal.go @@ -27,7 +27,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // LessOrEqual will panic. -func LessOrEqual(x interface{}) Matcher { +func LessOrEqual(x any) Matcher { desc := fmt.Sprintf("less than or equal to %v", x) // Special case: make it clear that strings are strings. diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go index 8258e45..aa97eef 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/less_than.go @@ -28,7 +28,7 @@ import ( // // x must itself be an integer, floating point, or string type; otherwise, // LessThan will panic. -func LessThan(x interface{}) Matcher { +func LessThan(x any) Matcher { v := reflect.ValueOf(x) kind := v.Kind() @@ -104,7 +104,7 @@ func getFloat(v reflect.Value) float64 { panic(fmt.Sprintf("getFloat: %v", v)) } -func (m *lessThanMatcher) Matches(c interface{}) (err error) { +func (m *lessThanMatcher) Matches(c any) (err error) { v1 := reflect.ValueOf(c) v2 := m.limit diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go index 78159a0..2a59e4d 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/matcher.go @@ -54,7 +54,7 @@ type Matcher interface { // // If you are implementing a new matcher, see also the documentation on // FatalError. - Matches(candidate interface{}) error + Matches(candidate any) error // Description returns a string describing the property that values matching // this matcher have, as a verb phrase where the subject is the value. For diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go index 623789f..6238d5c 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/not.go @@ -31,7 +31,7 @@ type notMatcher struct { wrapped Matcher } -func (m *notMatcher) Matches(c interface{}) (err error) { +func (m *notMatcher) Matches(c any) (err error) { err = m.wrapped.Matches(c) // Did the wrapped matcher say yes? diff --git a/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go b/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go index 8ea2807..f057768 100644 --- a/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go +++ b/vendor/github.com/smartystreets/assertions/internal/oglematchers/transform_description.go @@ -31,6 +31,6 @@ func (m *transformDescriptionMatcher) Description() string { return m.desc } -func (m *transformDescriptionMatcher) Matches(c interface{}) error { +func (m *transformDescriptionMatcher) Matches(c any) error { return m.wrappedMatcher.Matches(c) } diff --git a/vendor/github.com/smartystreets/assertions/messages.go b/vendor/github.com/smartystreets/assertions/messages.go index cd2ec90..7a32999 100644 --- a/vendor/github.com/smartystreets/assertions/messages.go +++ b/vendor/github.com/smartystreets/assertions/messages.go @@ -9,8 +9,9 @@ const ( shouldHaveBeenAlmostEqual = "Expected '%v' to almost equal '%v' (but it didn't)!" shouldHaveNotBeenAlmostEqual = "Expected '%v' to NOT almost equal '%v' (but it did)!" - shouldHaveResembled = "Expected: '%s'\nActual: '%s'\n(Should resemble)!" - shouldNotHaveResembled = "Expected '%#v'\nto NOT resemble '%#v'\n(but it did)!" + shouldHaveResembled = "Expected: '%s'\nActual: '%s'\n(Should resemble)!" + shouldHaveResembledButTypeDiff = "Expected: '%s'\nActual: '%s'\n(Should resemble, but there is a type difference within the two)!" + shouldNotHaveResembled = "Expected '%#v'\nto NOT resemble '%#v'\n(but it did)!" shouldBePointers = "Both arguments should be pointers " shouldHaveBeenNonNilPointer = shouldBePointers + "(the %s was %s)!" @@ -104,5 +105,5 @@ const ( // format params: incorrect-index, previous-index, previous-time, incorrect-index, incorrect-time shouldHaveBeenChronological = "The 'Time' at index [%d] should have happened after the previous one (but it didn't!):\n [%d]: %s\n [%d]: %s (see, it happened before!)" - shouldNotHaveBeenchronological = "The provided times should NOT be chronological, but they were." + shouldNotHaveBeenChronological = "The provided times should NOT be chronological, but they were." ) diff --git a/vendor/github.com/smartystreets/assertions/panic.go b/vendor/github.com/smartystreets/assertions/panic.go index ccb1574..cbfcc26 100644 --- a/vendor/github.com/smartystreets/assertions/panic.go +++ b/vendor/github.com/smartystreets/assertions/panic.go @@ -6,7 +6,7 @@ import ( ) // ShouldPanic receives a void, niladic function and expects to recover a panic. -func ShouldPanic(actual interface{}, expected ...interface{}) (message string) { +func ShouldPanic(actual any, expected ...any) (message string) { if fail := need(0, expected); fail != success { return fail } @@ -32,7 +32,7 @@ func ShouldPanic(actual interface{}, expected ...interface{}) (message string) { } // ShouldNotPanic receives a void, niladic function and expects to execute the function without any panic. -func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string) { +func ShouldNotPanic(actual any, expected ...any) (message string) { if fail := need(0, expected); fail != success { return fail } @@ -58,8 +58,8 @@ func ShouldNotPanic(actual interface{}, expected ...interface{}) (message string } // ShouldPanicWith receives a void, niladic function and expects to recover a panic with the second argument as the content. -// If the expected value is an error and the recovered value is an error, errors.Is is used to compare them. -func ShouldPanicWith(actual interface{}, expected ...interface{}) (message string) { +// If the expected value is an error and the recovered value is an error, errors.Is will be used to compare them. +func ShouldPanicWith(actual any, expected ...any) (message string) { if fail := need(1, expected); fail != success { return fail } @@ -93,8 +93,8 @@ func ShouldPanicWith(actual interface{}, expected ...interface{}) (message strin } // ShouldNotPanicWith receives a void, niladic function and expects to recover a panic whose content differs from the second argument. -// If the expected value is an error and the recovered value is an error, errors.Is is used to compare them. -func ShouldNotPanicWith(actual interface{}, expected ...interface{}) (message string) { +// If the expected value is an error and the recovered value is an error, errors.Is will be used to compare them. +func ShouldNotPanicWith(actual any, expected ...any) (message string) { if fail := need(1, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/quantity.go b/vendor/github.com/smartystreets/assertions/quantity.go index f28b0a0..6c3e725 100644 --- a/vendor/github.com/smartystreets/assertions/quantity.go +++ b/vendor/github.com/smartystreets/assertions/quantity.go @@ -7,7 +7,7 @@ import ( ) // ShouldBeGreaterThan receives exactly two parameters and ensures that the first is greater than the second. -func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string { +func ShouldBeGreaterThan(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -19,7 +19,7 @@ func ShouldBeGreaterThan(actual interface{}, expected ...interface{}) string { } // ShouldBeGreaterThanOrEqualTo receives exactly two parameters and ensures that the first is greater than or equal to the second. -func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) string { +func ShouldBeGreaterThanOrEqualTo(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if matchError := oglematchers.GreaterOrEqual(expected[0]).Matches(actual); matchError != nil { @@ -29,7 +29,7 @@ func ShouldBeGreaterThanOrEqualTo(actual interface{}, expected ...interface{}) s } // ShouldBeLessThan receives exactly two parameters and ensures that the first is less than the second. -func ShouldBeLessThan(actual interface{}, expected ...interface{}) string { +func ShouldBeLessThan(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if matchError := oglematchers.LessThan(expected[0]).Matches(actual); matchError != nil { @@ -38,8 +38,8 @@ func ShouldBeLessThan(actual interface{}, expected ...interface{}) string { return success } -// ShouldBeLessThan receives exactly two parameters and ensures that the first is less than or equal to the second. -func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) string { +// ShouldBeLessThanOrEqualTo receives exactly two parameters and ensures that the first is less than or equal to the second. +func ShouldBeLessThanOrEqualTo(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } else if matchError := oglematchers.LessOrEqual(expected[0]).Matches(actual); matchError != nil { @@ -50,7 +50,7 @@ func ShouldBeLessThanOrEqualTo(actual interface{}, expected ...interface{}) stri // ShouldBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is between both bounds (but not equal to either of them). -func ShouldBeBetween(actual interface{}, expected ...interface{}) string { +func ShouldBeBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -66,7 +66,7 @@ func ShouldBeBetween(actual interface{}, expected ...interface{}) string { // ShouldNotBeBetween receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is NOT between both bounds. -func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string { +func ShouldNotBeBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -79,7 +79,7 @@ func ShouldNotBeBetween(actual interface{}, expected ...interface{}) string { } return success } -func deriveBounds(values []interface{}) (lower interface{}, upper interface{}, fail string) { +func deriveBounds(values []any) (lower any, upper any, fail string) { lower = values[0] upper = values[1] @@ -90,7 +90,7 @@ func deriveBounds(values []interface{}) (lower interface{}, upper interface{}, f } return lower, upper, success } -func isBetween(value, lower, upper interface{}) bool { +func isBetween(value, lower, upper any) bool { if ShouldBeGreaterThan(value, lower) != success { return false } else if ShouldBeLessThan(value, upper) != success { @@ -101,7 +101,7 @@ func isBetween(value, lower, upper interface{}) bool { // ShouldBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is between both bounds or equal to one of them. -func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string { +func ShouldBeBetweenOrEqual(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -117,7 +117,7 @@ func ShouldBeBetweenOrEqual(actual interface{}, expected ...interface{}) string // ShouldNotBeBetweenOrEqual receives exactly three parameters: an actual value, a lower bound, and an upper bound. // It ensures that the actual value is nopt between the bounds nor equal to either of them. -func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) string { +func ShouldNotBeBetweenOrEqual(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -131,7 +131,7 @@ func ShouldNotBeBetweenOrEqual(actual interface{}, expected ...interface{}) stri return success } -func isBetweenOrEqual(value, lower, upper interface{}) bool { +func isBetweenOrEqual(value, lower, upper any) bool { if ShouldBeGreaterThanOrEqualTo(value, lower) != success { return false } else if ShouldBeLessThanOrEqualTo(value, upper) != success { diff --git a/vendor/github.com/smartystreets/assertions/serializer.go b/vendor/github.com/smartystreets/assertions/serializer.go index f1e3570..3fdf5dd 100644 --- a/vendor/github.com/smartystreets/assertions/serializer.go +++ b/vendor/github.com/smartystreets/assertions/serializer.go @@ -9,13 +9,13 @@ import ( ) type Serializer interface { - serialize(expected, actual interface{}, message string) string - serializeDetailed(expected, actual interface{}, message string) string + serialize(expected, actual any, message string) string + serializeDetailed(expected, actual any, message string) string } type failureSerializer struct{} -func (self *failureSerializer) serializeDetailed(expected, actual interface{}, message string) string { +func (self *failureSerializer) serializeDetailed(expected, actual any, message string) string { if index := strings.Index(message, " Diff:"); index > 0 { message = message[:index] } @@ -28,7 +28,7 @@ func (self *failureSerializer) serializeDetailed(expected, actual interface{}, m return string(serialized) } -func (self *failureSerializer) serialize(expected, actual interface{}, message string) string { +func (self *failureSerializer) serialize(expected, actual any, message string) string { if index := strings.Index(message, " Diff:"); index > 0 { message = message[:index] } @@ -47,7 +47,7 @@ func newSerializer() *failureSerializer { /////////////////////////////////////////////////////////////////////////////// -// This struct is also declared in github.com/smartystreets/goconvey/convey/reporting. +// FailureView is also declared in github.com/smartystreets/goconvey/convey/reporting. // The json struct tags should be equal in both declarations. type FailureView struct { Message string `json:"Message"` @@ -62,9 +62,9 @@ type FailureView struct { // structure provided by the failureSerializer. type noopSerializer struct{} -func (self *noopSerializer) serialize(expected, actual interface{}, message string) string { +func (self *noopSerializer) serialize(expected, actual any, message string) string { return message } -func (self *noopSerializer) serializeDetailed(expected, actual interface{}, message string) string { +func (self *noopSerializer) serializeDetailed(expected, actual any, message string) string { return message } diff --git a/vendor/github.com/smartystreets/assertions/strings.go b/vendor/github.com/smartystreets/assertions/strings.go index 9e25759..6f5ce39 100644 --- a/vendor/github.com/smartystreets/assertions/strings.go +++ b/vendor/github.com/smartystreets/assertions/strings.go @@ -7,7 +7,7 @@ import ( ) // ShouldStartWith receives exactly 2 string parameters and ensures that the first starts with the second. -func ShouldStartWith(actual interface{}, expected ...interface{}) string { +func ShouldStartWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -33,7 +33,7 @@ func shouldStartWith(value, prefix string) string { } // ShouldNotStartWith receives exactly 2 string parameters and ensures that the first does not start with the second. -func ShouldNotStartWith(actual interface{}, expected ...interface{}) string { +func ShouldNotStartWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -61,7 +61,7 @@ func shouldNotStartWith(value, prefix string) string { } // ShouldEndWith receives exactly 2 string parameters and ensures that the first ends with the second. -func ShouldEndWith(actual interface{}, expected ...interface{}) string { +func ShouldEndWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -86,8 +86,8 @@ func shouldEndWith(value, suffix string) string { return success } -// ShouldEndWith receives exactly 2 string parameters and ensures that the first does not end with the second. -func ShouldNotEndWith(actual interface{}, expected ...interface{}) string { +// ShouldNotEndWith receives exactly 2 string parameters and ensures that the first does not end with the second. +func ShouldNotEndWith(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -115,7 +115,7 @@ func shouldNotEndWith(value, suffix string) string { } // ShouldContainSubstring receives exactly 2 string parameters and ensures that the first contains the second as a substring. -func ShouldContainSubstring(actual interface{}, expected ...interface{}) string { +func ShouldContainSubstring(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -134,7 +134,7 @@ func ShouldContainSubstring(actual interface{}, expected ...interface{}) string } // ShouldNotContainSubstring receives exactly 2 string parameters and ensures that the first does NOT contain the second as a substring. -func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) string { +func ShouldNotContainSubstring(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -153,7 +153,7 @@ func ShouldNotContainSubstring(actual interface{}, expected ...interface{}) stri } // ShouldBeBlank receives exactly 1 string parameter and ensures that it is equal to "". -func ShouldBeBlank(actual interface{}, expected ...interface{}) string { +func ShouldBeBlank(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -168,7 +168,7 @@ func ShouldBeBlank(actual interface{}, expected ...interface{}) string { } // ShouldNotBeBlank receives exactly 1 string parameter and ensures that it is not equal to "". -func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string { +func ShouldNotBeBlank(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -184,7 +184,7 @@ func ShouldNotBeBlank(actual interface{}, expected ...interface{}) string { // ShouldEqualWithout receives exactly 3 string parameters and ensures that the first is equal to the second // after removing all instances of the third from the first using strings.Replace(first, third, "", -1). -func ShouldEqualWithout(actual interface{}, expected ...interface{}) string { +func ShouldEqualWithout(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -210,7 +210,7 @@ func ShouldEqualWithout(actual interface{}, expected ...interface{}) string { // ShouldEqualTrimSpace receives exactly 2 string parameters and ensures that the first is equal to the second // after removing all leading and trailing whitespace using strings.TrimSpace(first). -func ShouldEqualTrimSpace(actual interface{}, expected ...interface{}) string { +func ShouldEqualTrimSpace(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } diff --git a/vendor/github.com/smartystreets/assertions/time.go b/vendor/github.com/smartystreets/assertions/time.go index 918ee28..874c297 100644 --- a/vendor/github.com/smartystreets/assertions/time.go +++ b/vendor/github.com/smartystreets/assertions/time.go @@ -6,7 +6,7 @@ import ( ) // ShouldHappenBefore receives exactly 2 time.Time arguments and asserts that the first happens before the second. -func ShouldHappenBefore(actual interface{}, expected ...interface{}) string { +func ShouldHappenBefore(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -25,7 +25,7 @@ func ShouldHappenBefore(actual interface{}, expected ...interface{}) string { } // ShouldHappenOnOrBefore receives exactly 2 time.Time arguments and asserts that the first happens on or before the second. -func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string { +func ShouldHappenOnOrBefore(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -43,7 +43,7 @@ func ShouldHappenOnOrBefore(actual interface{}, expected ...interface{}) string } // ShouldHappenAfter receives exactly 2 time.Time arguments and asserts that the first happens after the second. -func ShouldHappenAfter(actual interface{}, expected ...interface{}) string { +func ShouldHappenAfter(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -60,7 +60,7 @@ func ShouldHappenAfter(actual interface{}, expected ...interface{}) string { } // ShouldHappenOnOrAfter receives exactly 2 time.Time arguments and asserts that the first happens on or after the second. -func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string { +func ShouldHappenOnOrAfter(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -77,7 +77,7 @@ func ShouldHappenOnOrAfter(actual interface{}, expected ...interface{}) string { } // ShouldHappenBetween receives exactly 3 time.Time arguments and asserts that the first happens between (not on) the second and third. -func ShouldHappenBetween(actual interface{}, expected ...interface{}) string { +func ShouldHappenBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -99,7 +99,7 @@ func ShouldHappenBetween(actual interface{}, expected ...interface{}) string { } // ShouldHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first happens between or on the second and third. -func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string { +func ShouldHappenOnOrBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -118,7 +118,7 @@ func ShouldHappenOnOrBetween(actual interface{}, expected ...interface{}) string // ShouldNotHappenOnOrBetween receives exactly 3 time.Time arguments and asserts that the first // does NOT happen between or on the second or third. -func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) string { +func ShouldNotHappenOnOrBetween(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -141,7 +141,7 @@ func ShouldNotHappenOnOrBetween(actual interface{}, expected ...interface{}) str // ShouldHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments) // and asserts that the first time.Time happens within or on the duration specified relative to // the other time.Time. -func ShouldHappenWithin(actual interface{}, expected ...interface{}) string { +func ShouldHappenWithin(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -161,7 +161,7 @@ func ShouldHappenWithin(actual interface{}, expected ...interface{}) string { // ShouldNotHappenWithin receives a time.Time, a time.Duration, and a time.Time (3 arguments) // and asserts that the first time.Time does NOT happen within or on the duration specified relative to // the other time.Time. -func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string { +func ShouldNotHappenWithin(actual any, expected ...any) string { if fail := need(2, expected); fail != success { return fail } @@ -180,7 +180,7 @@ func ShouldNotHappenWithin(actual interface{}, expected ...interface{}) string { // ShouldBeChronological receives a []time.Time slice and asserts that they are // in chronological order starting with the first time.Time as the earliest. -func ShouldBeChronological(actual interface{}, expected ...interface{}) string { +func ShouldBeChronological(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -203,7 +203,7 @@ func ShouldBeChronological(actual interface{}, expected ...interface{}) string { // ShouldNotBeChronological receives a []time.Time slice and asserts that they are // NOT in chronological order. -func ShouldNotBeChronological(actual interface{}, expected ...interface{}) string { +func ShouldNotBeChronological(actual any, expected ...any) string { if fail := need(0, expected); fail != success { return fail } @@ -214,5 +214,5 @@ func ShouldNotBeChronological(actual interface{}, expected ...interface{}) strin if result != "" { return "" } - return shouldNotHaveBeenchronological + return shouldNotHaveBeenChronological } diff --git a/vendor/github.com/smartystreets/assertions/type.go b/vendor/github.com/smartystreets/assertions/type.go index 1984fe8..271544a 100644 --- a/vendor/github.com/smartystreets/assertions/type.go +++ b/vendor/github.com/smartystreets/assertions/type.go @@ -7,7 +7,7 @@ import ( ) // ShouldHaveSameTypeAs receives exactly two parameters and compares their underlying types for equality. -func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string { +func ShouldHaveSameTypeAs(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -23,7 +23,7 @@ func ShouldHaveSameTypeAs(actual interface{}, expected ...interface{}) string { } // ShouldNotHaveSameTypeAs receives exactly two parameters and compares their underlying types for inequality. -func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string { +func ShouldNotHaveSameTypeAs(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -39,7 +39,7 @@ func ShouldNotHaveSameTypeAs(actual interface{}, expected ...interface{}) string // ShouldImplement receives exactly two parameters and ensures // that the first implements the interface type of the second. -func ShouldImplement(actual interface{}, expectedList ...interface{}) string { +func ShouldImplement(actual any, expectedList ...any) string { if fail := need(1, expectedList); fail != success { return fail } @@ -75,7 +75,7 @@ func ShouldImplement(actual interface{}, expectedList ...interface{}) string { // ShouldNotImplement receives exactly two parameters and ensures // that the first does NOT implement the interface type of the second. -func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string { +func ShouldNotImplement(actual any, expectedList ...any) string { if fail := need(1, expectedList); fail != success { return fail } @@ -112,7 +112,7 @@ func ShouldNotImplement(actual interface{}, expectedList ...interface{}) string // ShouldBeError asserts that the first argument implements the error interface. // It also compares the first argument against the second argument if provided // (which must be an error message string or another error value). -func ShouldBeError(actual interface{}, expected ...interface{}) string { +func ShouldBeError(actual any, expected ...any) string { if fail := atMost(1, expected); fail != success { return fail } @@ -134,7 +134,7 @@ func ShouldBeError(actual interface{}, expected ...interface{}) string { // ShouldWrap asserts that the first argument (which must be an error value) // 'wraps' the second/final argument (which must also be an error value). // It relies on errors.Is to make the determination (https://golang.org/pkg/errors/#Is). -func ShouldWrap(actual interface{}, expected ...interface{}) string { +func ShouldWrap(actual any, expected ...any) string { if fail := need(1, expected); fail != success { return fail } @@ -150,5 +150,5 @@ func ShouldWrap(actual interface{}, expected ...interface{}) string { return success } -func isString(value interface{}) bool { _, ok := value.(string); return ok } -func isError(value interface{}) bool { _, ok := value.(error); return ok } +func isString(value any) bool { _, ok := value.(string); return ok } +func isError(value any) bool { _, ok := value.(error); return ok } diff --git a/vendor/github.com/smartystreets/goconvey/LICENSE.md b/vendor/github.com/smartystreets/goconvey/LICENSE.md index 3f87a40..99ce426 100644 --- a/vendor/github.com/smartystreets/goconvey/LICENSE.md +++ b/vendor/github.com/smartystreets/goconvey/LICENSE.md @@ -1,4 +1,6 @@ -Copyright (c) 2016 SmartyStreets, LLC +MIT License + +Copyright (c) 2022 Smarty Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/github.com/smartystreets/goconvey/convey/assertions.go b/vendor/github.com/smartystreets/goconvey/convey/assertions.go index 9fad7c2..bff8eac 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/assertions.go +++ b/vendor/github.com/smartystreets/goconvey/convey/assertions.go @@ -1,73 +1,75 @@ package convey +// DO NOT EDIT: generated by update_assertions.sh + +//go:generate ./update_assertions.sh + import "github.com/smartystreets/assertions" +// These assertions are forwarded from github.com/smartystreets/assertions +// in order to make convey self-contained. var ( - ShouldEqual = assertions.ShouldEqual - ShouldNotEqual = assertions.ShouldNotEqual - ShouldAlmostEqual = assertions.ShouldAlmostEqual - ShouldNotAlmostEqual = assertions.ShouldNotAlmostEqual - ShouldEqualJSON = assertions.ShouldEqualJSON - ShouldResemble = assertions.ShouldResemble - ShouldNotResemble = assertions.ShouldNotResemble - ShouldPointTo = assertions.ShouldPointTo - ShouldNotPointTo = assertions.ShouldNotPointTo - ShouldBeNil = assertions.ShouldBeNil - ShouldNotBeNil = assertions.ShouldNotBeNil - ShouldBeTrue = assertions.ShouldBeTrue - ShouldBeFalse = assertions.ShouldBeFalse - ShouldBeZeroValue = assertions.ShouldBeZeroValue - ShouldNotBeZeroValue = assertions.ShouldNotBeZeroValue - + ShouldAlmostEqual = assertions.ShouldAlmostEqual + ShouldBeBetween = assertions.ShouldBeBetween + ShouldBeBetweenOrEqual = assertions.ShouldBeBetweenOrEqual + ShouldBeBlank = assertions.ShouldBeBlank + ShouldBeChronological = assertions.ShouldBeChronological + ShouldBeEmpty = assertions.ShouldBeEmpty + ShouldBeError = assertions.ShouldBeError + ShouldBeFalse = assertions.ShouldBeFalse ShouldBeGreaterThan = assertions.ShouldBeGreaterThan ShouldBeGreaterThanOrEqualTo = assertions.ShouldBeGreaterThanOrEqualTo + ShouldBeIn = assertions.ShouldBeIn ShouldBeLessThan = assertions.ShouldBeLessThan ShouldBeLessThanOrEqualTo = assertions.ShouldBeLessThanOrEqualTo - ShouldBeBetween = assertions.ShouldBeBetween + ShouldBeNil = assertions.ShouldBeNil + ShouldBeTrue = assertions.ShouldBeTrue + ShouldBeZeroValue = assertions.ShouldBeZeroValue + ShouldContain = assertions.ShouldContain + ShouldContainKey = assertions.ShouldContainKey + ShouldContainSubstring = assertions.ShouldContainSubstring + ShouldEndWith = assertions.ShouldEndWith + ShouldEqual = assertions.ShouldEqual + ShouldEqualJSON = assertions.ShouldEqualJSON + ShouldEqualTrimSpace = assertions.ShouldEqualTrimSpace + ShouldEqualWithout = assertions.ShouldEqualWithout + ShouldHappenAfter = assertions.ShouldHappenAfter + ShouldHappenBefore = assertions.ShouldHappenBefore + ShouldHappenBetween = assertions.ShouldHappenBetween + ShouldHappenOnOrAfter = assertions.ShouldHappenOnOrAfter + ShouldHappenOnOrBefore = assertions.ShouldHappenOnOrBefore + ShouldHappenOnOrBetween = assertions.ShouldHappenOnOrBetween + ShouldHappenWithin = assertions.ShouldHappenWithin + ShouldHaveLength = assertions.ShouldHaveLength + ShouldHaveSameTypeAs = assertions.ShouldHaveSameTypeAs + ShouldImplement = assertions.ShouldImplement + ShouldNotAlmostEqual = assertions.ShouldNotAlmostEqual ShouldNotBeBetween = assertions.ShouldNotBeBetween - ShouldBeBetweenOrEqual = assertions.ShouldBeBetweenOrEqual ShouldNotBeBetweenOrEqual = assertions.ShouldNotBeBetweenOrEqual - - ShouldContain = assertions.ShouldContain - ShouldNotContain = assertions.ShouldNotContain - ShouldContainKey = assertions.ShouldContainKey - ShouldNotContainKey = assertions.ShouldNotContainKey - ShouldBeIn = assertions.ShouldBeIn - ShouldNotBeIn = assertions.ShouldNotBeIn - ShouldBeEmpty = assertions.ShouldBeEmpty - ShouldNotBeEmpty = assertions.ShouldNotBeEmpty - ShouldHaveLength = assertions.ShouldHaveLength - - ShouldStartWith = assertions.ShouldStartWith - ShouldNotStartWith = assertions.ShouldNotStartWith - ShouldEndWith = assertions.ShouldEndWith - ShouldNotEndWith = assertions.ShouldNotEndWith - ShouldBeBlank = assertions.ShouldBeBlank - ShouldNotBeBlank = assertions.ShouldNotBeBlank - ShouldContainSubstring = assertions.ShouldContainSubstring - ShouldNotContainSubstring = assertions.ShouldNotContainSubstring - - ShouldPanic = assertions.ShouldPanic - ShouldNotPanic = assertions.ShouldNotPanic - ShouldPanicWith = assertions.ShouldPanicWith - ShouldNotPanicWith = assertions.ShouldNotPanicWith - - ShouldHaveSameTypeAs = assertions.ShouldHaveSameTypeAs - ShouldNotHaveSameTypeAs = assertions.ShouldNotHaveSameTypeAs - ShouldImplement = assertions.ShouldImplement - ShouldNotImplement = assertions.ShouldNotImplement - - ShouldHappenBefore = assertions.ShouldHappenBefore - ShouldHappenOnOrBefore = assertions.ShouldHappenOnOrBefore - ShouldHappenAfter = assertions.ShouldHappenAfter - ShouldHappenOnOrAfter = assertions.ShouldHappenOnOrAfter - ShouldHappenBetween = assertions.ShouldHappenBetween - ShouldHappenOnOrBetween = assertions.ShouldHappenOnOrBetween - ShouldNotHappenOnOrBetween = assertions.ShouldNotHappenOnOrBetween - ShouldHappenWithin = assertions.ShouldHappenWithin - ShouldNotHappenWithin = assertions.ShouldNotHappenWithin - ShouldBeChronological = assertions.ShouldBeChronological - - ShouldBeError = assertions.ShouldBeError - ShouldWrap = assertions.ShouldWrap + ShouldNotBeBlank = assertions.ShouldNotBeBlank + ShouldNotBeChronological = assertions.ShouldNotBeChronological + ShouldNotBeEmpty = assertions.ShouldNotBeEmpty + ShouldNotBeIn = assertions.ShouldNotBeIn + ShouldNotBeNil = assertions.ShouldNotBeNil + ShouldNotBeZeroValue = assertions.ShouldNotBeZeroValue + ShouldNotContain = assertions.ShouldNotContain + ShouldNotContainKey = assertions.ShouldNotContainKey + ShouldNotContainSubstring = assertions.ShouldNotContainSubstring + ShouldNotEndWith = assertions.ShouldNotEndWith + ShouldNotEqual = assertions.ShouldNotEqual + ShouldNotHappenOnOrBetween = assertions.ShouldNotHappenOnOrBetween + ShouldNotHappenWithin = assertions.ShouldNotHappenWithin + ShouldNotHaveSameTypeAs = assertions.ShouldNotHaveSameTypeAs + ShouldNotImplement = assertions.ShouldNotImplement + ShouldNotPanic = assertions.ShouldNotPanic + ShouldNotPanicWith = assertions.ShouldNotPanicWith + ShouldNotPointTo = assertions.ShouldNotPointTo + ShouldNotResemble = assertions.ShouldNotResemble + ShouldNotStartWith = assertions.ShouldNotStartWith + ShouldPanic = assertions.ShouldPanic + ShouldPanicWith = assertions.ShouldPanicWith + ShouldPointTo = assertions.ShouldPointTo + ShouldResemble = assertions.ShouldResemble + ShouldStartWith = assertions.ShouldStartWith + ShouldWrap = assertions.ShouldWrap ) diff --git a/vendor/github.com/smartystreets/goconvey/convey/context.go b/vendor/github.com/smartystreets/goconvey/convey/context.go index 4b0d28d..626cc4c 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/context.go +++ b/vendor/github.com/smartystreets/goconvey/convey/context.go @@ -9,14 +9,14 @@ import ( type conveyErr struct { fmt string - params []interface{} + params []any } func (e *conveyErr) Error() string { return fmt.Sprintf(e.fmt, e.params...) } -func conveyPanic(fmt string, params ...interface{}) { +func conveyPanic(fmt string, params ...any) { panic(&conveyErr{fmt, params}) } @@ -85,7 +85,7 @@ type context struct { // rootConvey is the main entry point to a test suite. This is called when // there's no context in the stack already, and items must contain a `t` object, // or this panics. -func rootConvey(items ...interface{}) { +func rootConvey(items ...any) { entry := discover(items) if entry.Test == nil { @@ -117,15 +117,15 @@ func rootConvey(items ...interface{}) { //////////////////////////////////// Methods //////////////////////////////////// -func (ctx *context) SkipConvey(items ...interface{}) { +func (ctx *context) SkipConvey(items ...any) { ctx.Convey(items, skipConvey) } -func (ctx *context) FocusConvey(items ...interface{}) { +func (ctx *context) FocusConvey(items ...any) { ctx.Convey(items, focusConvey) } -func (ctx *context) Convey(items ...interface{}) { +func (ctx *context) Convey(items ...any) { entry := discover(items) // we're a branch, or leaf (on the wind) @@ -168,11 +168,11 @@ func (ctx *context) Convey(items ...interface{}) { } } -func (ctx *context) SkipSo(stuff ...interface{}) { +func (ctx *context) SkipSo(stuff ...any) { ctx.assertionReport(reporting.NewSkipReport()) } -func (ctx *context) So(actual interface{}, assert Assertion, expected ...interface{}) { +func (ctx *context) So(actual any, assert Assertion, expected ...any) { if result := assert(actual, expected...); result == assertionSuccess { ctx.assertionReport(reporting.NewSuccessReport()) } else { @@ -180,7 +180,7 @@ func (ctx *context) So(actual interface{}, assert Assertion, expected ...interfa } } -func (ctx *context) SoMsg(msg string, actual interface{}, assert Assertion, expected ...interface{}) { +func (ctx *context) SoMsg(msg string, actual any, assert Assertion, expected ...any) { if result := assert(actual, expected...); result == assertionSuccess { ctx.assertionReport(reporting.NewSuccessReport()) return @@ -196,17 +196,17 @@ func (ctx *context) Reset(action func()) { ctx.resets = append(ctx.resets, action) } -func (ctx *context) Print(items ...interface{}) (int, error) { +func (ctx *context) Print(items ...any) (int, error) { fmt.Fprint(ctx.reporter, items...) return fmt.Print(items...) } -func (ctx *context) Println(items ...interface{}) (int, error) { +func (ctx *context) Println(items ...any) (int, error) { fmt.Fprintln(ctx.reporter, items...) return fmt.Println(items...) } -func (ctx *context) Printf(format string, items ...interface{}) (int, error) { +func (ctx *context) Printf(format string, items ...any) (int, error) { fmt.Fprintf(ctx.reporter, format, items...) return fmt.Printf(format, items...) } diff --git a/vendor/github.com/smartystreets/goconvey/convey/discovery.go b/vendor/github.com/smartystreets/goconvey/convey/discovery.go index 5e6d1f6..4694d10 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/discovery.go +++ b/vendor/github.com/smartystreets/goconvey/convey/discovery.go @@ -34,7 +34,7 @@ func newSuite(situation string, failureMode FailureMode, stackMode StackMode, f return ret } -func discover(items []interface{}) *suite { +func discover(items []any) *suite { name, items := parseName(items) test, items := parseGoTest(items) failure, items := parseFailureMode(items) @@ -48,38 +48,38 @@ func discover(items []interface{}) *suite { return newSuite(name, failure, stack, action, test, specifier) } -func item(items []interface{}) interface{} { +func item(items []any) any { if len(items) == 0 { conveyPanic(parseError) } return items[0] } -func parseName(items []interface{}) (string, []interface{}) { +func parseName(items []any) (string, []any) { if name, parsed := item(items).(string); parsed { return name, items[1:] } conveyPanic(parseError) panic("never get here") } -func parseGoTest(items []interface{}) (t, []interface{}) { +func parseGoTest(items []any) (t, []any) { if test, parsed := item(items).(t); parsed { return test, items[1:] } return nil, items } -func parseFailureMode(items []interface{}) (FailureMode, []interface{}) { +func parseFailureMode(items []any) (FailureMode, []any) { if mode, parsed := item(items).(FailureMode); parsed { return mode, items[1:] } return FailureInherits, items } -func parseStackMode(items []interface{}) (StackMode, []interface{}) { +func parseStackMode(items []any) (StackMode, []any) { if mode, parsed := item(items).(StackMode); parsed { return mode, items[1:] } return StackInherits, items } -func parseAction(items []interface{}) (func(C), []interface{}) { +func parseAction(items []any) (func(C), []any) { switch x := item(items).(type) { case nil: return nil, items[1:] @@ -91,7 +91,7 @@ func parseAction(items []interface{}) (func(C), []interface{}) { conveyPanic(parseError) panic("never get here") } -func parseSpecifier(items []interface{}) (actionSpecifier, []interface{}) { +func parseSpecifier(items []any) (actionSpecifier, []any) { if len(items) == 0 { return noSpecifier, items } diff --git a/vendor/github.com/smartystreets/goconvey/convey/doc.go b/vendor/github.com/smartystreets/goconvey/convey/doc.go index b852235..2a9d55d 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/doc.go +++ b/vendor/github.com/smartystreets/goconvey/convey/doc.go @@ -19,19 +19,19 @@ import "github.com/smartystreets/goconvey/convey/reporting" // All methods in this context behave identically to the global functions of the // same name in this package. type C interface { - Convey(items ...interface{}) - SkipConvey(items ...interface{}) - FocusConvey(items ...interface{}) + Convey(items ...any) + SkipConvey(items ...any) + FocusConvey(items ...any) - So(actual interface{}, assert Assertion, expected ...interface{}) - SoMsg(msg string, actual interface{}, assert Assertion, expected ...interface{}) - SkipSo(stuff ...interface{}) + So(actual any, assert Assertion, expected ...any) + SoMsg(msg string, actual any, assert Assertion, expected ...any) + SkipSo(stuff ...any) Reset(action func()) - Println(items ...interface{}) (int, error) - Print(items ...interface{}) (int, error) - Printf(format string, items ...interface{}) (int, error) + Println(items ...any) (int, error) + Print(items ...any) (int, error) + Printf(format string, items ...any) (int, error) } // Convey is the method intended for use when declaring the scopes of @@ -71,7 +71,7 @@ type C interface { // Convey(description string, mode FailureMode, action func()) // // See the examples package for, well, examples. -func Convey(items ...interface{}) { +func Convey(items ...any) { if ctx := getCurrentContext(); ctx == nil { rootConvey(items...) } else { @@ -82,7 +82,7 @@ func Convey(items ...interface{}) { // SkipConvey is analogous to Convey except that the scope is not executed // (which means that child scopes defined within this scope are not run either). // The reporter will be notified that this step was skipped. -func SkipConvey(items ...interface{}) { +func SkipConvey(items ...any) { Convey(append(items, skipConvey)...) } @@ -93,7 +93,7 @@ func SkipConvey(items ...interface{}) { // repeatedly as you can disable all but one of that function // without swaths of `SkipConvey` calls, just a targeted chain of calls // to FocusConvey. -func FocusConvey(items ...interface{}) { +func FocusConvey(items ...any) { Convey(append(items, focusConvey)...) } @@ -109,7 +109,7 @@ func Reset(action func()) { // method can handle. Any future or custom assertions should conform to this // method signature. The return value should be an empty string if the assertion // passes and a well-formed failure message if not. -type Assertion func(actual interface{}, expected ...interface{}) string +type Assertion func(actual any, expected ...any) string const assertionSuccess = "" @@ -122,18 +122,18 @@ const assertionSuccess = "" // documentation on specific assertion methods. A failing assertion will // cause t.Fail() to be invoked--you should never call this method (or other // failure-inducing methods) in your test code. Leave that to GoConvey. -func So(actual interface{}, assert Assertion, expected ...interface{}) { +func So(actual any, assert Assertion, expected ...any) { mustGetCurrentContext().So(actual, assert, expected...) } // SoMsg is an extension of So that allows you to specify a message to report on error. -func SoMsg(msg string, actual interface{}, assert Assertion, expected ...interface{}) { +func SoMsg(msg string, actual any, assert Assertion, expected ...any) { mustGetCurrentContext().SoMsg(msg, actual, assert, expected...) } // SkipSo is analogous to So except that the assertion that would have been passed // to So is not executed and the reporter is notified that the assertion was skipped. -func SkipSo(stuff ...interface{}) { +func SkipSo(stuff ...any) { mustGetCurrentContext().SkipSo() } @@ -222,19 +222,19 @@ func SetDefaultStackMode(mode StackMode) { // Print is analogous to fmt.Print (and it even calls fmt.Print). It ensures that // output is aligned with the corresponding scopes in the web UI. -func Print(items ...interface{}) (written int, err error) { +func Print(items ...any) (written int, err error) { return mustGetCurrentContext().Print(items...) } // Print is analogous to fmt.Println (and it even calls fmt.Println). It ensures that // output is aligned with the corresponding scopes in the web UI. -func Println(items ...interface{}) (written int, err error) { +func Println(items ...any) (written int, err error) { return mustGetCurrentContext().Println(items...) } // Print is analogous to fmt.Printf (and it even calls fmt.Printf). It ensures that // output is aligned with the corresponding scopes in the web UI. -func Printf(format string, items ...interface{}) (written int, err error) { +func Printf(format string, items ...any) (written int, err error) { return mustGetCurrentContext().Printf(format, items...) } diff --git a/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go b/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go index 3dac0d4..e4bd8ba 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go +++ b/vendor/github.com/smartystreets/goconvey/convey/reporting/printer.go @@ -11,12 +11,12 @@ type Printer struct { prefix string } -func (self *Printer) Println(message string, values ...interface{}) { +func (self *Printer) Println(message string, values ...any) { formatted := self.format(message, values...) + newline self.out.Write([]byte(formatted)) } -func (self *Printer) Print(message string, values ...interface{}) { +func (self *Printer) Print(message string, values ...any) { formatted := self.format(message, values...) self.out.Write([]byte(formatted)) } @@ -25,7 +25,7 @@ func (self *Printer) Insert(text string) { self.out.Write([]byte(text)) } -func (self *Printer) format(message string, values ...interface{}) string { +func (self *Printer) format(message string, values ...any) string { var formatted string if len(values) == 0 { formatted = self.prefix + message diff --git a/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go b/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go index f30789f..7a65019 100644 --- a/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go +++ b/vendor/github.com/smartystreets/goconvey/convey/reporting/reports.go @@ -92,7 +92,7 @@ type AssertionResult struct { Expected string Actual string Failure string - Error interface{} + Error any StackTrace string Skipped bool } @@ -117,7 +117,7 @@ func parseFailure(failure string, report *AssertionResult) { report.Failure = failure } } -func NewErrorReport(err interface{}) *AssertionResult { +func NewErrorReport(err any) *AssertionResult { report := new(AssertionResult) report.File, report.Line = caller() report.StackTrace = fullStackTrace() diff --git a/vendor/github.com/smartystreets/goconvey/convey/update_assertions.sh b/vendor/github.com/smartystreets/goconvey/convey/update_assertions.sh new file mode 100644 index 0000000..df28062 --- /dev/null +++ b/vendor/github.com/smartystreets/goconvey/convey/update_assertions.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +cd "$(dirname $(realpath $0))" + +ASSERTIONS=($( + go tool nm "$(go list -export -f '{{.Export}}' github.com/smartystreets/assertions)" |\ + awk '/ T github\.com\/smartystreets\/assertions\.Should/{split($3, a, "."); print a[3]}' |\ + sort | uniq)) + +( + echo "package convey" + echo + echo "// DO NOT EDIT: generated by update_assertions.sh" + echo + echo "//go:generate ./update_assertions.sh" + echo + echo "import \"github.com/smartystreets/assertions\"" + echo + echo "// These assertions are forwarded from github.com/smartystreets/assertions" + echo "// in order to make convey self-contained." + echo "var (" + + for assertion in "${ASSERTIONS[@]}" + do + echo " $assertion = assertions.$assertion" + done + + echo ")" +) > ./assertions.go + +go fmt ./assertions.go diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go index a49853e..3723b2c 100644 --- a/vendor/golang.org/x/sys/windows/syscall_windows.go +++ b/vendor/golang.org/x/sys/windows/syscall_windows.go @@ -10,7 +10,6 @@ import ( errorspkg "errors" "fmt" "runtime" - "strings" "sync" "syscall" "time" @@ -87,22 +86,13 @@ func StringToUTF16(s string) []uint16 { // s, with a terminating NUL added. If s contains a NUL byte at any // location, it returns (nil, syscall.EINVAL). func UTF16FromString(s string) ([]uint16, error) { - if strings.IndexByte(s, 0) != -1 { - return nil, syscall.EINVAL - } - return utf16.Encode([]rune(s + "\x00")), nil + return syscall.UTF16FromString(s) } // UTF16ToString returns the UTF-8 encoding of the UTF-16 sequence s, // with a terminating NUL and any bytes after the NUL removed. func UTF16ToString(s []uint16) string { - for i, v := range s { - if v == 0 { - s = s[:i] - break - } - } - return string(utf16.Decode(s)) + return syscall.UTF16ToString(s) } // StringToUTF16Ptr is deprecated. Use UTF16PtrFromString instead. @@ -834,6 +824,9 @@ const socket_error = uintptr(^uint32(0)) //sys WSAStartup(verreq uint32, data *WSAData) (sockerr error) = ws2_32.WSAStartup //sys WSACleanup() (err error) [failretval==socket_error] = ws2_32.WSACleanup //sys WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbob uint32, cbbr *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) [failretval==socket_error] = ws2_32.WSAIoctl +//sys WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceBeginW +//sys WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceNextW +//sys WSALookupServiceEnd(handle Handle) (err error) [failretval==socket_error] = ws2_32.WSALookupServiceEnd //sys socket(af int32, typ int32, protocol int32) (handle Handle, err error) [failretval==InvalidHandle] = ws2_32.socket //sys sendto(s Handle, buf []byte, flags int32, to unsafe.Pointer, tolen int32) (err error) [failretval==socket_error] = ws2_32.sendto //sys recvfrom(s Handle, buf []byte, flags int32, from *RawSockaddrAny, fromlen *int32) (n int32, err error) [failretval==-1] = ws2_32.recvfrom @@ -1029,8 +1022,7 @@ func (rsa *RawSockaddrAny) Sockaddr() (Sockaddr, error) { for n < len(pp.Path) && pp.Path[n] != 0 { n++ } - bytes := (*[len(pp.Path)]byte)(unsafe.Pointer(&pp.Path[0]))[0:n] - sa.Name = string(bytes) + sa.Name = string(unsafe.Slice((*byte)(unsafe.Pointer(&pp.Path[0])), n)) return sa, nil case AF_INET: diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go index 0c4add9..0dbb208 100644 --- a/vendor/golang.org/x/sys/windows/types_windows.go +++ b/vendor/golang.org/x/sys/windows/types_windows.go @@ -1243,6 +1243,51 @@ const ( DnsSectionAdditional = 0x0003 ) +const ( + // flags of WSALookupService + LUP_DEEP = 0x0001 + LUP_CONTAINERS = 0x0002 + LUP_NOCONTAINERS = 0x0004 + LUP_NEAREST = 0x0008 + LUP_RETURN_NAME = 0x0010 + LUP_RETURN_TYPE = 0x0020 + LUP_RETURN_VERSION = 0x0040 + LUP_RETURN_COMMENT = 0x0080 + LUP_RETURN_ADDR = 0x0100 + LUP_RETURN_BLOB = 0x0200 + LUP_RETURN_ALIASES = 0x0400 + LUP_RETURN_QUERY_STRING = 0x0800 + LUP_RETURN_ALL = 0x0FF0 + LUP_RES_SERVICE = 0x8000 + + LUP_FLUSHCACHE = 0x1000 + LUP_FLUSHPREVIOUS = 0x2000 + + LUP_NON_AUTHORITATIVE = 0x4000 + LUP_SECURE = 0x8000 + LUP_RETURN_PREFERRED_NAMES = 0x10000 + LUP_DNS_ONLY = 0x20000 + + LUP_ADDRCONFIG = 0x100000 + LUP_DUAL_ADDR = 0x200000 + LUP_FILESERVER = 0x400000 + LUP_DISABLE_IDN_ENCODING = 0x00800000 + LUP_API_ANSI = 0x01000000 + + LUP_RESOLUTION_HANDLE = 0x80000000 +) + +const ( + // values of WSAQUERYSET's namespace + NS_ALL = 0 + NS_DNS = 12 + NS_NLA = 15 + NS_BTH = 16 + NS_EMAIL = 37 + NS_PNRPNAME = 38 + NS_PNRPCLOUD = 39 +) + type DNSSRVData struct { Target *uint16 Priority uint16 @@ -2184,10 +2229,10 @@ const ( JobObjectExtendedLimitInformation = 9 JobObjectGroupInformation = 11 JobObjectGroupInformationEx = 14 - JobObjectLimitViolationInformation2 = 35 + JobObjectLimitViolationInformation2 = 34 JobObjectNetRateControlInformation = 32 JobObjectNotificationLimitInformation = 12 - JobObjectNotificationLimitInformation2 = 34 + JobObjectNotificationLimitInformation2 = 33 JobObjectSecurityLimitInformation = 5 ) @@ -3258,3 +3303,43 @@ const ( DWMWA_TEXT_COLOR = 36 DWMWA_VISIBLE_FRAME_BORDER_THICKNESS = 37 ) + +type WSAQUERYSET struct { + Size uint32 + ServiceInstanceName *uint16 + ServiceClassId *GUID + Version *WSAVersion + Comment *uint16 + NameSpace uint32 + NSProviderId *GUID + Context *uint16 + NumberOfProtocols uint32 + AfpProtocols *AFProtocols + QueryString *uint16 + NumberOfCsAddrs uint32 + SaBuffer *CSAddrInfo + OutputFlags uint32 + Blob *BLOB +} + +type WSAVersion struct { + Version uint32 + EnumerationOfComparison int32 +} + +type AFProtocols struct { + AddressFamily int32 + Protocol int32 +} + +type CSAddrInfo struct { + LocalAddr SocketAddress + RemoteAddr SocketAddress + SocketType int32 + Protocol int32 +} + +type BLOB struct { + Size uint32 + BlobData *byte +} diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go index ac60052..6d2a268 100644 --- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go +++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go @@ -474,6 +474,9 @@ var ( procWSAEnumProtocolsW = modws2_32.NewProc("WSAEnumProtocolsW") procWSAGetOverlappedResult = modws2_32.NewProc("WSAGetOverlappedResult") procWSAIoctl = modws2_32.NewProc("WSAIoctl") + procWSALookupServiceBeginW = modws2_32.NewProc("WSALookupServiceBeginW") + procWSALookupServiceEnd = modws2_32.NewProc("WSALookupServiceEnd") + procWSALookupServiceNextW = modws2_32.NewProc("WSALookupServiceNextW") procWSARecv = modws2_32.NewProc("WSARecv") procWSARecvFrom = modws2_32.NewProc("WSARecvFrom") procWSASend = modws2_32.NewProc("WSASend") @@ -4067,6 +4070,30 @@ func WSAIoctl(s Handle, iocc uint32, inbuf *byte, cbif uint32, outbuf *byte, cbo return } +func WSALookupServiceBegin(querySet *WSAQUERYSET, flags uint32, handle *Handle) (err error) { + r1, _, e1 := syscall.Syscall(procWSALookupServiceBeginW.Addr(), 3, uintptr(unsafe.Pointer(querySet)), uintptr(flags), uintptr(unsafe.Pointer(handle))) + if r1 == socket_error { + err = errnoErr(e1) + } + return +} + +func WSALookupServiceEnd(handle Handle) (err error) { + r1, _, e1 := syscall.Syscall(procWSALookupServiceEnd.Addr(), 1, uintptr(handle), 0, 0) + if r1 == socket_error { + err = errnoErr(e1) + } + return +} + +func WSALookupServiceNext(handle Handle, flags uint32, size *int32, querySet *WSAQUERYSET) (err error) { + r1, _, e1 := syscall.Syscall6(procWSALookupServiceNextW.Addr(), 4, uintptr(handle), uintptr(flags), uintptr(unsafe.Pointer(size)), uintptr(unsafe.Pointer(querySet)), 0, 0) + if r1 == socket_error { + err = errnoErr(e1) + } + return +} + func WSARecv(s Handle, bufs *WSABuf, bufcnt uint32, recvd *uint32, flags *uint32, overlapped *Overlapped, croutine *byte) (err error) { r1, _, e1 := syscall.Syscall9(procWSARecv.Addr(), 7, uintptr(s), uintptr(unsafe.Pointer(bufs)), uintptr(bufcnt), uintptr(unsafe.Pointer(recvd)), uintptr(unsafe.Pointer(flags)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0, 0) if r1 == socket_error { diff --git a/vendor/modules.txt b/vendor/modules.txt index e0952f7..ab39653 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,28 +1,28 @@ # github.com/google/gopacket v1.1.19 -## explicit +## explicit; go 1.12 github.com/google/gopacket github.com/google/gopacket/layers github.com/google/gopacket/pcap # github.com/gopherjs/gopherjs v1.17.2 -## explicit +## explicit; go 1.17 github.com/gopherjs/gopherjs/js # github.com/jtolds/gls v4.20.0+incompatible ## explicit github.com/jtolds/gls -# github.com/smartystreets/assertions v1.13.0 -## explicit +# github.com/smartystreets/assertions v1.13.1 +## explicit; go 1.18 github.com/smartystreets/assertions github.com/smartystreets/assertions/internal/go-diff/diffmatchpatch github.com/smartystreets/assertions/internal/go-render/render github.com/smartystreets/assertions/internal/oglematchers -# github.com/smartystreets/goconvey v1.7.2 -## explicit +# github.com/smartystreets/goconvey v1.8.0 +## explicit; go 1.18 github.com/smartystreets/goconvey/convey github.com/smartystreets/goconvey/convey/gotest github.com/smartystreets/goconvey/convey/reporting -# golang.org/x/net v0.4.0 -## explicit -# golang.org/x/sys v0.3.0 -## explicit +# golang.org/x/net v0.9.0 +## explicit; go 1.17 +# golang.org/x/sys v0.7.0 +## explicit; go 1.17 golang.org/x/sys/internal/unsafeheader golang.org/x/sys/windows