app: resolve port :9000 conflicts (change to :49000)

cmd/blobstore/shared/shared.go

@@ -18,16 +18,14 @@ import (
 	"github.com/sourcegraph/sourcegraph/cmd/blobstore/internal/blobstore"
 	"github.com/sourcegraph/sourcegraph/internal/actor"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
-	"github.com/sourcegraph/sourcegraph/internal/env"
+	"github.com/sourcegraph/sourcegraph/internal/conf/deploy"
 	"github.com/sourcegraph/sourcegraph/internal/goroutine"
 	"github.com/sourcegraph/sourcegraph/internal/instrumentation"
 	"github.com/sourcegraph/sourcegraph/internal/observation"
 	"github.com/sourcegraph/sourcegraph/internal/service"
 	"github.com/sourcegraph/sourcegraph/internal/trace"
 )
 
-const port = "9000"
-
 func shutdownOnSignal(ctx context.Context, server *http.Server) error {
 	// Listen for shutdown signals. When we receive one attempt to clean up,
 	// but do an insta-shutdown if we receive more than one signal.
@@ -75,10 +73,7 @@ func Start(ctx context.Context, observationCtx *observation.Context, config *Con
 	defer cancel()
 	g, ctx := errgroup.WithContext(ctx)
 
-	host := ""
-	if env.InsecureDev {
-		host = "127.0.0.1"
-	}
+	host, port := deploy.BlobstoreHostPort()
 	addr := net.JoinHostPort(host, port)
 	server := &http.Server{
 		ReadTimeout:  75 * time.Second,

cmd/server/shared/blobstore.go

@@ -5,6 +5,8 @@ import (
 	"path/filepath"
 
 	sglog "github.com/sourcegraph/log"
+
+	"github.com/sourcegraph/sourcegraph/internal/conf/deploy"
 )
 
 func maybeBlobstore(logger sglog.Logger) []string {
@@ -14,7 +16,7 @@ func maybeBlobstore(logger sglog.Logger) []string {
 	}
 
 	// Point at local blobstore endpoint.
-	SetDefaultEnv("PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT", "http://127.0.0.1:9000")
+	SetDefaultEnv("PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT", deploy.BlobstoreDefaultEndpoint())
 	SetDefaultEnv("PRECISE_CODE_INTEL_UPLOAD_BACKEND", "blobstore")
 
 	// cmd/server-specific blobstore env vars

enterprise/internal/codeintel/shared/lsifuploadstore/config.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/sourcegraph/sourcegraph/internal/conf/deploy"
 	"github.com/sourcegraph/sourcegraph/internal/env"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
@@ -40,7 +41,7 @@ func (c *Config) Load() {
 
 	if c.Backend == "blobstore" || c.Backend == "s3" {
 		c.S3Region = c.Get("PRECISE_CODE_INTEL_UPLOAD_AWS_REGION", "us-east-1", "The target AWS region.")
-		c.S3Endpoint = c.Get("PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT", "http://blobstore:9000", "The target AWS endpoint.")
+		c.S3Endpoint = c.Get("PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT", deploy.BlobstoreDefaultEndpoint(), "The target AWS endpoint.")
 		c.S3UsePathStyle = c.GetBool("PRECISE_CODE_INTEL_UPLOAD_AWS_USE_PATH_STYLE", "false", "Whether to use path calling (vs subdomain calling).")
 		ec2RoleCredentials := c.GetBool("PRECISE_CODE_INTEL_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS", "false", "Whether to use the EC2 metadata API, or use the provided static credentials.")
 

enterprise/internal/embeddings/uploadstore.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 
+	"github.com/sourcegraph/sourcegraph/internal/conf/deploy"
 	"github.com/sourcegraph/sourcegraph/internal/env"
 	"github.com/sourcegraph/sourcegraph/internal/observation"
 	"github.com/sourcegraph/sourcegraph/internal/uploadstore"
@@ -41,7 +42,7 @@ func (c *EmbeddingsUploadStoreConfig) Load() {
 
 	if c.Backend == "blobstore" || c.Backend == "s3" {
 		c.S3Region = c.Get("EMBEDDINGS_UPLOAD_AWS_REGION", "us-east-1", "The target AWS region.")
-		c.S3Endpoint = c.Get("EMBEDDINGS_UPLOAD_AWS_ENDPOINT", "http://blobstore:9000", "The target AWS endpoint.")
+		c.S3Endpoint = c.Get("EMBEDDINGS_UPLOAD_AWS_ENDPOINT", deploy.BlobstoreDefaultEndpoint(), "The target AWS endpoint.")
 		c.S3UsePathStyle = c.GetBool("EMBEDDINGS_UPLOAD_AWS_USE_PATH_STYLE", "false", "Whether to use path calling (vs subdomain calling).")
 		ec2RoleCredentials := c.GetBool("EMBEDDINGS_UPLOAD_AWS_USE_EC2_ROLE_CREDENTIALS", "false", "Whether to use the EC2 metadata API, or use the provided static credentials.")
 

internal/conf/deploy/endpoints.go

@@ -0,0 +1,28 @@
+package deploy
+
+import (
+	"github.com/sourcegraph/sourcegraph/internal/env"
+)
+
+// BlobstoreEndpoint returns the default blobstore endpoint that should be used for this deployment
+// type.
+func BlobstoreDefaultEndpoint() string {
+	if IsApp() {
+		return "http://127.0.0.1:49000"
+	}
+	if IsSingleBinary() {
+		return "http://127.0.0.1:9000"
+	}
+	return "http://blobstore:9000"
+}
+
+// BlobstoreHostPort returns the host/port that should be listened on for this deployment type.
+func BlobstoreHostPort() (string, string) {
+	if IsApp() {
+		return "127.0.0.1", "49000"
+	}
+	if env.InsecureDev || IsSingleBinary() {
+		return "127.0.0.1", "9000"
+	}
+	return "", "9000"
+}

internal/singleprogram/singleprogram.go

@@ -52,7 +52,7 @@ func Init(logger log.Logger) CleanupFunc {
 
 	setDefaultEnv(logger, "SYMBOLS_URL", "http://127.0.0.1:3184")
 	setDefaultEnv(logger, "SEARCHER_URL", "http://127.0.0.1:3181")
-	setDefaultEnv(logger, "BLOBSTORE_URL", "http://127.0.0.1:9000")
+	setDefaultEnv(logger, "BLOBSTORE_URL", deploy.BlobstoreDefaultEndpoint())
 	setDefaultEnv(logger, "EMBEDDINGS_URL", "http://127.0.0.1:9991")
 
 	// The syntax-highlighter might not be running, but this is a better default than an internal
@@ -69,9 +69,9 @@ func Init(logger log.Logger) CleanupFunc {
 	// setDefaultEnv(logger, "JAEGER_SERVER_URL", "http://localhost:16686")
 
 	// Use blobstore on localhost.
-	setDefaultEnv(logger, "PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT", "http://localhost:9000")
+	setDefaultEnv(logger, "PRECISE_CODE_INTEL_UPLOAD_AWS_ENDPOINT", deploy.BlobstoreDefaultEndpoint())
 	setDefaultEnv(logger, "PRECISE_CODE_INTEL_UPLOAD_BACKEND", "blobstore")
-	setDefaultEnv(logger, "EMBEDDINGS_UPLOAD_AWS_ENDPOINT", "http://localhost:9000")
+	setDefaultEnv(logger, "EMBEDDINGS_UPLOAD_AWS_ENDPOINT", deploy.BlobstoreDefaultEndpoint())
 
 	// Need to override this because without a host (eg ":3080") it listens only on localhost, which
 	// is not accessible from the containers