From 511093f600a13ea25fc3d9d44760d0b244dfe9f2 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 4 Jul 2024 15:18:15 +0100 Subject: [PATCH 1/2] fix: use recently-added ConnectRPC20 compat variant Signed-off-by: Cian Johnston --- buildlog/coder.go | 5 +++-- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildlog/coder.go b/buildlog/coder.go index f78664a..3031ec0 100644 --- a/buildlog/coder.go +++ b/buildlog/coder.go @@ -105,11 +105,12 @@ func newAgentClientV2(ctx context.Context, logger slog.Logger, client *agentsdk. var conn drpc.Conn var err error for r := retry.New(10*time.Millisecond, time.Second); r.Wait(ctx); { - conn, err = client.ConnectRPC(ctx) + c, err := client.ConnectRPC20(ctx) if err != nil { logger.Error(ctx, "connect err", slog.Error(err)) continue } + conn = c.DRPCConn() break } if conn == nil { @@ -144,7 +145,7 @@ func OpenCoderClient(ctx context.Context, accessURL *url.URL, logger slog.Logger return nil, xerrors.Errorf("build info: %w", err) } - if semver.Compare(semver.MajorMinor(resp.Version), "v2.13") < 0 { + if semver.Compare(semver.MajorMinor(resp.Version), "v2.9") < 0 { return &agentClientV1{ ctx: ctx, client: client, diff --git a/go.mod b/go.mod index 112e1c7..3cc5995 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240530071520-1ac6 require ( cdr.dev/slog v1.6.2-0.20240126064726-20367d4aede6 - github.com/coder/coder/v2 v2.12.0 + github.com/coder/coder/v2 v2.10.1-0.20240703121105-f6639b788f7b github.com/coder/retry v1.5.1 github.com/cpuguy83/dockercfg v0.3.1 github.com/docker/docker v24.0.9+incompatible diff --git a/go.sum b/go.sum index 0a43795..94f5e8f 100644 --- a/go.sum +++ b/go.sum @@ -108,6 +108,8 @@ github.com/cilium/ebpf v0.12.3 h1:8ht6F9MquybnY97at+VDZb3eQQr8ev79RueWeVaEcG4= github.com/cilium/ebpf v0.12.3/go.mod h1:TctK1ivibvI3znr66ljgi4hqOT8EYQjz1KWBfb1UVgM= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= +github.com/coder/coder/v2 v2.10.1-0.20240703121105-f6639b788f7b h1:c9zXTYVCFW+7Aq2LTdGkyZ2F8o+yWTdgy68EdPvx/34= +github.com/coder/coder/v2 v2.10.1-0.20240703121105-f6639b788f7b/go.mod h1:Wq39Bje3wvtydrWgGHxngVJFEPSDibZwZeBlW3k1CG8= github.com/coder/coder/v2 v2.12.0 h1:B91lKMm5srigOikDT5h/ZTG/Ng2yq+fl2oQtFXAY+Vs= github.com/coder/coder/v2 v2.12.0/go.mod h1:io26dngPVP3a7zD1lL/bzEOGDSincJGomBKlqmRRVNA= github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx9n47SZOKOpgSE1bbJzlE4qPVs= From 099b43273d854af4199803ed22fc898fc1da2360 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 4 Jul 2024 15:38:13 +0100 Subject: [PATCH 2/2] fixup! fix: use recently-added ConnectRPC20 compat variant --- go.mod | 4 ++-- go.sum | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 3cc5995..d7fe86d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.4 // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here: // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main -replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240530071520-1ac63d3a4ee3 +replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374 require ( cdr.dev/slog v1.6.2-0.20240126064726-20367d4aede6 @@ -64,13 +64,13 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.28.4 // indirect github.com/aws/smithy-go v1.20.2 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect - github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bytedance/sonic v1.10.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/charmbracelet/lipgloss v0.8.0 // indirect github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 // indirect + github.com/coder/quartz v0.1.0 // indirect github.com/coder/serpent v0.7.0 // indirect github.com/coder/terraform-provider-coder v0.23.0 // indirect github.com/containerd/continuity v0.4.2 // indirect diff --git a/go.sum b/go.sum index 94f5e8f..431fd1e 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,6 @@ github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q= github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= -github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= -github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bool64/shared v0.1.5 h1:fp3eUhBsrSjNCQPcSdQqZxxh9bBwrYiZ+zOKFkM0/2E= @@ -110,16 +108,16 @@ github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vc github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/coder/coder/v2 v2.10.1-0.20240703121105-f6639b788f7b h1:c9zXTYVCFW+7Aq2LTdGkyZ2F8o+yWTdgy68EdPvx/34= github.com/coder/coder/v2 v2.10.1-0.20240703121105-f6639b788f7b/go.mod h1:Wq39Bje3wvtydrWgGHxngVJFEPSDibZwZeBlW3k1CG8= -github.com/coder/coder/v2 v2.12.0 h1:B91lKMm5srigOikDT5h/ZTG/Ng2yq+fl2oQtFXAY+Vs= -github.com/coder/coder/v2 v2.12.0/go.mod h1:io26dngPVP3a7zD1lL/bzEOGDSincJGomBKlqmRRVNA= github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx9n47SZOKOpgSE1bbJzlE4qPVs= github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0/go.mod h1:5UuS2Ts+nTToAMeOjNlnHFkPahrtDkmpydBen/3wgZc= +github.com/coder/quartz v0.1.0 h1:cLL+0g5l7xTf6ordRnUMMiZtRE8Sq5LxpghS63vEXrQ= +github.com/coder/quartz v0.1.0/go.mod h1:vsiCc+AHViMKH2CQpGIpFgdHIEQsxwm8yCscqKmzbRA= github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc= github.com/coder/retry v1.5.1/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY= github.com/coder/serpent v0.7.0 h1:zGpD2GlF3lKIVkMjNGKbkip88qzd5r/TRcc30X/SrT0= github.com/coder/serpent v0.7.0/go.mod h1:REkJ5ZFHQUWFTPLExhXYZ1CaHFjxvGNRlLXLdsI08YA= -github.com/coder/tailscale v1.1.1-0.20240530071520-1ac63d3a4ee3 h1:F2QRxrwPJyMPmX5qU7UpwEenhsk9qDqHyvYFxON1RkI= -github.com/coder/tailscale v1.1.1-0.20240530071520-1ac63d3a4ee3/go.mod h1:rp6BIJxCp127/hvvDWNkHC9MxAlKvQfoOtBr8s5sCqo= +github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374 h1:a5Eg7D5e2oAc0tN56ee4yxtiTo76ztpRlk6geljaZp8= +github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374/go.mod h1:rp6BIJxCp127/hvvDWNkHC9MxAlKvQfoOtBr8s5sCqo= github.com/coder/terraform-provider-coder v0.23.0 h1:DuNLWxhnGlXyG0g+OCAZRI6xd8+bJjIEnE4F3hYgA4E= github.com/coder/terraform-provider-coder v0.23.0/go.mod h1:wMun9UZ9HT2CzF6qPPBup1odzBpVUc0/xSFoXgdI3tk= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM=