From 532d20416ead711726a94fe1a6aa1904073adcf3 Mon Sep 17 00:00:00 2001 From: Pinny Date: Tue, 24 Mar 2026 13:07:26 +0000 Subject: [PATCH 1/2] Bump dependencies --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6f2720536..962cf3376 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.26 require ( github.com/MakeNowJust/heredoc/v2 v2.0.1 - github.com/chromedp/cdproto v0.0.0-20260320225252-cf654f46fc63 - github.com/chromedp/chromedp v0.15.0 + github.com/chromedp/cdproto v0.0.0-20260321001828-e3e3800016bc + github.com/chromedp/chromedp v0.15.1 github.com/coreos/go-oidc/v3 v3.17.0 github.com/coreos/go-semver v0.3.1 github.com/creack/pty v1.1.24 diff --git a/go.sum b/go.sum index 62f38fe9b..ce60f212d 100644 --- a/go.sum +++ b/go.sum @@ -65,10 +65,10 @@ github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyY github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chromedp/cdproto v0.0.0-20260320225252-cf654f46fc63 h1:f027idvVkILyihTa8Z2vQCxTYPqHNdKlW7cXdMSZegU= -github.com/chromedp/cdproto v0.0.0-20260320225252-cf654f46fc63/go.mod h1:cbyjALe67vDvlvdiG9369P8w5U2w6IshwtyD2f2Tvag= -github.com/chromedp/chromedp v0.15.0 h1:B5abPcaCVetu6GDHsQKj8HbMhDWdiOM52E/TuOfuwyY= -github.com/chromedp/chromedp v0.15.0/go.mod h1:V5szO2ASqoBZsIQ88EfNMRhi9737Equm5HFL9tsBt3Q= +github.com/chromedp/cdproto v0.0.0-20260321001828-e3e3800016bc h1:wkN/LMi5vc60pBRWx6qpbk/aEvq3/ZVNpnMvsw8PVVU= +github.com/chromedp/cdproto v0.0.0-20260321001828-e3e3800016bc/go.mod h1:cbyjALe67vDvlvdiG9369P8w5U2w6IshwtyD2f2Tvag= +github.com/chromedp/chromedp v0.15.1 h1:EJWiPm7BNqDqjYy6U0lTSL5wNH+iNt9GjC3a4gfjNyQ= +github.com/chromedp/chromedp v0.15.1/go.mod h1:CdTHtUqD/dqaFw/cvFWtTydoEQS44wLBuwbMR9EkOY4= github.com/chromedp/sysutil v1.1.0 h1:PUFNv5EcprjqXZD9nJb9b/c9ibAbxiYo4exNWZyipwM= github.com/chromedp/sysutil v1.1.0/go.mod h1:WiThHUdltqCNKGc4gaU50XgYjwjYIhKWoHGPTUfWTJ8= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= From b2f8a705ce5f8ae0a2616d958169440c106bd2d8 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Tue, 24 Mar 2026 08:46:22 -0700 Subject: [PATCH 2/2] replace deprecated chromedp GrantPermissions with new SetPermission call --- test/testlib/browsertest/browsertest.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/testlib/browsertest/browsertest.go b/test/testlib/browsertest/browsertest.go index 144db7fd2..761cdeb78 100644 --- a/test/testlib/browsertest/browsertest.go +++ b/test/testlib/browsertest/browsertest.go @@ -1,4 +1,4 @@ -// Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. +// Copyright 2020-2026 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 // Package browsertest provides integration test helpers for our browser-based tests. @@ -19,7 +19,8 @@ import ( "time" chromedpbrowser "github.com/chromedp/cdproto/browser" - "github.com/chromedp/cdproto/dom" + chromedpdom "github.com/chromedp/cdproto/dom" + chromedppage "github.com/chromedp/cdproto/page" chromedpruntime "github.com/chromedp/cdproto/runtime" "github.com/chromedp/chromedp" "github.com/stretchr/testify/require" @@ -137,8 +138,9 @@ func OpenBrowser(t *testing.T) *Browser { // Grant permission to write to the clipboard because the Pinniped formpost UI has a button to copy the // authcode to the clipboard, and we want to be able to use that button in tests. require.NoError(t, chromedp.Run(chromeCtx, - chromedpbrowser.GrantPermissions( - []chromedpbrowser.PermissionType{chromedpbrowser.PermissionTypeClipboardSanitizedWrite}, + chromedpbrowser.SetPermission( + &chromedpbrowser.PermissionDescriptor{Name: chromedppage.PermissionsPolicyFeatureClipboardWrite.String()}, + chromedpbrowser.PermissionSettingGranted, ), )) @@ -196,11 +198,11 @@ func (b *Browser) dumpPage(t *testing.T) { // Log the HTML of the current page. var html string b.runWithTimeout(t, b.timeout(), chromedp.ActionFunc(func(ctx context.Context) error { - node, err := dom.GetDocument().Do(ctx) + node, err := chromedpdom.GetDocument().Do(ctx) if err != nil { return err } - html, err = dom.GetOuterHTML().WithNodeID(node.NodeID).Do(ctx) + html, err = chromedpdom.GetOuterHTML().WithNodeID(node.NodeID).Do(ctx) return err })) var htmlBuf bytes.Buffer