Move cody packages only used by frontend into cmd/frontend (#62311)

The httpapi package for completions APIs and the internal/cody package are only used in frontend, so moving them there.

This cleans up the massive /internal package a bit, and is part of a larger effort to make less calls to conf.Get() inside /internal, because those are hard to trace down and can potentially brick services like cody-gateway when they are ever in any call paths.

Test plan:

Just moved code around, and the go compiler doesn't complain.

Author: eseliger

cmd/frontend/graphqlbackend/BUILD.bazel

@@ -238,9 +238,11 @@ go_library(
         "//cmd/frontend/hubspot",
         "//cmd/frontend/hubspot/hubspotutil",
         "//cmd/frontend/internal/cloneurls",
+        "//cmd/frontend/internal/cody",
         "//cmd/frontend/internal/inventory",
         "//cmd/frontend/internal/processrestart",
         "//cmd/frontend/internal/search/logs",
+        "//cmd/frontend/internal/ssc",
         "//internal/actor",
         "//internal/adminanalytics",
         "//internal/api",
@@ -254,7 +256,6 @@ go_library(
         "//internal/codeintel/dependencies",
         "//internal/codeintel/dependencies/shared",
         "//internal/codeintel/resolvers",
-        "//internal/cody",
         "//internal/codygateway",
         "//internal/conf",
         "//internal/conf/conftypes",
@@ -323,7 +324,6 @@ go_library(
         "//internal/siteid",
         "//internal/sourcegraphoperator",
         "//internal/src-prometheus",
-        "//internal/ssc",
         "//internal/suspiciousnames",
         "//internal/symbols",
         "//internal/temporarysettings",

cmd/frontend/graphqlbackend/external_account.go

@@ -7,14 +7,14 @@ import (
 	"github.com/graph-gophers/graphql-go"
 	"github.com/graph-gophers/graphql-go/relay"
 
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/actor"
 	"github.com/sourcegraph/sourcegraph/internal/auth"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/database"
 	"github.com/sourcegraph/sourcegraph/internal/dotcom"
 	"github.com/sourcegraph/sourcegraph/internal/extsvc"
 	"github.com/sourcegraph/sourcegraph/internal/gqlutil"
-	"github.com/sourcegraph/sourcegraph/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )
 

cmd/frontend/graphqlbackend/site.go

@@ -3,23 +3,24 @@ package graphqlbackend
 import (
 	"bytes"
 	"context"
-	"github.com/sourcegraph/sourcegraph/schema"
 	"os"
 	"strconv"
 	"strings"
 	"sync"
 
+	"github.com/sourcegraph/sourcegraph/schema"
+
 	"github.com/google/go-cmp/cmp"
 	"github.com/graph-gophers/graphql-go"
 	"github.com/graph-gophers/graphql-go/relay"
 	"github.com/sourcegraph/log"
 
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/actor"
 	"github.com/sourcegraph/sourcegraph/internal/api"
 	"github.com/sourcegraph/sourcegraph/internal/auth"
 	"github.com/sourcegraph/sourcegraph/internal/cloud"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/conf/conftypes"
 	"github.com/sourcegraph/sourcegraph/internal/database"

cmd/frontend/graphqlbackend/user.go

@@ -8,9 +8,9 @@ import (
 	"github.com/graph-gophers/graphql-go"
 	"github.com/graph-gophers/graphql-go/relay"
 
-	"github.com/sourcegraph/sourcegraph/internal/cody"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/dotcom"
-	"github.com/sourcegraph/sourcegraph/internal/ssc"
 
 	"github.com/keegancsmith/sqlf"
 	"github.com/sourcegraph/log"

cmd/frontend/internal/app/jscontext/BUILD.bazel

@@ -13,11 +13,11 @@ go_library(
         "//cmd/frontend/graphqlbackend",
         "//cmd/frontend/internal/app/assetsutil",
         "//cmd/frontend/internal/app/ui/sveltekit",
+        "//cmd/frontend/internal/cody",
         "//cmd/frontend/webhooks",
         "//internal/actor",
         "//internal/auth/providers",
         "//internal/auth/userpasswd",
-        "//internal/cody",
         "//internal/conf",
         "//internal/conf/deploy",
         "//internal/database",

cmd/frontend/internal/app/jscontext/jscontext.go

@@ -17,11 +17,11 @@ import (
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/assetsutil"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/ui/sveltekit"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/webhooks"
 	sgactor "github.com/sourcegraph/sourcegraph/internal/actor"
 	"github.com/sourcegraph/sourcegraph/internal/auth/providers"
 	"github.com/sourcegraph/sourcegraph/internal/auth/userpasswd"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/conf/deploy"
 	"github.com/sourcegraph/sourcegraph/internal/database"

internal/cody/BUILD.bazel renamed to cmd/frontend/internal/cody/BUILD.bazel

@@ -1,5 +1,5 @@
-load("//dev:go_defs.bzl", "go_test")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("//dev:go_defs.bzl", "go_test")
 
 go_library(
     name = "cody",
@@ -9,10 +9,11 @@ go_library(
         "subscription.go",
         "utils.go",
     ],
-    importpath = "github.com/sourcegraph/sourcegraph/internal/cody",
-    visibility = ["//:__subpackages__"],
+    importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody",
+    visibility = ["//cmd/frontend:__subpackages__"],
     deps = [
         "//cmd/frontend/backend",
+        "//cmd/frontend/internal/ssc",
         "//internal/accesstoken",
         "//internal/actor",
         "//internal/auth",
@@ -26,7 +27,6 @@ go_library(
         "//internal/httpcli",
         "//internal/licensing",
         "//internal/rbac",
-        "//internal/ssc",
         "//internal/types",
         "//lib/errors",
         "@com_github_sourcegraph_log//:log",
@@ -42,6 +42,7 @@ go_test(
     ],
     embed = [":cody"],
     deps = [
+        "//cmd/frontend/internal/ssc",
         "//internal/actor",
         "//internal/conf",
         "//internal/database",
@@ -51,7 +52,6 @@ go_test(
         "//internal/featureflag",
         "//internal/licensing",
         "//internal/rbac/types",
-        "//internal/ssc",
         "//internal/types",
         "//schema",
         "@com_github_stretchr_testify//assert",

internal/cody/feature_flag.go renamed to cmd/frontend/internal/cody/feature_flag.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/database"
-	"github.com/sourcegraph/sourcegraph/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/types"
 	"github.com/sourcegraph/sourcegraph/lib/errors"
 )

internal/cody/feature_flag_test.go renamed to cmd/frontend/internal/cody/feature_flag_test.go

@@ -8,11 +8,11 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/actor"
 	"github.com/sourcegraph/sourcegraph/internal/database"
 	"github.com/sourcegraph/sourcegraph/internal/database/dbmocks"
 	"github.com/sourcegraph/sourcegraph/internal/extsvc"
-	"github.com/sourcegraph/sourcegraph/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/types"
 )
 

internal/cody/rate_limits.go renamed to cmd/frontend/internal/cody/rate_limits.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/sourcegraph/sourcegraph/internal/ssc"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/types"
 )
 

internal/cody/subscription.go renamed to cmd/frontend/internal/cody/subscription.go

@@ -14,9 +14,9 @@ go_library(
     visibility = ["//cmd/frontend:__subpackages__"],
     deps = [
         "//cmd/frontend/enterprise",
+        "//cmd/frontend/internal/cody",
         "//internal/api",
         "//internal/codeintel",
-        "//internal/cody",
         "//internal/conf",
         "//internal/conf/conftypes",
         "//internal/database",

internal/cody/subscription_test.go renamed to cmd/frontend/internal/cody/subscription_test.go

@@ -11,8 +11,8 @@ import (
 	"github.com/sourcegraph/log"
 	"go.opentelemetry.io/otel/attribute"
 
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/api"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/database"
 	"github.com/sourcegraph/sourcegraph/internal/embeddings"

internal/cody/utils.go renamed to cmd/frontend/internal/cody/utils.go

@@ -7,11 +7,11 @@ go_library(
     visibility = ["//cmd/frontend:__subpackages__"],
     deps = [
         "//cmd/frontend/enterprise",
+        "//cmd/frontend/internal/cody",
         "//cmd/frontend/internal/completions/resolvers",
         "//cmd/frontend/internal/guardrails",
+        "//cmd/frontend/internal/httpapi/completions",
         "//internal/codeintel",
-        "//internal/cody",
-        "//internal/completions/httpapi",
         "//internal/conf/conftypes",
         "//internal/database",
         "//internal/observation",

internal/cody/utils_test.go renamed to cmd/frontend/internal/cody/utils_test.go

@@ -7,11 +7,11 @@ import (
 	"github.com/sourcegraph/log"
 
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/enterprise"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/completions/resolvers"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/guardrails"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/httpapi/completions"
 	"github.com/sourcegraph/sourcegraph/internal/codeintel"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
-	"github.com/sourcegraph/sourcegraph/internal/completions/httpapi"
 	"github.com/sourcegraph/sourcegraph/internal/conf/conftypes"
 	"github.com/sourcegraph/sourcegraph/internal/database"
 	"github.com/sourcegraph/sourcegraph/internal/observation"
@@ -28,11 +28,11 @@ func Init(
 	logger := log.Scoped("completions")
 
 	enterpriseServices.NewChatCompletionsStreamHandler = func() http.Handler {
-		completionsHandler := httpapi.NewChatCompletionsStreamHandler(logger, db)
+		completionsHandler := completions.NewChatCompletionsStreamHandler(logger, db)
 		return requireVerifiedEmailMiddleware(db, observationCtx.Logger, completionsHandler)
 	}
 	enterpriseServices.NewCodeCompletionsHandler = func() http.Handler {
-		codeCompletionsHandler := httpapi.NewCodeCompletionsHandler(logger, db, guardrails.NewAttributionTest(observationCtx, conf))
+		codeCompletionsHandler := completions.NewCodeCompletionsHandler(logger, db, guardrails.NewAttributionTest(observationCtx, conf))
 		return requireVerifiedEmailMiddleware(db, observationCtx.Logger, codeCompletionsHandler)
 	}
 	enterpriseServices.CompletionsResolver = resolvers.NewCompletionsResolver(db, observationCtx.Logger)

cmd/frontend/internal/codycontext/BUILD.bazel

@@ -7,9 +7,9 @@ go_library(
     visibility = ["//cmd/frontend:__subpackages__"],
     deps = [
         "//cmd/frontend/graphqlbackend",
-        "//internal/cody",
+        "//cmd/frontend/internal/cody",
+        "//cmd/frontend/internal/httpapi/completions",
         "//internal/completions/client",
-        "//internal/completions/httpapi",
         "//internal/completions/types",
         "//internal/conf",
         "//internal/database",

cmd/frontend/internal/codycontext/context.go

@@ -7,9 +7,9 @@ import (
 	"github.com/sourcegraph/log"
 
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/httpapi/completions"
 	"github.com/sourcegraph/sourcegraph/internal/completions/client"
-	"github.com/sourcegraph/sourcegraph/internal/completions/httpapi"
 	"github.com/sourcegraph/sourcegraph/internal/completions/types"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/database"
@@ -22,13 +22,13 @@ var _ graphqlbackend.CompletionsResolver = &completionsResolver{}
 
 // completionsResolver provides chat completions
 type completionsResolver struct {
-	rl     httpapi.RateLimiter
+	rl     completions.RateLimiter
 	db     database.DB
 	logger log.Logger
 }
 
 func NewCompletionsResolver(db database.DB, logger log.Logger) graphqlbackend.CompletionsResolver {
-	rl := httpapi.NewRateLimiter(db, redispool.Store, types.CompletionsFeatureChat)
+	rl := completions.NewRateLimiter(db, redispool.Store, types.CompletionsFeatureChat)
 	return &completionsResolver{rl: rl, db: db, logger: logger}
 }
 
@@ -53,7 +53,7 @@ func (c *completionsResolver) Completions(ctx context.Context, args graphqlbacke
 		chatModel = completionsConfig.ChatModel
 	}
 
-	ctx, done := httpapi.Trace(ctx, "resolver", chatModel, int(args.Input.MaxTokensToSample)).
+	ctx, done := completions.Trace(ctx, "resolver", chatModel, int(args.Input.MaxTokensToSample)).
 		WithErrorP(&err).
 		Build()
 	defer done()

cmd/frontend/internal/completions/BUILD.bazel

@@ -26,12 +26,12 @@ go_library(
     deps = [
         "//cmd/frontend/graphqlbackend",
         "//cmd/frontend/graphqlbackend/graphqlutil",
+        "//cmd/frontend/internal/cody",
         "//internal/accesstoken",
         "//internal/actor",
         "//internal/audit",
         "//internal/auth",
         "//internal/authz",
-        "//internal/cody",
         "//internal/codygateway",
         "//internal/completions/client/anthropic",
         "//internal/completions/client/fireworks",
@@ -93,11 +93,12 @@ go_test(
     ],
     deps = [
         "//cmd/frontend/graphqlbackend",
+        "//cmd/frontend/internal/cody",
+        "//cmd/frontend/internal/ssc",
         "//internal/accesstoken",
         "//internal/actor",
         "//internal/audit/audittest",
         "//internal/authz",
-        "//internal/cody",
         "//internal/conf",
         "//internal/database",
         "//internal/database/dbmocks",
@@ -111,7 +112,6 @@ go_test(
         "//internal/rbac",
         "//internal/redispool",
         "//internal/slack",
-        "//internal/ssc",
         "//internal/timeutil",
         "//internal/types",
         "//lib/errors",

cmd/frontend/internal/completions/init.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"math"
 
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/auth"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/conf/conftypes"
 	"github.com/sourcegraph/sourcegraph/internal/featureflag"
 

cmd/frontend/internal/completions/resolvers/BUILD.bazel

@@ -13,19 +13,19 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/dotcom/productsubscription"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/accesstoken"
 	"github.com/sourcegraph/sourcegraph/internal/actor"
 	"github.com/sourcegraph/sourcegraph/internal/audit/audittest"
 	"github.com/sourcegraph/sourcegraph/internal/authz"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/database"
 	"github.com/sourcegraph/sourcegraph/internal/database/dbtest"
 	"github.com/sourcegraph/sourcegraph/internal/extsvc"
 	"github.com/sourcegraph/sourcegraph/internal/featureflag"
 	"github.com/sourcegraph/sourcegraph/internal/rbac"
-	"github.com/sourcegraph/sourcegraph/internal/ssc"
 	"github.com/sourcegraph/sourcegraph/internal/types"
 	"github.com/sourcegraph/sourcegraph/lib/pointers"
 	"github.com/sourcegraph/sourcegraph/schema"

cmd/frontend/internal/completions/resolvers/resolver.go

@@ -12,9 +12,9 @@ go_library(
     deps = [
         "//cmd/frontend/graphqlbackend",
         "//cmd/frontend/graphqlbackend/graphqlutil",
+        "//cmd/frontend/internal/cody",
         "//internal/api",
         "//internal/auth",
-        "//internal/cody",
         "//internal/conf",
         "//internal/database",
         "//internal/embeddings",

cmd/frontend/internal/dotcom/productsubscription/BUILD.bazel

@@ -14,9 +14,9 @@ import (
 
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/graphqlbackend/graphqlutil"
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/api"
 	"github.com/sourcegraph/sourcegraph/internal/auth"
-	"github.com/sourcegraph/sourcegraph/internal/cody"
 	"github.com/sourcegraph/sourcegraph/internal/conf"
 	"github.com/sourcegraph/sourcegraph/internal/database"
 	"github.com/sourcegraph/sourcegraph/internal/embeddings"