From 54ea455ac46291db9b3f90c89e1f7aa09884a927 Mon Sep 17 00:00:00 2001 From: Kashif Khan <70996046+kashifkhan0771@users.noreply.github.com> Date: Tue, 8 Apr 2025 19:12:28 +0500 Subject: [PATCH] Reverted cloud.google.com/go/secretmanager to v1.14.2 (#4022) * Update go.mod to resolve grpc/stats/opentelemetry ambiguity * fallback * fallback * go mod tidy * resolved linters * resolved linters * revert back * resolved linters --- go.mod | 4 +-- go.sum | 20 ----------- pkg/tui/components/footer/footer.go | 2 +- pkg/tui/components/tabs/tabs.go | 4 +-- pkg/tui/components/textinputs/textinputs.go | 4 +-- pkg/tui/pages/source_select/source_select.go | 2 +- pkg/tui/pages/wizard_intro/item.go | 6 ++-- pkg/tui/styles/styles.go | 36 ++++++++++---------- 8 files changed, 28 insertions(+), 50 deletions(-) diff --git a/go.mod b/go.mod index 685eb0f8e..dfc264c2c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ replace github.com/coinbase/waas-client-library-go => github.com/trufflesecurity replace google.golang.org/grpc/stats/opentelemetry => google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a require ( - cloud.google.com/go/secretmanager v1.14.6 + cloud.google.com/go/secretmanager v1.14.2 cloud.google.com/go/storage v1.48.0 github.com/BobuSumisu/aho-corasick v1.0.3 github.com/TheZeroSlave/zapsentry v1.23.0 @@ -175,9 +175,7 @@ require ( github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect github.com/charmbracelet/x/ansi v0.8.0 // indirect github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect - github.com/charmbracelet/x/input v0.1.0 // indirect github.com/charmbracelet/x/term v0.2.1 // indirect - github.com/charmbracelet/x/windows v0.1.0 // indirect github.com/cloudflare/circl v1.3.8 // indirect github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect github.com/containerd/log v0.1.0 // indirect diff --git a/go.sum b/go.sum index 3bb84e72e..f2869b8a4 100644 --- a/go.sum +++ b/go.sum @@ -114,8 +114,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= -github.com/avast/apkparser v0.0.0-20240729092610-90591e0804ae h1:rDNramK9mnAbvUBJyIRZnzHchM45cXexHIX9pS9da4Q= -github.com/avast/apkparser v0.0.0-20240729092610-90591e0804ae/go.mod h1:GNvprXNmXaDjpHmN3RFxz5QdK5VXTUvmQludCbjoBy4= github.com/avast/apkparser v0.0.0-20250307094510-e2100ee9c0f5 h1:zRaiVswCgpvZ6lyeErxC94EJaZdSoj0mzUPYRBOnqCI= github.com/avast/apkparser v0.0.0-20250307094510-e2100ee9c0f5/go.mod h1:GNvprXNmXaDjpHmN3RFxz5QdK5VXTUvmQludCbjoBy4= github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= @@ -180,32 +178,20 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0= github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw= -github.com/charmbracelet/bubbletea v0.27.0 h1:Mznj+vvYuYagD9Pn2mY7fuelGvP0HAXtZYGgRBCbHvU= -github.com/charmbracelet/bubbletea v0.27.0/go.mod h1:5MdP9XH6MbQkgGhnlxUqCNmBXf9I74KRQ8HIidRxV1Y= github.com/charmbracelet/bubbletea v1.3.4 h1:kCg7B+jSCFPLYRA52SDZjr51kG/fMUEoPoZrkaDHyoI= github.com/charmbracelet/bubbletea v1.3.4/go.mod h1:dtcUCyCGEX3g9tosuYiut3MXgY/Jsv9nKVdibKKRRXo= github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= github.com/charmbracelet/glamour v0.7.0 h1:2BtKGZ4iVJCDfMF229EzbeR1QRKLWztO9dMtjmqZSng= github.com/charmbracelet/glamour v0.7.0/go.mod h1:jUMh5MeihljJPQbJ/wf4ldw2+yBP59+ctV36jASy7ps= -github.com/charmbracelet/lipgloss v0.10.0 h1:KWeXFSexGcfahHX+54URiZGkBFazf70JNMtwg/AFW3s= -github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy123SR4dOXlKa91ciE= github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= -github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM= -github.com/charmbracelet/x/ansi v0.1.4/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw= github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= -github.com/charmbracelet/x/input v0.1.0 h1:TEsGSfZYQyOtp+STIjyBq6tpRaorH0qpwZUj8DavAhQ= -github.com/charmbracelet/x/input v0.1.0/go.mod h1:ZZwaBxPF7IG8gWWzPUVqHEtWhc1+HXJPNuerJGRGZ28= -github.com/charmbracelet/x/term v0.1.1 h1:3cosVAiPOig+EV4X9U+3LDgtwwAoEzJjNdwbXDjF6yI= -github.com/charmbracelet/x/term v0.1.1/go.mod h1:wB1fHt5ECsu3mXYusyzcngVWWlu1KKUmmLhfgr/Flxw= github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= -github.com/charmbracelet/x/windows v0.1.0 h1:gTaxdvzDM5oMa/I2ZNF7wN78X/atWemG9Wph7Ika2k4= -github.com/charmbracelet/x/windows v0.1.0/go.mod h1:GLEO/l+lizvFDBPLIOk+49gdX49L9YWMB5t+DZd0jkQ= github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM= github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY= github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89/go.mod h1:GKljq0VrfU4D5yc+2qA6OVr8pmO/MBbPEWqWQ/oqGEs= @@ -548,8 +534,6 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+ github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lrstanley/bubblezone v0.0.0-20240125042004-b7bafc493195 h1:zcxmFnwisGZSaEzgvkOrs4belfcRlKyIUfa3sOQSttQ= -github.com/lrstanley/bubblezone v0.0.0-20240125042004-b7bafc493195/go.mod h1:v5lEwWaguF1o2MW/ucO0ZIA/IZymdBYJJ+2cMRLE7LU= github.com/lrstanley/bubblezone v0.0.0-20250404061050-e13639e27357 h1:DxFncLGTrDh5v0z+DE7h+qjD5tPCGR+3knGVVfT3YLI= github.com/lrstanley/bubblezone v0.0.0-20250404061050-e13639e27357/go.mod h1:S5etECMx+sZnW0Gm100Ma9J1PgVCTgNyFaqGu2b08b4= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= @@ -608,8 +592,6 @@ github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELU github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= -github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo= -github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8= github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= @@ -790,8 +772,6 @@ github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= -github.com/xo/dburl v0.23.3 h1:s9tUyKAkcgRfNQ7ut5gaDWC9s5ROafY3hmNOrGbNXtE= -github.com/xo/dburl v0.23.3/go.mod h1:uazlaAQxj4gkshhfuuYyvwCBouOmNnG2aDxTCFZpmL4= github.com/xo/dburl v0.23.6 h1:/k5cN6NO+d0i+QMZyAn4UCn7q0LxzqCzPzF9esf3dT4= github.com/xo/dburl v0.23.6/go.mod h1:uazlaAQxj4gkshhfuuYyvwCBouOmNnG2aDxTCFZpmL4= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= diff --git a/pkg/tui/components/footer/footer.go b/pkg/tui/components/footer/footer.go index 68ca0842e..1ccf49071 100644 --- a/pkg/tui/components/footer/footer.go +++ b/pkg/tui/components/footer/footer.go @@ -56,7 +56,7 @@ func (f *Footer) View() string { if f.keymap == nil { return "" } - s := f.common.Styles.Footer.Copy(). + s := f.common.Styles.Footer. Width(f.common.Width) helpView := f.help.View(f.keymap) return f.common.Zone.Mark( diff --git a/pkg/tui/components/tabs/tabs.go b/pkg/tui/components/tabs/tabs.go index 6ab13e23b..521bf345d 100644 --- a/pkg/tui/components/tabs/tabs.go +++ b/pkg/tui/components/tabs/tabs.go @@ -77,10 +77,10 @@ func (t *Tabs) View() string { s := strings.Builder{} sep := t.TabSeparator for i, tab := range t.tabs { - style := t.TabInactive.Copy() + style := t.TabInactive prefix := " " if i == t.activeTab { - style = t.TabActive.Copy() + style = t.TabActive prefix = t.TabDot.Render("• ") } if t.UseDot { diff --git a/pkg/tui/components/textinputs/textinputs.go b/pkg/tui/components/textinputs/textinputs.go index 3b53bd9d1..5f5a41804 100644 --- a/pkg/tui/components/textinputs/textinputs.go +++ b/pkg/tui/components/textinputs/textinputs.go @@ -15,8 +15,8 @@ var ( focusedStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("205")) blurredStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("240")) noStyle = lipgloss.NewStyle() - helpStyle = blurredStyle.Copy() - // cursorStyle = focusedStyle.Copy() + helpStyle = blurredStyle + // cursorStyle = focusedStyle. // cursorModeHelpStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("244")) focusedSkipButton = lipgloss.NewStyle().Foreground(lipgloss.Color("205")).Render("[ Run with defaults ]") diff --git a/pkg/tui/pages/source_select/source_select.go b/pkg/tui/pages/source_select/source_select.go index 723bf68d8..b22de95f2 100644 --- a/pkg/tui/pages/source_select/source_select.go +++ b/pkg/tui/pages/source_select/source_select.go @@ -30,7 +30,7 @@ var ( Foreground(lipgloss.AdaptiveColor{Dark: styles.Colors["sprout"], Light: styles.Colors["fern"]}). Padding(0, 0, 0, 1) - selectedDescription = selectedSourceItemStyle.Copy(). + selectedDescription = selectedSourceItemStyle. Foreground(lipgloss.AdaptiveColor{Dark: styles.Colors["sprout"], Light: styles.Colors["sprout"]}) ) diff --git a/pkg/tui/pages/wizard_intro/item.go b/pkg/tui/pages/wizard_intro/item.go index f9eef55d9..7fbefa704 100644 --- a/pkg/tui/pages/wizard_intro/item.go +++ b/pkg/tui/pages/wizard_intro/item.go @@ -101,7 +101,7 @@ func (d ItemDelegate) Render(w io.Writer, m list.Model, index int, listItem list if m.Width()-styles.Base.GetHorizontalFrameSize()-lipgloss.Width(updatedStr)-lipgloss.Width(title) <= 0 { updatedStr = "" } - updatedStyle := styles.Updated.Copy(). + updatedStyle := styles.Updated. Align(lipgloss.Right). Width(m.Width() - styles.Base.GetHorizontalFrameSize() - lipgloss.Width(title)) updated := updatedStyle.Render(updatedStr) @@ -112,8 +112,8 @@ func (d ItemDelegate) Render(w io.Writer, m list.Model, index int, listItem list } if isFiltered { - unmatched := styles.Title.Copy().Inline(true) - matched := unmatched.Copy().Underline(true) + unmatched := styles.Title.Inline(true) + matched := unmatched.Underline(true) title = lipgloss.StyleRunes(title, matchedRunes, matched, unmatched) } title = styles.Title.Render(title) diff --git a/pkg/tui/styles/styles.go b/pkg/tui/styles/styles.go index 09c925211..0182f18e6 100644 --- a/pkg/tui/styles/styles.go +++ b/pkg/tui/styles/styles.go @@ -197,7 +197,7 @@ func DefaultStyles() *Styles { s.TopLevelNormalTab = lipgloss.NewStyle(). MarginRight(2) - s.TopLevelActiveTab = s.TopLevelNormalTab.Copy(). + s.TopLevelActiveTab = s.TopLevelNormalTab. Foreground(lipgloss.Color("36")) s.TopLevelActiveTabDot = lipgloss.NewStyle(). @@ -219,20 +219,20 @@ func DefaultStyles() *Styles { s.RepoSelector.Normal.Updated = lipgloss.NewStyle(). Foreground(lipgloss.Color("243")) - s.RepoSelector.Active.Base = s.RepoSelector.Normal.Base.Copy(). + s.RepoSelector.Active.Base = s.RepoSelector.Normal.Base. BorderStyle(lipgloss.Border{Left: "┃"}). BorderForeground(lipgloss.Color("176")) - s.RepoSelector.Active.Title = s.RepoSelector.Normal.Title.Copy(). + s.RepoSelector.Active.Title = s.RepoSelector.Normal.Title. Foreground(lipgloss.Color("212")) - s.RepoSelector.Active.Desc = s.RepoSelector.Normal.Desc.Copy(). + s.RepoSelector.Active.Desc = s.RepoSelector.Normal.Desc. Foreground(lipgloss.Color("246")) - s.RepoSelector.Active.Updated = s.RepoSelector.Normal.Updated.Copy(). + s.RepoSelector.Active.Updated = s.RepoSelector.Normal.Updated. Foreground(lipgloss.Color("212")) - s.RepoSelector.Active.Command = s.RepoSelector.Normal.Command.Copy(). + s.RepoSelector.Active.Command = s.RepoSelector.Normal.Command. Foreground(lipgloss.Color("204")) s.MenuItem = lipgloss.NewStyle(). @@ -317,13 +317,13 @@ func DefaultStyles() *Styles { }, false, false, false, true). PaddingLeft(1) - s.LogItem.Active.Base = s.LogItem.Normal.Base.Copy(). + s.LogItem.Active.Base = s.LogItem.Normal.Base. Border(lipgloss.Border{ Left: "┃", }, false, false, false, true). BorderForeground(selectorColor) - s.LogItem.Active.Hash = s.LogItem.Normal.Hash.Copy(). + s.LogItem.Active.Hash = s.LogItem.Normal.Hash. Foreground(hashColor) s.LogItem.Active.Hash = lipgloss.NewStyle(). @@ -343,7 +343,7 @@ func DefaultStyles() *Styles { s.LogItem.Active.Desc = lipgloss.NewStyle(). Foreground(lipgloss.Color("95")) - s.LogItem.Active.Keyword = s.LogItem.Active.Desc.Copy(). + s.LogItem.Active.Keyword = s.LogItem.Active.Desc. Foreground(highlightColorDim) s.LogItem.Normal.Hash = lipgloss.NewStyle(). @@ -397,16 +397,16 @@ func DefaultStyles() *Styles { Bold(true). Foreground(highlightColor) - s.Ref.Paginator = s.Log.Paginator.Copy() + s.Ref.Paginator = s.Log.Paginator - s.Tree.Selector = s.Tree.Normal.FileName.Copy(). + s.Tree.Selector = s.Tree.Normal.FileName. Width(1). Foreground(selectorColor) s.Tree.Normal.FileName = lipgloss.NewStyle(). MarginLeft(1) - s.Tree.Active.FileName = s.Tree.Normal.FileName.Copy(). + s.Tree.Active.FileName = s.Tree.Normal.FileName. Bold(true). Foreground(highlightColor) @@ -416,24 +416,24 @@ func DefaultStyles() *Styles { s.Tree.Active.FileDir = lipgloss.NewStyle(). Foreground(highlightColor) - s.Tree.Normal.FileMode = s.Tree.Active.FileName.Copy(). + s.Tree.Normal.FileMode = s.Tree.Active.FileName. Width(10). Foreground(lipgloss.Color("243")) - s.Tree.Active.FileMode = s.Tree.Normal.FileMode.Copy(). + s.Tree.Active.FileMode = s.Tree.Normal.FileMode. Foreground(highlightColorDim) - s.Tree.Normal.FileSize = s.Tree.Normal.FileName.Copy(). + s.Tree.Normal.FileSize = s.Tree.Normal.FileName. Foreground(lipgloss.Color("243")) - s.Tree.Active.FileSize = s.Tree.Normal.FileName.Copy(). + s.Tree.Active.FileSize = s.Tree.Normal.FileName. Foreground(highlightColorDim) s.Tree.FileContent = lipgloss.NewStyle() - s.Tree.Paginator = s.Log.Paginator.Copy() + s.Tree.Paginator = s.Log.Paginator - s.Tree.NoItems = s.AboutNoReadme.Copy() + s.Tree.NoItems = s.AboutNoReadme s.Spinner = lipgloss.NewStyle(). MarginTop(1).