diff --git a/.tool-versions b/.tool-versions index 3b4b653..4fc7a57 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ golangci-lint 2.13.1 -golang 1.27.0 +golang 1.26.7 diff --git a/Dockerfile b/Dockerfile index a4997ab..0718bb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.26.6-bookworm@sha256:116d58cbd88c1297624acc6e967a060012422bacf9930927e23fb719189c6f36 AS build +FROM golang:1.26.7-bookworm@sha256:e8c859f5632dcfde7b32d2012b4351728f6437930887c2f6a91ea242459e5514 AS build WORKDIR /go/src/github.com/pomerium/cli # cache depedency downloads diff --git a/go.mod b/go.mod index d0197a1..16ca315 100644 --- a/go.mod +++ b/go.mod @@ -13,9 +13,9 @@ require ( github.com/google/go-cmp v0.7.0 github.com/google/uuid v1.6.0 github.com/martinlindhe/base36 v1.1.1 - github.com/pomerium/pomerium v0.32.5-rc.1.0.20260818125855-887851871288 - github.com/pomerium/pomerium/pkg/grpc/config v0.0.0-20260818125855-887851871288 - github.com/pomerium/pomerium/pkg/grpc/databroker v0.0.0-20260818125855-887851871288 + github.com/pomerium/pomerium v0.32.5-rc.1.0.20260825165932-f9253ffbcd37 + github.com/pomerium/pomerium/pkg/grpc/config v0.0.0-20260825165932-f9253ffbcd37 + github.com/pomerium/pomerium/pkg/grpc/databroker v0.0.0-20260825165932-f9253ffbcd37 github.com/quic-go/quic-go v0.61.0 github.com/rs/zerolog v1.35.1 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 @@ -26,7 +26,7 @@ require ( golang.org/x/net v0.58.0 golang.org/x/sync v0.22.0 golang.org/x/sys v0.47.0 - google.golang.org/grpc v1.83.0 + google.golang.org/grpc v1.83.2 google.golang.org/protobuf v1.36.12 ) @@ -103,7 +103,7 @@ require ( github.com/pires/go-proxyproto v0.15.0 // indirect github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect github.com/pomerium/envoy-custom v1.37.0-rc3.0.20260618180819-16ede7a56f2f // indirect - github.com/pomerium/protoutil v0.0.0-20260810121901-c1e5f8551cd0 // indirect + github.com/pomerium/protoutil v0.0.0-20260820130836-1ba63a4ed009 // indirect github.com/prometheus/client_golang v1.24.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.70.0 // indirect @@ -157,8 +157,8 @@ require ( golang.org/x/tools v0.48.0 // indirect golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect google.golang.org/api v0.291.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260818201246-1b0934165a6f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260818201246-1b0934165a6f // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect sigs.k8s.io/yaml v1.6.0 // indirect diff --git a/go.sum b/go.sum index f23d326..f023667 100644 --- a/go.sum +++ b/go.sum @@ -233,8 +233,8 @@ github.com/cockroachdb/pebble/v2 v2.1.6 h1:GDo7Z2+LgFZ7LJLdLmBXhDeTVIwgSPGxIT15h github.com/cockroachdb/pebble/v2 v2.1.6/go.mod h1:Reo1RTniv1UjVTAu/Fv74y5i3kJ5gmVrPhO9UtFiKn8= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/swiss v0.0.0-20251224182025-b0f6560f979b h1:VXvSNzmr8hMj8XTuY0PT9Ane9qZGul/p67vGYwl9BFI= -github.com/cockroachdb/swiss v0.0.0-20251224182025-b0f6560f979b/go.mod h1:yBRu/cnL4ks9bgy4vAASdjIW+/xMlFwuHKqtmh3GZQg= +github.com/cockroachdb/swiss v0.0.0-20260820225851-333444432258 h1:IJ+uNItEm0qx9FE2AgIc1PMsCUtk8nbSIzhQE1t5GWw= +github.com/cockroachdb/swiss v0.0.0-20260820225851-333444432258/go.mod h1:yBRu/cnL4ks9bgy4vAASdjIW+/xMlFwuHKqtmh3GZQg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g= @@ -552,8 +552,8 @@ github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4 github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8= -github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU= +github.com/moby/go-archive v0.3.3 h1:OxxR9paxsluYi+zDUEXTTaIxtkK3viymW+Ka7vRhhME= +github.com/moby/go-archive v0.3.3/go.mod h1:Npdv43fFqlhZW7Xo8fbm3ZMYFvAGNviUPqX21VERbcE= github.com/moby/moby/api v1.55.0 h1:2/sexvQyqIWS8pRSCFddBfpW2qE7vR7FCL+vN8pxwMc= github.com/moby/moby/api v1.55.0/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs= github.com/moby/moby/client v0.5.1 h1:tYNaJno4c0HXz12y5BiqEDy0rVTYkWzI26lGvnTMiJw= @@ -562,8 +562,8 @@ github.com/moby/patternmatcher v0.6.1 h1:qlhtafmr6kgMIJjKJMDmMWq7WLkKIo23hsrpR3x github.com/moby/patternmatcher v0.6.1/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/sys/sequential v0.7.0 h1:ASQNGNROJSuOO6LL6bPHbKvuZu6NU8P4ldPWk31zj/8= github.com/moby/sys/sequential v0.7.0/go.mod h1:NfSTAp6V3fw4tmkD62PEcOKeZKquXT8VKCkf7aVR79o= -github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs= -github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs= +github.com/moby/sys/user v0.4.1 h1:RgjRlaDKi/Xmyrz4t8lyzXT6v2ooFeO/7xtchmhVWE0= +github.com/moby/sys/user v0.4.1/go.mod h1:E9QsW5WRe1kUAf7kW8hXKwu1uhsZEAdPLYHYSDudF4Y= github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= @@ -608,20 +608,20 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/pomerium/datasource v0.18.2-0.20260810200017-a5bf2cd781e9 h1:dutqqc04Dy8KvcIBm/ZPShZkFuQ/ip/bxzjJOwYYRc0= -github.com/pomerium/datasource v0.18.2-0.20260810200017-a5bf2cd781e9/go.mod h1:tUYWJB1zr6UU+8ewG3mUDPaSFyqmIg17/85480RWe/4= +github.com/pomerium/datasource v0.18.2-0.20260820130814-5ffec27af67c h1:1C3ImmWB3YuSvm84ArNoa5Ny3Ue4EqEoYqu8Cbp50pw= +github.com/pomerium/datasource v0.18.2-0.20260820130814-5ffec27af67c/go.mod h1:tUYWJB1zr6UU+8ewG3mUDPaSFyqmIg17/85480RWe/4= github.com/pomerium/envoy-custom v1.37.0-rc3.0.20260618180819-16ede7a56f2f h1:LG3PfhAQrJzPoSNnpkGpqwojoJQzrmrynX484yCmn4Y= github.com/pomerium/envoy-custom v1.37.0-rc3.0.20260618180819-16ede7a56f2f/go.mod h1:7Svo/CaRt9vfJ22sEC+T/q/y2WNi/cZTlugNYUS7xwI= -github.com/pomerium/pomerium v0.32.5-rc.1.0.20260818125855-887851871288 h1:AvNHz/7PSlWIAlCv8e+S8WwrWavs/LOLOaJr3WNLdmA= -github.com/pomerium/pomerium v0.32.5-rc.1.0.20260818125855-887851871288/go.mod h1:L7GIJnZt562uj7Cv0Vz+WmG4G2pTAxoN+sfI+yUL2Tw= -github.com/pomerium/pomerium/pkg/grpc/config v0.0.0-20260818125855-887851871288 h1:79MKUKL4+vddx2g2DpSxukKoE/0XJKQ4UXAMgxEULSE= -github.com/pomerium/pomerium/pkg/grpc/config v0.0.0-20260818125855-887851871288/go.mod h1:fgW6ideullr53ZuFPAmvX+a8i+LxWkfUJXyi/6a99aE= -github.com/pomerium/pomerium/pkg/grpc/databroker v0.0.0-20260818125855-887851871288 h1:Inl3akxcP4oL/K+orezj5KPyodtsIwaMfDDbBzRLyMQ= -github.com/pomerium/pomerium/pkg/grpc/databroker v0.0.0-20260818125855-887851871288/go.mod h1:J6riU6jiodL1MDTqUJ5Exw2DDvWyPbES7vnBVfyDBSs= -github.com/pomerium/protoutil v0.0.0-20260810121901-c1e5f8551cd0 h1:SV8EgiVk5RjL4HBZBKFujGLN/+wdIJ3N1kXiV6UAn5Q= -github.com/pomerium/protoutil v0.0.0-20260810121901-c1e5f8551cd0/go.mod h1:1J6pLngWUe5ypwrbK+QB6rdZt+HbhICC5nhtUlDjUlA= -github.com/pomerium/webauthn v0.0.0-20260810123655-05886782cf2b h1:nPjMO/frxWuRk5DyjTLRCBlmBDfNKO2WaxngkTp4/F0= -github.com/pomerium/webauthn v0.0.0-20260810123655-05886782cf2b/go.mod h1:dZrwNDXLOdPza+WMAV/hsQQehm4OW4eOCM7DP55g3PM= +github.com/pomerium/pomerium v0.32.5-rc.1.0.20260825165932-f9253ffbcd37 h1:Bg4+WxdGnYe2V2yvyILhS8j0UxtK9cj1JwOH1bO9pBM= +github.com/pomerium/pomerium v0.32.5-rc.1.0.20260825165932-f9253ffbcd37/go.mod h1:ixvLc+vynBbaA/ScM8L/zAuvx35iOKu2t5BdZFqk40M= +github.com/pomerium/pomerium/pkg/grpc/config v0.0.0-20260825165932-f9253ffbcd37 h1:M0i/l9q1aJXQRe+bkqscFdFVvSju5JrvuhGC9SOiqPk= +github.com/pomerium/pomerium/pkg/grpc/config v0.0.0-20260825165932-f9253ffbcd37/go.mod h1:MSR9sezpcqD/gq59D0iszS3CEZpkS8hYkoGgNusVmtU= +github.com/pomerium/pomerium/pkg/grpc/databroker v0.0.0-20260825165932-f9253ffbcd37 h1:bg65OAmuhN9LbKTpwKjG/Mw4vLU6+UB88TGWgpXBZnA= +github.com/pomerium/pomerium/pkg/grpc/databroker v0.0.0-20260825165932-f9253ffbcd37/go.mod h1:vJ73rvWdQuYyBSFoH1QkKe390YSZUXXG032fMzt8boY= +github.com/pomerium/protoutil v0.0.0-20260820130836-1ba63a4ed009 h1:4d8eA/YV+yahxmdSQ65Hbbv0faArEdPfHt9uhYeLfKI= +github.com/pomerium/protoutil v0.0.0-20260820130836-1ba63a4ed009/go.mod h1:1J6pLngWUe5ypwrbK+QB6rdZt+HbhICC5nhtUlDjUlA= +github.com/pomerium/webauthn v0.0.0-20260820130751-2a7708c96dd4 h1:qZ4xY+0GR9NRe0jHBvKnJRGIXETlq+Gi+6QqT82lMDE= +github.com/pomerium/webauthn v0.0.0-20260820130751-2a7708c96dd4/go.mod h1:dZrwNDXLOdPza+WMAV/hsQQehm4OW4eOCM7DP55g3PM= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -1138,10 +1138,10 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20260519071638-aa98bba5eb94 h1:YJjbgu+dkp5kUJLfpMyCLfBIWZb/FcJyuLeo1gVBOuo= google.golang.org/genproto v0.0.0-20260519071638-aa98bba5eb94/go.mod h1:RRHjglSYABVCWpQ7USCpdfhcd9t4PkajvVwyynZizTc= -google.golang.org/genproto/googleapis/api v0.0.0-20260818201246-1b0934165a6f h1:zRL8hmUGXSGBJ2D+r85c0S3xhrg6BtfQ3V6KKbR/I9M= -google.golang.org/genproto/googleapis/api v0.0.0-20260818201246-1b0934165a6f/go.mod h1:q/3oV3jAi5vwelxsVAprMBC8BcM2zmNe+IjRGd+9/ks= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260818201246-1b0934165a6f h1:kMQMi+2r0XRQ/Ad2/tgd+5S7JYSBGYO4pwkLTE8F2y0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260818201246-1b0934165a6f/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5 h1:izFU9hz7aeLI/Mi1J0991ae+xcwRLr7hTqWnB/9aIIU= +google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5/go.mod h1:3LhxRw4YYkf+ylAfgaY9JlVLFKhokkCV8duhLLe7+t0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5 h1:1VUiZAXyC+zmiFYi+WLtBzr68Cj8wOofHjjrA/kkizc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1155,8 +1155,8 @@ google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3Iji google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= -google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= +google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU= +google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=