From 9668f9a3dcf257ad4daf8eac981c4d2a5a1d922f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 17:18:08 +0000 Subject: [PATCH 1/5] chore: bump github.com/prometheus/client_golang from 1.18.0 to 1.19.1 Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.18.0 to 1.19.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.18.0...v1.19.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 5abab487e963f..dd0139f20f449 100644 --- a/go.mod +++ b/go.mod @@ -161,9 +161,9 @@ require ( github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e github.com/pkg/sftp v1.13.6 - github.com/prometheus/client_golang v1.18.0 + github.com/prometheus/client_golang v1.19.1 github.com/prometheus/client_model v0.6.0 - github.com/prometheus/common v0.47.0 + github.com/prometheus/common v0.48.0 github.com/quasilyte/go-ruleguard/dsl v0.3.21 github.com/robfig/cron/v3 v3.0.1 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 @@ -394,7 +394,7 @@ require ( github.com/tailscale/certstore v0.1.1-0.20220316223106-78d6e1c49d8d // indirect github.com/tailscale/golang-x-crypto v0.0.0-20230713185742-f0b76a10a08e // indirect github.com/tailscale/goupnp v1.0.1-0.20210804011211-c64d0f06ea05 // indirect - github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect + github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 github.com/tailscale/wireguard-go v0.0.0-20230710185534-bb2c8f22eccf // indirect github.com/tchap/go-patricia/v2 v2.3.1 // indirect github.com/tcnksm/go-httpstat v0.2.0 // indirect diff --git a/go.sum b/go.sum index be60beb05ccc8..d9d7b14a9049c 100644 --- a/go.sum +++ b/go.sum @@ -773,13 +773,13 @@ github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdL github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= -github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos= github.com/prometheus/client_model v0.6.0/go.mod h1:NTQHnmxFpouOD0DpvP4XujX3CdOAGQPoaGhyTchlyt8= -github.com/prometheus/common v0.47.0 h1:p5Cz0FNHo7SnWOmWmoRozVcjEp0bIVU8cV7OShpjL1k= -github.com/prometheus/common v0.47.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= +github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/quasilyte/go-ruleguard/dsl v0.3.21 h1:vNkC6fC6qMLzCOGbnIHOd5ixUGgTbp3Z4fGnUgULlDA= From 3478ae14ab40c0968ae208b2489498f4bade4577 Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Mon, 13 May 2024 11:20:38 +0200 Subject: [PATCH 2/5] Fix changes in lib Signed-off-by: Danny Kopping --- scripts/metricsdocgen/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/metricsdocgen/main.go b/scripts/metricsdocgen/main.go index 8589653172005..26f80232c810b 100644 --- a/scripts/metricsdocgen/main.go +++ b/scripts/metricsdocgen/main.go @@ -64,7 +64,7 @@ func readMetrics() ([]*dto.MetricFamily, error) { var metrics []*dto.MetricFamily - decoder := expfmt.NewDecoder(f, expfmt.FmtProtoText) + decoder := expfmt.NewDecoder(f, expfmt.NewFormat(expfmt.TypeProtoText)) for { var m dto.MetricFamily err = decoder.Decode(&m) From ca22653710ff664184f15452c4f5f3fa110bc415 Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Mon, 13 May 2024 12:10:40 +0200 Subject: [PATCH 3/5] Using semi-colon for sed separator since sha256 can contain / but not ; The encoding appears to be base64, which does not use semi-colons: https://datatracker.ietf.org/doc/html/rfc4648#section-4 Signed-off-by: Danny Kopping --- flake.nix | 4 ++-- scripts/update-flake.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 510a2ea8dad53..6a34beaca81c0 100644 --- a/flake.nix +++ b/flake.nix @@ -95,9 +95,9 @@ buildFat = osArch: pkgs.buildGo121Module { name = "coder-${osArch}"; - # Updated with ./scripts/update-flake.nix`. + # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes! - vendorHash = "sha256-pTRr85MtdlsI0iYGAwLAQ3QvtrDR8rDOynYx8FDaRy0="; + vendorHash = "sha256-lzUnofunQ5IK++tl64stN4LqxXYMRK/WbfTQlovKrng=" proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ]; diff --git a/scripts/update-flake.sh b/scripts/update-flake.sh index 4094f20032611..0dc1e96b84683 100755 --- a/scripts/update-flake.sh +++ b/scripts/update-flake.sh @@ -13,4 +13,4 @@ echo "Calculating SRI hash..." HASH=$(go run tailscale.com/cmd/nardump --sri "$OUT/pkg/mod/cache/download") sudo rm -rf "$OUT" -sed -i "s/\(vendorHash = \"\)[^\"]*/\1${HASH}/" ./flake.nix +sed -i "s;\(vendorHash = \"\)[^\"]*;\1${HASH};" ./flake.nix From 0161c96ebfc9a429d7af8eb15b0cf3d76ddf29e9 Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Mon, 13 May 2024 12:30:44 +0200 Subject: [PATCH 4/5] Dropped the colon accidentally Signed-off-by: Danny Kopping --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 6a34beaca81c0..9ed55a8d1b73a 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,7 @@ name = "coder-${osArch}"; # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes! - vendorHash = "sha256-lzUnofunQ5IK++tl64stN4LqxXYMRK/WbfTQlovKrng=" + vendorHash = "sha256-lzUnofunQ5IK++tl64stN4LqxXYMRK/WbfTQlovKrng="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ]; From 60eb283c933648c4b6c47a3330b515de5f629499 Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Mon, 13 May 2024 14:51:57 +0200 Subject: [PATCH 5/5] Update hash Signed-off-by: Danny Kopping --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9ed55a8d1b73a..577a422cdbbf3 100644 --- a/flake.nix +++ b/flake.nix @@ -97,7 +97,7 @@ name = "coder-${osArch}"; # Updated with ./scripts/update-flake.sh`. # This should be updated whenever go.mod changes! - vendorHash = "sha256-lzUnofunQ5IK++tl64stN4LqxXYMRK/WbfTQlovKrng="; + vendorHash = "sha256-YOqgW5v7qXfOYcCQECZyJfoewChtQDfRCrTcr7Ui37Y="; proxyVendor = true; src = ./.; nativeBuildInputs = with pkgs; [ getopt openssl zstd ];