Skip to content

Commit c371406

Browse files
deprecate region from nfs apis (#1800)
1 parent a4a6b31 commit c371406

File tree

9 files changed

+25
-79
lines changed

9 files changed

+25
-79
lines changed

commands/nfs.go

Lines changed: 10 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,7 @@ func nfsGet(c *CmdConfig) error {
180180
if err != nil {
181181
return err
182182
}
183-
184-
region, err := c.Doit.GetString(c.NS, "region")
185-
if err != nil {
186-
return err
187-
}
188-
183+
region, _ := c.Doit.GetString(c.NS, "region")
189184
share, err := c.Nfs().Get(id, region)
190185
if err != nil {
191186
return err
@@ -195,11 +190,7 @@ func nfsGet(c *CmdConfig) error {
195190
}
196191

197192
func nfsList(c *CmdConfig) error {
198-
region, err := c.Doit.GetString(c.NS, "region")
199-
if err != nil {
200-
return err
201-
}
202-
193+
region, _ := c.Doit.GetString(c.NS, "region")
203194
shares, err := c.Nfs().List(region)
204195
if err != nil {
205196
return err
@@ -214,10 +205,7 @@ func nfsDelete(c *CmdConfig) error {
214205
return err
215206
}
216207

217-
region, err := c.Doit.GetString(c.NS, "region")
218-
if err != nil {
219-
return err
220-
}
208+
region, _ := c.Doit.GetString(c.NS, "region")
221209

222210
err = c.Nfs().Delete(id, region)
223211
if err != nil {
@@ -238,10 +226,7 @@ func nfsSnapshotCreate(c *CmdConfig) error {
238226
return err
239227
}
240228

241-
region, err := c.Doit.GetString(c.NS, "region")
242-
if err != nil {
243-
return err
244-
}
229+
region, _ := c.Doit.GetString(c.NS, "region")
245230

246231
action, err := c.NfsActions().Snapshot(shareID, name, region)
247232
if err != nil {
@@ -265,10 +250,7 @@ func nfsSnapshotCreate(c *CmdConfig) error {
265250
}
266251

267252
func nfsSnapshotList(c *CmdConfig) error {
268-
region, err := c.Doit.GetString(c.NS, "region")
269-
if err != nil {
270-
return err
271-
}
253+
region, _ := c.Doit.GetString(c.NS, "region")
272254

273255
shareId, _ := c.Doit.GetString(c.NS, "share-id")
274256

@@ -286,10 +268,7 @@ func nfsSnapshotGet(c *CmdConfig) error {
286268
return err
287269
}
288270

289-
region, err := c.Doit.GetString(c.NS, "region")
290-
if err != nil {
291-
return err
292-
}
271+
region, _ := c.Doit.GetString(c.NS, "region")
293272

294273
snapshot, err := c.Nfs().GetSnapshot(id, region)
295274
if err != nil {
@@ -305,10 +284,7 @@ func nfsSnapshotDelete(c *CmdConfig) error {
305284
return err
306285
}
307286

308-
region, err := c.Doit.GetString(c.NS, "region")
309-
if err != nil {
310-
return err
311-
}
287+
region, _ := c.Doit.GetString(c.NS, "region")
312288

313289
err = c.Nfs().DeleteSnapshot(id, region)
314290
if err != nil {
@@ -324,10 +300,7 @@ func nfsResize(c *CmdConfig) error {
324300
return err
325301
}
326302

327-
region, err := c.Doit.GetString(c.NS, "region")
328-
if err != nil {
329-
return err
330-
}
303+
region, _ := c.Doit.GetString(c.NS, "region")
331304

332305
sizeStr, err := c.Doit.GetString(c.NS, "size")
333306
if err != nil {
@@ -366,10 +339,7 @@ func nfsAttach(c *CmdConfig) error {
366339
return err
367340
}
368341

369-
region, err := c.Doit.GetString(c.NS, "region")
370-
if err != nil {
371-
return err
372-
}
342+
region, _ := c.Doit.GetString(c.NS, "region")
373343

374344
vpcIdStr, err := c.Doit.GetString(c.NS, "vpc_id")
375345
if err != nil {
@@ -403,11 +373,7 @@ func nfsDetach(c *CmdConfig) error {
403373
return err
404374
}
405375

406-
region, err := c.Doit.GetString(c.NS, "region")
407-
if err != nil {
408-
return err
409-
}
410-
376+
region, _ := c.Doit.GetString(c.NS, "region")
411377
vpcIdStr, err := c.Doit.GetString(c.NS, "vpc_id")
412378
if err != nil {
413379
return err

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.24
55
require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/creack/pty v1.1.21
8-
github.com/digitalocean/godo v1.172.0
8+
github.com/digitalocean/godo v1.173.0
99
github.com/docker/cli v24.0.5+incompatible
1010
github.com/docker/docker v25.0.6+incompatible
1111
github.com/docker/docker-credential-helpers v0.7.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
9191
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9292
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
9393
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
94-
github.com/digitalocean/godo v1.172.0 h1:7AYPfmCUlScyoQJF+3rVw17HR3V1+ogf2qmf2SND/DI=
95-
github.com/digitalocean/godo v1.172.0/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU=
94+
github.com/digitalocean/godo v1.173.0 h1:tgzevGhlz9VFjk2y3NmeItUT4vIVVCRFETlG/1GlEQI=
95+
github.com/digitalocean/godo v1.173.0/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU=
9696
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
9797
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
9898
github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc=

vendor/github.com/digitalocean/godo/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/digitalocean/godo/godo.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/digitalocean/godo/gradientai.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/digitalocean/godo/nfs.go

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/digitalocean/godo/nfs_actions.go

Lines changed: 4 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ github.com/creack/pty
6161
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
6262
## explicit
6363
github.com/davecgh/go-spew/spew
64-
# github.com/digitalocean/godo v1.172.0
64+
# github.com/digitalocean/godo v1.173.0
6565
## explicit; go 1.23.0
6666
github.com/digitalocean/godo
6767
github.com/digitalocean/godo/metrics

0 commit comments

Comments
 (0)