Merge branch 'main' into main

commands/billing_history_test.go

@@ -28,8 +28,8 @@ var testBillingHistoryList = &do.BillingHistory{
 			{
 				Description: "Invoice for May 2018",
 				Amount:      "12.34",
-				InvoiceID:   godo.String("123"),
-				InvoiceUUID: godo.String("example-uuid"),
+				InvoiceID:   godo.PtrTo("123"),
+				InvoiceUUID: godo.PtrTo("example-uuid"),
 				Date:        time.Date(2018, 6, 1, 8, 44, 38, 0, time.UTC),
 				Type:        "Invoice",
 			},

commands/displayers/database.go

@@ -333,19 +333,22 @@ func (do *DatabaseOptions) ColMap() map[string]string {
 
 func (do *DatabaseOptions) KV() []map[string]interface{} {
 	engines := make([]string, 0)
-	if &do.DatabaseOptions.MongoDBOptions != nil {
+	nonEmptyOptionsFn := func(opt godo.DatabaseEngineOptions) bool {
+		return len(opt.Layouts) > 0 || len(opt.Regions) > 0 || len(opt.Versions) > 0
+	}
+	if nonEmptyOptionsFn(do.DatabaseOptions.MongoDBOptions) {
 		engines = append(engines, "mongodb")
 	}
-	if &do.DatabaseOptions.RedisOptions != nil {
+	if nonEmptyOptionsFn(do.DatabaseOptions.RedisOptions) {
 		engines = append(engines, "redis")
 	}
-	if &do.DatabaseOptions.MySQLOptions != nil {
+	if nonEmptyOptionsFn(do.DatabaseOptions.MySQLOptions) {
 		engines = append(engines, "mysql")
 	}
-	if &do.DatabaseOptions.PostgresSQLOptions != nil {
+	if nonEmptyOptionsFn(do.DatabaseOptions.PostgresSQLOptions) {
 		engines = append(engines, "pg")
 	}
-	if &do.DatabaseOptions.KafkaOptions != nil {
+	if nonEmptyOptionsFn(do.DatabaseOptions.KafkaOptions) {
 		engines = append(engines, "kafka")
 	}
 

commands/registry.go

@@ -405,10 +405,10 @@ func RunRegistryLogin(c *CmdConfig) error {
 
 	regCredReq := godo.RegistryDockerCredentialsRequest{
 		ReadWrite:     !readOnly,
-		ExpirySeconds: godo.Int(defaultRegistryAPITokenExpirySeconds),
+		ExpirySeconds: godo.PtrTo(defaultRegistryAPITokenExpirySeconds),
 	}
 	if expirySeconds != 0 {
-		regCredReq.ExpirySeconds = godo.Int(expirySeconds)
+		regCredReq.ExpirySeconds = godo.PtrTo(expirySeconds)
 	}
 	if neverExpire {
 		regCredReq.ExpirySeconds = nil
@@ -548,7 +548,7 @@ func RunDockerConfig(c *CmdConfig) error {
 		ReadWrite: readWrite,
 	}
 	if expirySeconds != 0 {
-		regCredReq.ExpirySeconds = godo.Int(expirySeconds)
+		regCredReq.ExpirySeconds = godo.PtrTo(expirySeconds)
 	}
 
 	dockerCreds, err := c.Registry().DockerCredentials(&regCredReq)

commands/registry_test.go

@@ -247,7 +247,7 @@ func TestDockerConfig(t *testing.T) {
 			expect: func(m *mocks.MockRegistryService) {
 				m.EXPECT().DockerCredentials(&godo.RegistryDockerCredentialsRequest{
 					ReadWrite:     false,
-					ExpirySeconds: godo.Int(3600),
+					ExpirySeconds: godo.PtrTo(3600),
 				}).Return(testDockerCredentials, nil)
 			},
 		},
@@ -258,7 +258,7 @@ func TestDockerConfig(t *testing.T) {
 			expect: func(m *mocks.MockRegistryService) {
 				m.EXPECT().DockerCredentials(&godo.RegistryDockerCredentialsRequest{
 					ReadWrite:     true,
-					ExpirySeconds: godo.Int(3600),
+					ExpirySeconds: godo.PtrTo(3600),
 				}).Return(testDockerCredentials, nil)
 			},
 		},
@@ -662,7 +662,7 @@ func TestRegistryLogin(t *testing.T) {
 				m.EXPECT().Endpoint().Return(do.RegistryHostname)
 				m.EXPECT().DockerCredentials(&godo.RegistryDockerCredentialsRequest{
 					ReadWrite:     true,
-					ExpirySeconds: godo.Int(3600),
+					ExpirySeconds: godo.PtrTo(3600),
 				}).Return(testDockerCredentials, nil)
 			},
 		},
@@ -674,7 +674,7 @@ func TestRegistryLogin(t *testing.T) {
 				m.EXPECT().Endpoint().Return(do.RegistryHostname)
 				m.EXPECT().DockerCredentials(&godo.RegistryDockerCredentialsRequest{
 					ReadWrite:     false,
-					ExpirySeconds: godo.Int(defaultRegistryAPITokenExpirySeconds),
+					ExpirySeconds: godo.PtrTo(defaultRegistryAPITokenExpirySeconds),
 				}).Return(testDockerCredentials, nil)
 			},
 		},

go.mod

@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/creack/pty v1.1.11
-	github.com/digitalocean/godo v1.103.0
+	github.com/digitalocean/godo v1.104.0
 	github.com/docker/cli v24.0.5+incompatible
 	github.com/docker/docker v24.0.5+incompatible
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect

go.sum

@@ -103,8 +103,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/digitalocean/godo v1.103.0 h1:ynhlulyoBN+VvQ/yquIsh93DlY3lZxmcwgiw3XrsAyQ=
-github.com/digitalocean/godo v1.103.0/go.mod h1:rUTTOeu4ozN+i3BnyQasMpDyhIVIefANbc4dYe6v6N0=
+github.com/digitalocean/godo v1.104.0 h1:bIOKADMS9hKn/qqgbquCmCAUIrZ5dkthdyy9MsdPx8E=
+github.com/digitalocean/godo v1.104.0/go.mod h1:rUTTOeu4ozN+i3BnyQasMpDyhIVIefANbc4dYe6v6N0=
 github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc=
 github.com/docker/cli v24.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=

vendor/modules.txt

@@ -55,7 +55,7 @@ github.com/creack/pty
 # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 ## explicit
 github.com/davecgh/go-spew/spew
-# github.com/digitalocean/godo v1.103.0
+# github.com/digitalocean/godo v1.104.0
 ## explicit; go 1.21
 github.com/digitalocean/godo
 github.com/digitalocean/godo/metrics