Skip to content

Commit 5f98b04

Browse files
DXE-4814 Merge pull request #204 from akamai/release/v2.0.1
Release/v2.0.1
2 parents 054a5ab + 1adbb21 commit 5f98b04

29 files changed

+540
-213
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# RELEASE NOTES
22

3+
## 2.0.1 (Apr 29, 2025)
4+
5+
### Enhancements
6+
7+
* Migrated to Go `1.23.6` and adopted a semver-compliant Go directive.
8+
* Updated the required Go version to `1.23.6` for cli-terraform compilation.
9+
* Increased number of log messages.
10+
* Updated vulnerable dependencies.
11+
312
## 2.0.0 (Feb 3, 2025)
413

514
### Breaking changes

Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
GOIMPORTS_VERSION = v0.24.0
2+
GO_JUNIT_REPORT_VERSION = v2.1.0
3+
GOCOV_VERSION = v1.1.0
4+
GOCOVXML_VERSION = v1.1.0
5+
GOLANGCI_LINT_VERSION = v1.63.4
6+
17
BIN = $(CURDIR)/bin
28
GOCMD = go
39
GOTEST = $(GOCMD) test
@@ -10,19 +16,18 @@ $(BIN)/%: | $(BIN) ; $(info $(M) Installing $(PACKAGE)...)
1016
env GOBIN=$(BIN) $(GOCMD) install $(PACKAGE)
1117

1218
GOIMPORTS = $(BIN)/goimports
13-
$(BIN)/goimports: PACKAGE=golang.org/x/tools/cmd/goimports@v0.24.0
19+
$(BIN)/goimports: PACKAGE=golang.org/x/tools/cmd/goimports@$(GOIMPORTS_VERSION)
1420

1521
GOCOV = $(BIN)/gocov
16-
$(BIN)/gocov: PACKAGE=github.com/axw/gocov/gocov@v1.1.0
22+
$(BIN)/gocov: PACKAGE=github.com/axw/gocov/gocov@$(GOCOV_VERSION)
1723

1824
GOCOVXML = $(BIN)/gocov-xml
19-
$(BIN)/gocov-xml: PACKAGE=github.com/AlekSi/gocov-xml@v1.1.0
25+
$(BIN)/gocov-xml: PACKAGE=github.com/AlekSi/gocov-xml@$(GOCOVXML_VERSION)
2026

2127
GOJUNITREPORT = $(BIN)/go-junit-report
22-
$(BIN)/go-junit-report: PACKAGE=github.com/jstemmer/go-junit-report/v2@v2.1.0
28+
$(BIN)/go-junit-report: PACKAGE=github.com/jstemmer/go-junit-report/v2@$(GO_JUNIT_REPORT_VERSION)
2329

