Skip to content

Commit 3f71953

Browse files
Cristhian Peñagururajshpivotalgeorge
authored andcommitted
Bump go dependencies for security vulnerability
Updating versions of net, text and crypto as updates included in go 1.20.6, implemented race condition fix in CommandParser Co-authored-by: Cristhian Pena <cpena@vmware.com> Co-authored-by: Shwetha Gururaj <gururajsh@vmware.com> Co-authored-by: George Gelashvili <ggelashvili@vmware.com>
1 parent 1205b1c commit 3f71953

File tree

5 files changed

+24
-30
lines changed

5 files changed

+24
-30
lines changed

go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ require (
3939
github.com/sirupsen/logrus v1.9.3
4040
github.com/tedsuo/rata v1.0.1-0.20170830210128-07d200713958
4141
github.com/vito/go-interact v0.0.0-20171111012221-fa338ed9e9ec
42-
golang.org/x/crypto v0.8.0
43-
golang.org/x/net v0.9.0
44-
golang.org/x/text v0.9.0
42+
golang.org/x/crypto v0.11.0
43+
golang.org/x/net v0.12.0
44+
golang.org/x/text v0.11.0
4545
gopkg.in/cheggaaa/pb.v1 v1.0.28
4646
gopkg.in/yaml.v2 v2.4.0
4747
k8s.io/apimachinery v0.22.2
@@ -84,8 +84,8 @@ require (
8484
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
8585
golang.org/x/mod v0.9.0 // indirect
8686
golang.org/x/oauth2 v0.7.0 // indirect
87-
golang.org/x/sys v0.7.0 // indirect
88-
golang.org/x/term v0.7.0 // indirect
87+
golang.org/x/sys v0.10.0 // indirect
88+
golang.org/x/term v0.10.0 // indirect
8989
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
9090
golang.org/x/tools v0.7.0 // indirect
9191
google.golang.org/appengine v1.6.7 // indirect

go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
394394
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
395395
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
396396
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
397-
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
398-
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
397+
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
398+
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
399399
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
400400
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
401401
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -467,8 +467,8 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
467467
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
468468
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
469469
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
470-
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
471-
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
470+
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
471+
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
472472
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
473473
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
474474
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -532,22 +532,22 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
532532
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
533533
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
534534
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
535-
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
536-
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
535+
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
536+
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
537537
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
538538
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
539539
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
540-
golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ=
541-
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
540+
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
541+
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
542542
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
543543
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
544544
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
545545
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
546546
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
547547
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
548548
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
549-
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
550-
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
549+
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
550+
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
551551
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
552552
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
553553
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func main() {
3232
os.Exit(1)
3333
}
3434

35-
p, err := command_parser.NewCommandParser()
35+
p, err := command_parser.NewCommandParser(config)
3636
if err != nil {
3737
fmt.Fprintf(os.Stderr, "Unexpected error: %s\n", err.Error())
3838
os.Exit(1)

util/command_parser/command_parser.go

+2-7
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,8 @@ type CommandParser struct {
4343
UI *ui.UI
4444
}
4545

46-
func NewCommandParser() (CommandParser, error) {
47-
cfConfig, err := configv3.GetCFConfig()
48-
if err != nil {
49-
return CommandParser{}, err
50-
}
51-
52-
return CommandParser{Config: cfConfig}, nil
46+
func NewCommandParser(config *configv3.Config) (CommandParser, error) {
47+
return CommandParser{Config: config}, nil
5348
}
5449

5550
func (p *CommandParser) ParseCommandFromArgs(ui *ui.UI, args []string) (int, error) {

util/command_parser/command_parser_test.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
package command_parser_test
22

33
import (
4-
"io/ioutil"
5-
6-
"code.cloudfoundry.org/cli/command/commandfakes"
74
"code.cloudfoundry.org/cli/command/common"
85
"code.cloudfoundry.org/cli/util/command_parser"
96
"code.cloudfoundry.org/cli/util/configv3"
107
"code.cloudfoundry.org/cli/util/ui"
118
. "github.com/onsi/ginkgo"
129
. "github.com/onsi/gomega"
10+
"io/ioutil"
1311
)
1412

1513
var _ = Describe("Command 'Parser'", func() {
1614
var (
1715
pluginUI *ui.UI
16+
v3Config *configv3.Config
1817
)
1918
BeforeEach(func() {
2019
var err error
21-
fakeConfig := new(commandfakes.FakeConfig)
22-
pluginUI, err = ui.NewPluginUI(fakeConfig, ioutil.Discard, ioutil.Discard)
20+
v3Config = new(configv3.Config)
21+
pluginUI, err = ui.NewPluginUI(v3Config, ioutil.Discard, ioutil.Discard)
2322
Expect(err).ToNot(HaveOccurred())
2423
})
2524

@@ -30,7 +29,7 @@ var _ = Describe("Command 'Parser'", func() {
3029
)
3130

3231
BeforeEach(func() {
33-
parser, newErr := command_parser.NewCommandParser()
32+
parser, newErr := command_parser.NewCommandParser(v3Config)
3433
Expect(newErr).ToNot(HaveOccurred())
3534
exitCode, err = parser.ParseCommandFromArgs(pluginUI, []string{"howdy"})
3635
})
@@ -52,7 +51,7 @@ var _ = Describe("Command 'Parser'", func() {
5251
common.Commands.VerboseOrVersion = false
5352
var err error
5453

55-
parser, err = command_parser.NewCommandParser()
54+
parser, err = command_parser.NewCommandParser(v3Config)
5655
Expect(err).ToNot(HaveOccurred())
5756
})
5857

0 commit comments

Comments
 (0)