From 7c1810b3592d7492e583b09f96253c91c7e3d329 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 4 Sep 2021 02:48:08 +0000 Subject: [PATCH 1/3] Update module github.com/chromedp/chromedp to v0.7.4 --- go.mod | 4 ++-- go.sum | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 8bfc1c1..bf2e59a 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.12 require ( github.com/cenkalti/backoff/v4 v4.1.1 - github.com/chromedp/cdproto v0.0.0-20210323015217-0942afbea50e - github.com/chromedp/chromedp v0.6.10 + github.com/chromedp/cdproto v0.0.0-20210713064928-7d28b402946a + github.com/chromedp/chromedp v0.7.4 github.com/golang/mock v1.6.0 github.com/google/wire v0.5.0 github.com/int128/listener v1.1.0 diff --git a/go.sum b/go.sum index dd14782..13c9d30 100644 --- a/go.sum +++ b/go.sum @@ -76,10 +76,10 @@ github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1P github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/chromedp/cdproto v0.0.0-20210323015217-0942afbea50e h1:UimnzLuARNkGi2XsNznUoOLFP/noktdUMrr7fcb3D4U= -github.com/chromedp/cdproto v0.0.0-20210323015217-0942afbea50e/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U= -github.com/chromedp/chromedp v0.6.10 h1:Yd4X6ngkWbn6A+hv6mUzV9kVHrPn7L4+vf2uyNbze2s= -github.com/chromedp/chromedp v0.6.10/go.mod h1:Q8L2uDLH9YFYbThK5fqPpyWa3CT4y9dqHLxaQr+Yhl8= +github.com/chromedp/cdproto v0.0.0-20210713064928-7d28b402946a h1:B6EyBXuMsFyrUoBrNXdt+Vf3vQNpN4DU/Xv96R4BdFg= +github.com/chromedp/cdproto v0.0.0-20210713064928-7d28b402946a/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U= +github.com/chromedp/chromedp v0.7.4 h1:U+0d3WbB/Oj4mDuBOI0P7S3PJEued5UZIl5AJ3QulwU= +github.com/chromedp/chromedp v0.7.4/go.mod h1:dBj+SXuQHznp6ZPwZeDDEBZKwclUwDLbZ0hjMialMYs= github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic= github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -150,8 +150,8 @@ github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= -github.com/gobwas/ws v1.0.4 h1:5eXU1CZhpQdq5kXbKb+sECH5Ia5KiO6CYzIzdlVx6Bs= -github.com/gobwas/ws v1.0.4/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= +github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -346,6 +346,8 @@ github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9k github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5 h1:1SoBaSPudixRecmlHXb/GxmaD3fLMtHIDN13QujwQuc= +github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0= 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/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= @@ -602,6 +604,7 @@ golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -612,6 +615,7 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 59163d030903670b7821e11a0eda03c4d1e03958 Mon Sep 17 00:00:00 2001 From: Hidetake Iwata Date: Sun, 5 Sep 2021 12:33:19 +0900 Subject: [PATCH 2/3] Use chromedp.FullScreenshot --- e2e_test/main.go | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/e2e_test/main.go b/e2e_test/main.go index 5e7bfcf..28aaf79 100644 --- a/e2e_test/main.go +++ b/e2e_test/main.go @@ -5,14 +5,12 @@ import ( "fmt" "io/ioutil" "log" - "math" "os" "os/exec" "strings" "time" "github.com/chromedp/cdproto/emulation" - "github.com/chromedp/cdproto/page" "github.com/chromedp/chromedp" "golang.org/x/sync/errgroup" ) @@ -105,39 +103,11 @@ func navigate(urlstr string) chromedp.Action { }) } -// capture entire browser viewport: // https://github.com/chromedp/examples/blob/master/screenshot/main.go func takeScreenshot(name string) chromedp.Action { return chromedp.ActionFunc(func(ctx context.Context) error { - // get layout metrics - _, _, contentSize, err := page.GetLayoutMetrics().Do(ctx) - if err != nil { - return fmt.Errorf("could not get layout metrics: %w", err) - } - - width, height := int64(math.Ceil(contentSize.Width)), int64(math.Ceil(contentSize.Height)) - - // force viewport emulation - err = emulation.SetDeviceMetricsOverride(width, height, 1, false). - WithScreenOrientation(&emulation.ScreenOrientation{ - Type: emulation.OrientationTypePortraitPrimary, - Angle: 0, - }). - Do(ctx) - if err != nil { - return fmt.Errorf("could not set viewport emulation: %w", err) - } - - // capture screenshot - b, err := page.CaptureScreenshot(). - WithClip(&page.Viewport{ - X: contentSize.X, - Y: contentSize.Y, - Width: contentSize.Width, - Height: contentSize.Height, - Scale: 1, - }).Do(ctx) - if err != nil { + var b []byte + if err := chromedp.FullScreenshot(&b, 90).Do(ctx); err != nil { return fmt.Errorf("could not capture a screenshot: %w", err) } if err := ioutil.WriteFile(name, b, 0644); err != nil { From 83b3f87de5548e5b281b23d0c6f11d49a0f8f8c4 Mon Sep 17 00:00:00 2001 From: Hidetake Iwata Date: Sun, 5 Sep 2021 12:37:14 +0900 Subject: [PATCH 3/3] Use chromedp.EmulateViewport --- e2e_test/main.go | 3 +-- go.mod | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/e2e_test/main.go b/e2e_test/main.go index 28aaf79..d74f94f 100644 --- a/e2e_test/main.go +++ b/e2e_test/main.go @@ -10,7 +10,6 @@ import ( "strings" "time" - "github.com/chromedp/cdproto/emulation" "github.com/chromedp/chromedp" "golang.org/x/sync/errgroup" ) @@ -68,7 +67,7 @@ func runBrowser(ctx context.Context) error { ctx, cancel = context.WithTimeout(ctx, 30*time.Second) defer cancel() err := chromedp.Run(ctx, - emulation.SetDeviceMetricsOverride(2048, 1152, 1, false), + chromedp.EmulateViewport(2048, 1152), // open the page of pod list navigate("http://localhost:18000/#/pod?namespace=kube-system"), // wait for a link on the page diff --git a/go.mod b/go.mod index bf2e59a..0036547 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.12 require ( github.com/cenkalti/backoff/v4 v4.1.1 - github.com/chromedp/cdproto v0.0.0-20210713064928-7d28b402946a github.com/chromedp/chromedp v0.7.4 github.com/golang/mock v1.6.0 github.com/google/wire v0.5.0