diff --git a/go.mod b/go.mod index 0ba841557..8ab202781 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/dave/jennifer v1.4.2-0.20211112003305-45cc0b7eb71a github.com/julienschmidt/httprouter v1.3.0 github.com/nmiyake/pkg/dirs v1.1.0 - github.com/palantir/conjure-go-runtime/v2 v2.67.0 + github.com/palantir/conjure-go-runtime/v2 v2.68.0 github.com/palantir/go-ptimports/v2 v2.10.0 github.com/palantir/godel-conjure-plugin/v6 v6.39.0 github.com/palantir/godel/pkg/products/v2 v2.0.0 @@ -21,11 +21,11 @@ require ( github.com/palantir/pkg/safelong v1.1.0 github.com/palantir/pkg/safeyaml v1.1.0 github.com/palantir/pkg/uuid v1.2.0 - github.com/palantir/witchcraft-go-error v1.30.0 - github.com/palantir/witchcraft-go-logging v1.47.0 - github.com/palantir/witchcraft-go-params v1.28.0 + github.com/palantir/witchcraft-go-error v1.31.0 + github.com/palantir/witchcraft-go-logging v1.48.0 + github.com/palantir/witchcraft-go-params v1.29.0 github.com/palantir/witchcraft-go-server/v2 v2.70.0 - github.com/palantir/witchcraft-go-tracing v1.30.0 + github.com/palantir/witchcraft-go-tracing v1.31.0 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 66b860408..32735e66b 100644 --- a/go.sum +++ b/go.sum @@ -183,8 +183,8 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/openzipkin/zipkin-go v0.2.2 h1:nY8Hti+WKaP0cRsSeQ026wU03QsM762XBeCXBb9NAWI= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/palantir/conjure-go-runtime/v2 v2.67.0 h1:k1Ludqb+51S0qKQG4wmYExuBZx2XcDWdCcBXvGYsN3o= -github.com/palantir/conjure-go-runtime/v2 v2.67.0/go.mod h1:56UuLF4tBVZqZInhDfDF8+xC367k0BM29VA+7ZXbH5o= +github.com/palantir/conjure-go-runtime/v2 v2.68.0 h1:kA1qnBNF1uaYdOMMIAEfU/CY9tHm0coCJQwy2BBIiOE= +github.com/palantir/conjure-go-runtime/v2 v2.68.0/go.mod h1:56UuLF4tBVZqZInhDfDF8+xC367k0BM29VA+7ZXbH5o= github.com/palantir/go-encrypted-config-value v1.28.0 h1:FkRFoEw5+PiUsWcgS3oNswLnDXx1FQINdw1Cp5e6Y6Q= github.com/palantir/go-encrypted-config-value v1.28.0/go.mod h1:TwtiMZIlZsaCD3vwKFXV2oCglrA+NkZVDGsRF5OuyU4= github.com/palantir/go-metrics v1.1.1 h1:YL/UmptBjrC6iSCTVr7vfuIcjL0M359Da3/gBGNny10= @@ -239,18 +239,18 @@ github.com/palantir/pkg/transform v1.1.0 h1:43tnYETShELXCRro6+uc0GlgB4GZvsQ/YNH5 github.com/palantir/pkg/transform v1.1.0/go.mod h1:SHqpFkx1vKQ8Bb81VsmySYTsSHSBtgj06cZm9HihuGk= github.com/palantir/pkg/uuid v1.2.0 h1:eb7A1clc0DzchT9G0DRXi9QEkz/IYGDzLVFqZoIfrl0= github.com/palantir/pkg/uuid v1.2.0/go.mod h1:qGnKfswuHME/RjYVkj+SfcjvJ7C3gKZM4JEUordLhA4= -github.com/palantir/witchcraft-go-error v1.30.0 h1:ssl4MRwDsDqzGbs7STDWIShiM3xdYF3UnV+zb2ZQnZo= -github.com/palantir/witchcraft-go-error v1.30.0/go.mod h1:K3Nehd+aQ/pmmid9Www2oS4/JI/ZGKoOWPeHplbAKv0= +github.com/palantir/witchcraft-go-error v1.31.0 h1:84y5BjFgAkvw4M1pSKChxRR0hGd5RAvXwEm4ADAaKeE= +github.com/palantir/witchcraft-go-error v1.31.0/go.mod h1:LA9mdlzoYy2GrIxWZ4Xc0ZcH5qkT59bX9dG8X2GrzVo= github.com/palantir/witchcraft-go-health v1.15.0 h1:rXKAefpl1fKkYhFS/BYR+NoebeFUn09CLXr1O4aRNOA= github.com/palantir/witchcraft-go-health v1.15.0/go.mod h1:MS0LBzTRcaCViJuIYzzwfZWBxFw0SNIRRglTve7t3x4= -github.com/palantir/witchcraft-go-logging v1.47.0 h1:XmeDCHqjT/J6Q/9H410lU+TM+Oa4MgDtMVLd3eN3Blw= -github.com/palantir/witchcraft-go-logging v1.47.0/go.mod h1:cQ0rgDHEYbmCTX9qbcPS+JLf1DY8KbX1m7KXMlGtFmc= -github.com/palantir/witchcraft-go-params v1.28.0 h1:6rj5TRUGHoIEx8X5bPw0WvCr3+RPEQtobG8vVH5CZZk= -github.com/palantir/witchcraft-go-params v1.28.0/go.mod h1:hspt+NCM0m7T8fjVwVFurdR9a+af7wcmPJYQJnqkdCM= +github.com/palantir/witchcraft-go-logging v1.48.0 h1:Le+METlCaC09YD2AMDb4287VhiwQRLffrB4T3UUM9Jw= +github.com/palantir/witchcraft-go-logging v1.48.0/go.mod h1:l8NpcDANjjjDWzWBaC1iHq4MU58HqoHMMRnGVrOVm/w= +github.com/palantir/witchcraft-go-params v1.29.0 h1:RT4iBLtlklCGqSwDaKjHrPp6y85Q3ShR1pAr4t5G8DI= +github.com/palantir/witchcraft-go-params v1.29.0/go.mod h1:hspt+NCM0m7T8fjVwVFurdR9a+af7wcmPJYQJnqkdCM= github.com/palantir/witchcraft-go-server/v2 v2.70.0 h1:xmEgms5+Q9/kbIGZ46mIM1XTwRU0v/eweiXNzTcfSVY= github.com/palantir/witchcraft-go-server/v2 v2.70.0/go.mod h1:g4Shmc7k7RKsd4ThjzRHR1BzEfveRhnJDb0UII3497Q= -github.com/palantir/witchcraft-go-tracing v1.30.0 h1:G1Hvl5cE2NaF1ONMMd0fQywNKl2HB1Vn4ACvjkoBvbI= -github.com/palantir/witchcraft-go-tracing v1.30.0/go.mod h1:xGJf5LA+WLD3XXlTn3fcA2en/ronUAYWmxCJiBPPngM= +github.com/palantir/witchcraft-go-tracing v1.31.0 h1:qBtfrxsoI6r57AytNhLHzGCqqDG3bJ802LvelydifNg= +github.com/palantir/witchcraft-go-tracing v1.31.0/go.mod h1:ScxQfiETYWA8/d0Qm6VVHspZELpdTVuVhRqPPB7oV+s= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= diff --git a/vendor/github.com/palantir/witchcraft-go-error/.policy.yml b/vendor/github.com/palantir/witchcraft-go-error/.policy.yml index 95c0afd59..3593a3914 100644 --- a/vendor/github.com/palantir/witchcraft-go-error/.policy.yml +++ b/vendor/github.com/palantir/witchcraft-go-error/.policy.yml @@ -18,6 +18,7 @@ approval_rules: - name: one admin has approved (PR contributors not allowed) options: allow_contributor: false + invalidate_on_push: true requires: count: 1 permissions: ["admin", "maintain"] @@ -25,6 +26,7 @@ approval_rules: - name: two admins have approved options: allow_contributor: true + invalidate_on_push: true requires: count: 2 permissions: ["admin", "maintain"] diff --git a/vendor/github.com/palantir/witchcraft-go-params/.policy.yml b/vendor/github.com/palantir/witchcraft-go-params/.policy.yml index 95c0afd59..3593a3914 100644 --- a/vendor/github.com/palantir/witchcraft-go-params/.policy.yml +++ b/vendor/github.com/palantir/witchcraft-go-params/.policy.yml @@ -18,6 +18,7 @@ approval_rules: - name: one admin has approved (PR contributors not allowed) options: allow_contributor: false + invalidate_on_push: true requires: count: 1 permissions: ["admin", "maintain"] @@ -25,6 +26,7 @@ approval_rules: - name: two admins have approved options: allow_contributor: true + invalidate_on_push: true requires: count: 2 permissions: ["admin", "maintain"] diff --git a/vendor/modules.txt b/vendor/modules.txt index 83e728a13..0e9a24836 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -50,7 +50,7 @@ github.com/openzipkin/zipkin-go/idgenerator github.com/openzipkin/zipkin-go/model github.com/openzipkin/zipkin-go/propagation github.com/openzipkin/zipkin-go/reporter -# github.com/palantir/conjure-go-runtime/v2 v2.67.0 +# github.com/palantir/conjure-go-runtime/v2 v2.68.0 ## explicit; go 1.21 github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient github.com/palantir/conjure-go-runtime/v2/conjure-go-client/httpclient/internal @@ -136,7 +136,7 @@ github.com/palantir/pkg/transform ## explicit; go 1.19 github.com/palantir/pkg/uuid github.com/palantir/pkg/uuid/internal/uuid -# github.com/palantir/witchcraft-go-error v1.30.0 +# github.com/palantir/witchcraft-go-error v1.31.0 ## explicit; go 1.21 github.com/palantir/witchcraft-go-error github.com/palantir/witchcraft-go-error/internal/errors @@ -146,7 +146,7 @@ github.com/palantir/witchcraft-go-health/conjure/witchcraft/api/health github.com/palantir/witchcraft-go-health/sources github.com/palantir/witchcraft-go-health/sources/window github.com/palantir/witchcraft-go-health/status -# github.com/palantir/witchcraft-go-logging v1.47.0 +# github.com/palantir/witchcraft-go-logging v1.48.0 ## explicit; go 1.21 github.com/palantir/witchcraft-go-logging/conjure/witchcraft/api/logging github.com/palantir/witchcraft-go-logging/internal/gopath @@ -165,7 +165,7 @@ github.com/palantir/witchcraft-go-logging/wlog/tcpjson github.com/palantir/witchcraft-go-logging/wlog/trclog/trc1log github.com/palantir/witchcraft-go-logging/wlog/wapp github.com/palantir/witchcraft-go-logging/wlog/wrappedlog/wrapped1log -# github.com/palantir/witchcraft-go-params v1.28.0 +# github.com/palantir/witchcraft-go-params v1.29.0 ## explicit; go 1.21 github.com/palantir/witchcraft-go-params # github.com/palantir/witchcraft-go-server/v2 v2.70.0 @@ -185,7 +185,7 @@ github.com/palantir/witchcraft-go-server/v2/witchcraft/refreshable github.com/palantir/witchcraft-go-server/v2/witchcraft/wresource github.com/palantir/witchcraft-go-server/v2/wrouter github.com/palantir/witchcraft-go-server/v2/wrouter/whttprouter -# github.com/palantir/witchcraft-go-tracing v1.30.0 +# github.com/palantir/witchcraft-go-tracing v1.31.0 ## explicit; go 1.21 github.com/palantir/witchcraft-go-tracing/wtracing github.com/palantir/witchcraft-go-tracing/wtracing/propagation/b3