2430
GOLANGCILINT = $(BIN)/golangci-lint
25-
GOLANGCI_LINT_VERSION = v1.63.4
2631
$(BIN)/golangci-lint: ; $(info $(M) Installing golangci-lint...)
2732
@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(BIN) $(GOLANGCI_LINT_VERSION)
2833

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ This command installs the CLI and persists the configuration and packages in `$H
101101

102102
### Compile from Source
103103

104-
**Prerequisite:** Make sure you install Go 1.22 or later.
104+
**Prerequisite:** Make sure you install Go 1.23.6 or later.
105105

106106
To compile Akamai CLI from source:
107107

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/akamai/cli/v2
22

3-
go 1.22
3+
go 1.23.6
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.7
@@ -16,9 +16,9 @@ require (
1616
github.com/mitchellh/go-homedir v1.1.0
1717
github.com/stretchr/testify v1.10.0
1818
github.com/urfave/cli/v2 v2.19.3
19-
golang.org/x/net v0.34.0
20-
golang.org/x/sys v0.29.0
21-
golang.org/x/text v0.21.0
19+
golang.org/x/net v0.38.0
20+
golang.org/x/sys v0.31.0
21+
golang.org/x/text v0.23.0
2222
)
2323

2424
require (
@@ -45,10 +45,10 @@ require (
4545
github.com/stretchr/objx v0.5.2 // indirect
4646
github.com/xanzy/ssh-agent v0.3.3 // indirect
4747
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
48-
golang.org/x/crypto v0.32.0 // indirect
48+
golang.org/x/crypto v0.36.0 // indirect
4949
golang.org/x/mod v0.17.0 // indirect
50-
golang.org/x/sync v0.10.0 // indirect
51-
golang.org/x/term v0.28.0 // indirect
50+
golang.org/x/sync v0.12.0 // indirect
51+
golang.org/x/term v0.30.0 // indirect
5252
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
5353
gopkg.in/warnings.v0 v0.1.2 // indirect
5454
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t
115115
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
116116
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
117117
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
118-
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
119-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
118+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
119+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
120120
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
121121
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
122122
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -126,12 +126,12 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
126126
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
127127
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
128128
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
129-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
130-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
129+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
130+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
131131
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
132132
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
133-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
134-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
133+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
134+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
135135
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
136136
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
137137
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -144,19 +144,19 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
144144
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
145145
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
146146
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
147-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
148-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
147+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
148+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
149149
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
150150
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
151-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
152-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
151+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
152+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
153153
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
154154
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
155155
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
156156
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
157157
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
158-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
159-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
158+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
159+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
160160
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
161161
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
162162
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

pkg/commands/command_config.go

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,24 @@ func cmdConfigSet(c *cli.Context) (e error) {
3535
if e == nil {
3636
logger.Debug(fmt.Sprintf("CONFIG SET FINISH: %v", time.Since(start)))
3737
} else {
38-
logger.Error(fmt.Sprintf("CONFIG SET ERROR: %v", e.Error()))
38+
logger.Error(fmt.Sprintf("CONFIG SET ERROR: %v", e))
3939
}
4040
}()
4141
cfg := config.Get(c.Context)
42+
4243
section, key, err := parseConfigPath(c)
4344
if err != nil {
44-
return cli.Exit(color.RedString("Unable to set config value: %s", err), 1)
45+
logger.Error(fmt.Sprintf("Error parsing config path: %v", err))
46+
return cli.Exit(color.RedString("Unable to set config value: %v", err), 1)
4547
}
48+
4649
value := strings.Join(c.Args().Tail(), " ")
4750
cfg.SetValue(section, key, value)
4851
if err := cfg.Save(c.Context); err != nil {
49-
return cli.Exit(color.RedString("Unable to set config value: %s", err), 1)
52+
logger.Error(fmt.Sprintf("Error saving config: %v", err))
53+
return cli.Exit(color.RedString("Unable to set config value: %v", err), 1)
5054
}
55+
5156
return nil
5257
}
5358

@@ -60,19 +65,23 @@ func cmdConfigGet(c *cli.Context) (e error) {
6065
if e == nil {
6166
logger.Debug(fmt.Sprintf("CONFIG GET FINISH: %v", time.Since(start)))
6267
} else {
63-
logger.Error(fmt.Sprintf("CONFIG GET ERROR: %v", e.Error()))
68+
logger.Error(fmt.Sprintf("CONFIG GET ERROR: %v", e))
6469
}
6570
}()
6671
cfg := config.Get(c.Context)
72+
6773
section, key, err := parseConfigPath(c)
6874
if err != nil {
69-
return cli.Exit(color.RedString("Unable to get config value: %s", err), 1)
75+
logger.Error(fmt.Sprintf("Error parsing config path: %v", err))
76+
return cli.Exit(color.RedString("Unable to get config value: %v", err), 1)
7077
}
78+
7179
val, _ := cfg.GetValue(section, key)
7280
if _, err := terminal.Get(c.Context).Writeln(val); err != nil {
7381
return err
7482
}
7583
logger.Debug(val)
84+
7685
return nil
7786
}
7887

@@ -85,18 +94,20 @@ func cmdConfigUnset(c *cli.Context) (e error) {
8594
if e == nil {
8695
logger.Debug(fmt.Sprintf("CONFIG UNSET FINISH: %v", time.Since(start)))
8796
} else {
88-
logger.Error(fmt.Sprintf("CONFIG UNSET ERROR: %v", e.Error()))
97+
logger.Error(fmt.Sprintf("CONFIG UNSET ERROR: %v", e))
8998
}
9099
}()
91100
cfg := config.Get(c.Context)
92101
section, key, err := parseConfigPath(c)
93102
if err != nil {
94-
return cli.Exit(color.RedString("Unable to unset config value: %s", err), 1)
103+
logger.Error(fmt.Sprintf("Error parsing config path: %v", err))
104+
return cli.Exit(color.RedString("Unable to unset config value: %v", err), 1)
95105
}
96106

97107
cfg.UnsetValue(section, key)
98108
if err := cfg.Save(c.Context); err != nil {
99-
return cli.Exit(color.RedString("Unable to set config value: %s", err), 1)
109+
logger.Error(fmt.Sprintf("Error saving config: %v", err))
110+
return cli.Exit(color.RedString("Unable to set config value: %v", err), 1)
100111
}
101112
return nil
102113
}
@@ -110,7 +121,7 @@ func cmdConfigList(c *cli.Context) (e error) {
110121
if e == nil {
111122
logger.Debug(fmt.Sprintf("CONFIG LIST FINISH: %v", time.Since(start)))
112123
} else {
113-
logger.Error(fmt.Sprintf("CONFIG LIST ERROR: %v", e.Error()))
124+
logger.Error(fmt.Sprintf("CONFIG LIST ERROR: %v", e))
114125
}
115126
}()
116127
cfg := config.Get(c.Context)

0 commit comments

Comments
 (0)