Bump godo to v1.189.0 to fix App Ingress authority empty-string matching (#1782) (#1839)

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: aupadhyay-shark

commands/apps_test.go

@@ -955,6 +955,289 @@ services:
 	})
 }
 
+func TestRunAppSpecGet_AuthoritySerialization(t *testing.T) {
+	exactEmpty := ""
+	exactDomain := "example.com"
+	pathPrefixSlash := "/"
+	pathPrefixEmpty := ""
+
+	tests := []struct {
+		name       string
+		exact      *string
+		pathPrefix *string // nil means use "/"
+		wantJSON   string
+		wantYAML   string
+	}{
+		{
+			name:       "authority with empty exact string",
+			exact:      &exactEmpty,
+			pathPrefix: nil,
+			wantJSON: `{
+  "name": "test",
+  "services": [
+    {
+      "name": "service",
+      "github": {
+        "repo": "digitalocean/doctl",
+        "branch": "main"
+      }
+    }
+  ],
+  "ingress": {
+    "rules": [
+      {
+        "match": {
+          "path": {
+            "prefix": "/"
+          },
+          "authority": {
+            "exact": ""
+          }
+        },
+        "component": {
+          "name": "service"
+        }
+      }
+    ]
+  }
+}
+`,
+			wantYAML: `ingress:
+  rules:
+  - component:
+      name: service
+    match:
+      authority:
+        exact: ""
+      path:
+        prefix: /
+name: test
+services:
+- github:
+    branch: main
+    repo: digitalocean/doctl
+  name: service
+`,
+		},
+		{
+			name:       "authority with non-empty exact string",
+			exact:      &exactDomain,
+			pathPrefix: nil,
+			wantJSON: `{
+  "name": "test",
+  "services": [
+    {
+      "name": "service",
+      "github": {
+        "repo": "digitalocean/doctl",
+        "branch": "main"
+      }
+    }
+  ],
+  "ingress": {
+    "rules": [
+      {
+        "match": {
+          "path": {
+            "prefix": "/"
+          },
+          "authority": {
+            "exact": "example.com"
+          }
+        },
+        "component": {
+          "name": "service"
+        }
+      }
+    ]
+  }
+}
+`,
+			wantYAML: `ingress:
+  rules:
+  - component:
+      name: service
+    match:
+      authority:
+        exact: example.com
+      path:
+        prefix: /
+name: test
+services:
+- github:
+    branch: main
+    repo: digitalocean/doctl
+  name: service
+`,
+		},
+		{
+			name:       "no authority set",
+			exact:      nil,
+			pathPrefix: nil,
+			wantJSON: `{
+  "name": "test",
+  "services": [
+    {
+      "name": "service",
+      "github": {
+        "repo": "digitalocean/doctl",
+        "branch": "main"
+      }
+    }
+  ],
+  "ingress": {
+    "rules": [
+      {
+        "match": {
+          "path": {
+            "prefix": "/"
+          }
+        },
+        "component": {
+          "name": "service"
+        }
+      }
+    ]
+  }
+}
+`,
+			wantYAML: `ingress:
+  rules:
+  - component:
+      name: service
+    match:
+      path:
+        prefix: /
+name: test
+services:
+- github:
+    branch: main
+    repo: digitalocean/doctl
+  name: service
+`,
+		},
+		{
+			name:       "authority with empty exact string and empty path prefix",
+			exact:      &exactEmpty,
+			pathPrefix: &pathPrefixEmpty,
+			wantJSON: `{
+  "name": "test",
+  "services": [
+    {
+      "name": "service",
+      "github": {
+        "repo": "digitalocean/doctl",
+        "branch": "main"
+      }
+    }
+  ],
+  "ingress": {
+    "rules": [
+      {
+        "match": {
+          "path": {
+            "prefix": ""
+          },
+          "authority": {
+            "exact": ""
+          }
+        },
+        "component": {
+          "name": "service"
+        }
+      }
+    ]
+  }
+}
+`,
+			wantYAML: `ingress:
+  rules:
+  - component:
+      name: service
+    match:
+      authority:
+        exact: ""
+      path:
+        prefix: ""
+name: test
+services:
+- github:
+    branch: main
+    repo: digitalocean/doctl
+  name: service
+`,
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
+				var authority *godo.AppIngressSpecRuleStringMatch
+				if tc.exact != nil {
+					authority = &godo.AppIngressSpecRuleStringMatch{Exact: tc.exact}
+				}
+
+				pathForMatch := &pathPrefixSlash
+				if tc.pathPrefix != nil {
+					pathForMatch = tc.pathPrefix
+				}
+
+				spec := &godo.AppSpec{
+					Name: "test",
+					Services: []*godo.AppServiceSpec{
+						{
+							Name: "service",
+							GitHub: &godo.GitHubSourceSpec{
+								Repo:   "digitalocean/doctl",
+								Branch: "main",
+							},
+						},
+					},
+					Ingress: &godo.AppIngressSpec{
+						Rules: []*godo.AppIngressSpecRule{
+							{
+								Match: &godo.AppIngressSpecRuleMatch{
+									Path:      &godo.AppIngressSpecRuleStringMatch{Prefix: pathForMatch},
+									Authority: authority,
+								},
+								Component: &godo.AppIngressSpecRuleRoutingComponent{Name: "service"},
+							},
+						},
+					},
+				}
+
+				app := &godo.App{
+					ID:   uuid.New().String(),
+					Spec: spec,
+				}
+
+				tm.apps.EXPECT().Get(app.ID).Times(2).Return(app, nil)
+
+				t.Run("json", func(t *testing.T) {
+					var buf bytes.Buffer
+					config.Doit.Set(config.NS, doctl.ArgFormat, "json")
+					config.Args = append(config.Args, app.ID)
+					config.Out = &buf
+
+					err := RunAppsSpecGet(config)
+					require.NoError(t, err)
+					require.Equal(t, tc.wantJSON, buf.String())
+				})
+
+				t.Run("yaml", func(t *testing.T) {
+					var buf bytes.Buffer
+					config.Doit.Set(config.NS, doctl.ArgFormat, "yaml")
+					config.Args = append(config.Args, app.ID)
+					config.Out = &buf
+
+					err := RunAppsSpecGet(config)
+					require.NoError(t, err)
+					require.Equal(t, tc.wantYAML, buf.String())
+				})
+			})
+		})
+	}
+}
 func TestRunAppsListRegions(t *testing.T) {
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
 		regions := []*godo.AppRegion{{

go.mod

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

go.sum

@@ -91,8 +91,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.187.0 h1:Ga+pkJdebdhnzWmIjusyehDzm+WZ/joLiXM00tPOXVs=
-github.com/digitalocean/godo v1.187.0/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU=
+github.com/digitalocean/godo v1.189.0 h1:93hHWsZdbJdkMsfZ21lMkOmd+BPMCTzu/+FIJ5FvAL4=
+github.com/digitalocean/godo v1.189.0/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc=