fix: set URLs correctly when customizing the port

Author: dbarrosop

dockercompose/auth.go

@@ -32,8 +32,12 @@ func auth( //nolint:funlen
 	httpPort uint,
 	useTLS bool,
 	nhostFolder string,
-	port uint,
+	exposePort uint,
 ) (*Service, error) {
+	if exposePort != 0 {
+		httpPort = exposePort
+	}
+
 	envars, err := appconfig.HasuraAuthEnv(
 		cfg,
 		"http://graphql:8080/v1/graphql",
@@ -94,7 +98,7 @@ func auth( //nolint:funlen
 				},
 			},
 		}.Labels(),
-		Ports:   ports(port, authPort),
+		Ports:   ports(exposePort, authPort),
 		Restart: "always",
 		Volumes: []Volume{
 			{

dockercompose/auth_test.go

@@ -207,16 +207,18 @@ func TestAuth(t *testing.T) {
 	t.Parallel()
 
 	cases := []struct {
-		name     string
-		cfg      func() *model.ConfigConfig
-		useTlS   bool
-		expected func() *Service
+		name       string
+		cfg        func() *model.ConfigConfig
+		useTlS     bool
+		exposePort uint
+		expected   func() *Service
 	}{
 		{
-			name:     "default",
-			cfg:      getConfig,
-			useTlS:   false,
-			expected: expectedAuth,
+			name:       "default",
+			cfg:        getConfig,
+			useTlS:     false,
+			exposePort: 0,
+			expected:   expectedAuth,
 		},
 		{
 			name: "pre-0.22.0",
@@ -225,7 +227,8 @@ func TestAuth(t *testing.T) {
 				cfg.Auth.Version = ptr("0.21.3")
 				return cfg
 			},
-			useTlS: false,
+			useTlS:     false,
+			exposePort: 0,
 			expected: func() *Service {
 				svc := expectedAuth()
 				svc.Image = "nhost/hasura-auth:0.21.3"
@@ -237,13 +240,34 @@ func TestAuth(t *testing.T) {
 				return svc
 			},
 		},
+		{
+			name:       "custom port",
+			cfg:        getConfig,
+			useTlS:     false,
+			exposePort: 8080,
+			expected: func() *Service {
+				svc := expectedAuth()
+
+				svc.Environment["AUTH_SERVER_URL"] = "http://dev.auth.local.nhost.run:8080/v1"
+				svc.Ports = []Port{
+					{
+						Mode:      "ingress",
+						Target:    4000,
+						Published: "8080",
+						Protocol:  "tcp",
+					},
+				}
+
+				return svc
+			},
+		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			got, err := auth(tc.cfg(), "dev", 1336, tc.useTlS, "/tmp/nhost", 0)
+			got, err := auth(tc.cfg(), "dev", 1336, tc.useTlS, "/tmp/nhost", tc.exposePort)
 			if err != nil {
 				t.Errorf("got error: %v", err)
 			}

dockercompose/storage.go

@@ -22,6 +22,10 @@ func storage( //nolint:funlen
 	httpPort uint,
 	exposePort uint,
 ) (*Service, error) {
+	if exposePort != 0 {
+		httpPort = exposePort
+	}
+
 	envars, err := appconfig.HasuraStorageEnv(
 		cfg,
 		"http://graphql:8080/v1",

dockercompose/storage_test.go

@@ -68,24 +68,47 @@ func TestStorage(t *testing.T) {
 	t.Parallel()
 
 	cases := []struct {
-		name     string
-		cfg      func() *model.ConfigConfig
-		useTlS   bool
-		expected func() *Service
+		name       string
+		cfg        func() *model.ConfigConfig
+		useTlS     bool
+		exposePort uint
+		expected   func() *Service
 	}{
 		{
-			name:     "success",
-			cfg:      getConfig,
-			useTlS:   false,
-			expected: expectedStorage,
+			name:       "success",
+			cfg:        getConfig,
+			useTlS:     false,
+			exposePort: 0,
+			expected:   expectedStorage,
+		},
+		{
+			name:       "custom port",
+			cfg:        getConfig,
+			useTlS:     false,
+			exposePort: 8080,
+			expected: func() *Service {
+				svc := expectedStorage()
+				svc.Environment["PUBLIC_URL"] = "http://dev.storage.local.nhost.run:8080"
+
+				svc.Ports = []Port{
+					{
+						Mode:      "ingress",
+						Target:    5000,
+						Published: "8080",
+						Protocol:  "tcp",
+					},
+				}
+
+				return svc
+			},
 		},
 	}
 
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			got, err := storage(tc.cfg(), "dev", tc.useTlS, 444, 0)
+			got, err := storage(tc.cfg(), "dev", tc.useTlS, 444, tc.exposePort)
 			if err != nil {
 				t.Errorf("got error: %v", err)
 			}