remove unused nodejs integration.

namespacelabs · Oct 20, 2024 · a86c931 · a86c931
1 parent 3e63023
commit a86c931
Show file tree

Hide file tree

Showing 158 changed files with 211 additions and 16,929 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -310,7 +310,6 @@ jobs:
             internal/testdata/server/gogrpc \
             internal/testdata/integrations/dockerfile/complex \
             internal/testdata/integrations/golang \
-            internal/testdata/integrations/nodejs/yarn \
             --use_prebuilts=true \
             --golang_use_buildkit=true \
             --build_in_nscloud \

diff --git a/internal/build/binary/binary.go b/internal/build/binary/binary.go
@@ -35,7 +35,6 @@ var BuildGo func(ctx context.Context, pl pkggraph.PackageLoader, loc pkggraph.Lo
 var BuildLLBGen func(schema.PackageName, *pkggraph.Module, build.Spec) build.Spec
 var BuildAlpine func(pkggraph.Location, *schema.ImageBuildPlan_AlpineBuild) build.Spec
 var BuildNix func(context.Context, pkggraph.PackageLoader, schema.PackageName, *pkggraph.Module, fs.FS) (build.Spec, error)
-var BuildNodejs func(cfg.Context, pkggraph.Location, *schema.NodejsBuild, assets.AvailableBuildAssets) (build.Spec, error)
 var BuildStaticFilesServer func(*schema.ImageBuildPlan_StaticFilesServer) build.Spec
 
 var prebuiltsConfType = cfg.DefineConfigType[*Prebuilts]()
@@ -243,10 +242,6 @@ func buildSpec(ctx context.Context, pl pkggraph.PackageLoader, env cfg.Context,
 		return BuildGo(ctx, pl, loc, src.GoBuild, false)
 	}
 
-	if src.NodejsBuild != nil {
-		return BuildNodejs(env, loc, src.NodejsBuild, assets)
-	}
-
 	if llb := src.LlbPlan; llb != nil {
 		spec, err := buildLayeredSpec(ctx, pl, env, loc, llb.OutputOf, assets, opts)
 		if err != nil {

diff --git a/internal/cli/cmd/dev.go b/internal/cli/cmd/dev.go
@@ -29,19 +29,17 @@ import (
 	"namespacelabs.dev/foundation/internal/logs/logtail"
 	"namespacelabs.dev/foundation/internal/parsing"
 	"namespacelabs.dev/foundation/internal/planning/deploy/view"
-	"namespacelabs.dev/foundation/internal/reverseproxy"
 	"namespacelabs.dev/foundation/schema"
 	"namespacelabs.dev/foundation/std/cfg"
 	"namespacelabs.dev/foundation/std/tasks"
 )
 
 func NewDevCmd() *cobra.Command {
 	var (
-		servingAddr  string
-		devWebServer = false
-		env          cfg.Context
-		locs         fncobra.Locations
-		servers      planningargs.Servers
+		servingAddr string
+		env         cfg.Context
+		locs        fncobra.Locations
+		servers     planningargs.Servers
 	)
 
 	return fncobra.
@@ -52,7 +50,6 @@ func NewDevCmd() *cobra.Command {
 		}).
 		WithFlags(func(flags *pflag.FlagSet) {
 			flags.StringVarP(&servingAddr, "listen", "H", "", "Listen on the specified address.")
-			flags.BoolVar(&devWebServer, "devweb", devWebServer, "Whether to start a development web frontend.")
 		}).
 		With(
 			fncobra.ParseEnv(&env),
@@ -111,23 +108,13 @@ func NewDevCmd() *cobra.Command {
 						fncobra.RegisterPprof(r)
 						devsession.RegisterEndpoints(sesh, r)
 
-						if devWebServer {
-							localPort := lis.Addr().(*net.TCPAddr).Port
-							webPort := localPort + 1
-							proxyTarget, err := startDevServer(ctx, env, devsession.WebPackage, localPort, webPort)
-							if err != nil {
-								return err
-							}
-							r.PathPrefix("/").Handler(reverseproxy.Make(proxyTarget, reverseproxy.DefaultLocalProxy()))
-						} else {
-							mux, err := devsession.PrebuiltWebUI(ctx)
-							if err != nil {
-								return err
-							}
-
-							r.PathPrefix("/").Handler(mux)
+						mux, err := devsession.PrebuiltWebUI(ctx)
+						if err != nil {
+							return err
 						}
 
+						r.PathPrefix("/").Handler(mux)
+
 						srv := &http.Server{
 							Handler:      r,
 							Addr:         servingAddr,

diff --git a/internal/cli/cmd/sdk/sdk.go b/internal/cli/cmd/sdk/sdk.go
@@ -28,16 +28,14 @@ import (
 	"namespacelabs.dev/foundation/internal/sdk/host"
 	"namespacelabs.dev/foundation/internal/sdk/k3d"
 	"namespacelabs.dev/foundation/internal/sdk/kubectl"
-	"namespacelabs.dev/foundation/internal/sdk/nodejs"
 	"namespacelabs.dev/foundation/std/module"
 	"namespacelabs.dev/foundation/std/tasks"
 )
 
 func NewSdkCmd(hidden bool) *cobra.Command {
-	sdks := []string{"go", "nodejs", "k3d", "kubectl", "grpcurl", "deno", "buildctl"}
+	sdks := []string{"go", "k3d", "kubectl", "grpcurl", "deno", "buildctl"}
 
 	goSdkVersion := "1.22"
-	nodejsVersion := "18"
 
 	cmd := &cobra.Command{
 		Use:    "sdk",
@@ -46,11 +44,10 @@ func NewSdkCmd(hidden bool) *cobra.Command {
 	}
 
 	selectedSdkList := func() []sdk {
-		return sdkList(sdks, goSdkVersion, nodejsVersion)
+		return sdkList(sdks, goSdkVersion)
 	}
 
 	cmd.PersistentFlags().StringVar(&goSdkVersion, "go_version", goSdkVersion, "Go version.")
-	cmd.PersistentFlags().StringVar(&nodejsVersion, "nodejs_version", nodejsVersion, "NodeJS version.")
 	cmd.PersistentFlags().StringArrayVar(&sdks, "sdks", sdks, "The SDKs we download.")
 
 	cmd.AddCommand(newSdkShellCmd(selectedSdkList))
@@ -68,7 +65,7 @@ type sdk struct {
 	makePath func(compute.Resolved, string) (string, error)
 }
 
-func sdkList(sdks []string, goVersion, nodejsVersion string) []sdk {
+func sdkList(sdks []string, goVersion string) []sdk {
 	var available = []sdk{
 		{
 			name: "go",
@@ -84,20 +81,6 @@ func sdkList(sdks []string, goVersion, nodejsVersion string) []sdk {
 				return filepath.Dir(sdk.Value.Binary), nil
 			},
 		},
-		{
-			name: "nodejs",
-			make: func(ctx context.Context, key string, in *compute.In, p specs.Platform) (*compute.In, error) {
-				sdk, err := nodejs.SDK(nodejsVersion, p)
-				if err != nil {
-					return nil, err
-				}
-				return in.Computable(key, sdk), nil
-			},
-			makePath: func(deps compute.Resolved, key string) (string, error) {
-				sdk, _ := compute.GetDepWithType[nodejs.LocalSDK](deps, key)
-				return filepath.Dir(sdk.Value.Binary), nil
-			},
-		},
 		simpleFileSDK("k3d", k3d.SDK),
 		simpleFileSDK("kubectl", kubectl.SDK),
 		simpleFileSDK("grpcurl", grpcurl.SDK),

diff --git a/internal/cli/cmd/source/cmd.go b/internal/cli/cmd/source/cmd.go
@@ -16,7 +16,6 @@ func NewSourceCmd() *cobra.Command {
 	}
 
 	cmd.AddCommand(newBufGenerateCmd())
-	cmd.AddCommand(newNodejsCmd())
 	cmd.AddCommand(newNewIdCmd())
 
 	return cmd

diff --git a/internal/cli/cmd/source/nodejs.go b/internal/cli/cmd/source/nodejs.go
diff --git a/internal/cli/fncobra/ns/main.go b/internal/cli/fncobra/ns/main.go
@@ -25,22 +25,16 @@ import (
 	integrationparsing "namespacelabs.dev/foundation/internal/frontend/cuefrontend/integration/api"
 	dockerfileparser "namespacelabs.dev/foundation/internal/frontend/cuefrontend/integration/dockerfile"
 	goparser "namespacelabs.dev/foundation/internal/frontend/cuefrontend/integration/golang"
-	nodejsparser "namespacelabs.dev/foundation/internal/frontend/cuefrontend/integration/nodejs"
 	shellparser "namespacelabs.dev/foundation/internal/frontend/cuefrontend/integration/shellscript"
-	webparser "namespacelabs.dev/foundation/internal/frontend/cuefrontend/integration/web"
 	"namespacelabs.dev/foundation/internal/git"
 	"namespacelabs.dev/foundation/internal/integrations/golang"
-	nodebinary "namespacelabs.dev/foundation/internal/integrations/nodejs/binary"
-	nodeopaqueintegration "namespacelabs.dev/foundation/internal/integrations/nodejs/opaqueintegration"
 	"namespacelabs.dev/foundation/internal/integrations/opaque"
 	"namespacelabs.dev/foundation/internal/llbutil"
 	"namespacelabs.dev/foundation/internal/networking/ingress"
 	"namespacelabs.dev/foundation/internal/networking/ingress/nginx"
 	dockerfileapplier "namespacelabs.dev/foundation/internal/parsing/integration/dockerfile"
 	goapplier "namespacelabs.dev/foundation/internal/parsing/integration/golang"
-	nodejsapplier "namespacelabs.dev/foundation/internal/parsing/integration/nodejs"
 	shellapplier "namespacelabs.dev/foundation/internal/parsing/integration/shellscript"
-	webapplier "namespacelabs.dev/foundation/internal/parsing/integration/web"
 	"namespacelabs.dev/foundation/internal/planning/deploy"
 	"namespacelabs.dev/foundation/internal/planning/tool"
 	"namespacelabs.dev/foundation/internal/providers/nscloud"
@@ -79,7 +73,6 @@ func DoMain(name string, autoUpdate bool, registerCommands func(*cobra.Command))
 				binary.BuildLLBGen = genbinary.LLBBinary
 				binary.BuildAlpine = genbinary.BuildAlpine
 				binary.BuildNix = genbinary.NixImageBuilder
-				binary.BuildNodejs = nodebinary.NodejsBuilder
 				binary.BuildStaticFilesServer = genbinary.StaticFilesServerBuilder
 
 				// Runtime
@@ -99,15 +92,12 @@ func DoMain(name string, autoUpdate bool, registerCommands func(*cobra.Command))
 				// Languages.
 				golang.Register()
 				opaque.Register()
-				nodeopaqueintegration.Register()
 
 				// Opaque integrations: parsing
 				integrationparsing.IntegrationParser = entity.NewDispatchingEntityParser("kind", []entity.EntityParser{
 					&dockerfileparser.Parser{},
 					shellparser.NewParser(),
 					goparser.NewParser(),
-					&nodejsparser.Parser{},
-					&webparser.Parser{},
 				})
 				integrationparsing.BuildParser = entity.NewDispatchingEntityParser("kind", []entity.EntityParser{
 					// Same syntax as docker integration so we can reuse the parser.
@@ -120,8 +110,6 @@ func DoMain(name string, autoUpdate bool, registerCommands func(*cobra.Command))
 				// Opaque integrations: applying
 				dockerfileapplier.Register()
 				goapplier.Register()
-				nodejsapplier.Register()
-				webapplier.Register()
 				shellapplier.Register()
 
 				// Codegen
@@ -237,7 +225,6 @@ func DoMain(name string, autoUpdate bool, registerCommands func(*cobra.Command))
 				"fnapi_naming_force_stored",
 				"kubernetes_deploy_as_pods_in_tests",
 				"compute_explain_indent_values",
-				"nodejs_use_native_node",
 				"lowlevel_tools_protocol_version",
 				"tools_invocation_can_use_buildkit",
 				"deploy_push_prebuilts_to_registry",

diff --git a/internal/devsession/webui.go b/internal/devsession/webui.go
@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	// ns build-binary --base_repository=registry.eu-services.namespace.systems internal/webui/devui --env prod
+	// Rebuilding the internal devui is no longer possible from head. Check out the git repo history.
 	WebPackage schema.PackageName = "namespacelabs.dev/foundation/internal/webui/devui"
 
 	baseRepository = "registry.eu-services.namespace.systems"

diff --git a/internal/frontend/cuefrontend/binary.go b/internal/frontend/cuefrontend/binary.go
@@ -44,7 +44,6 @@ type cueImageBuildPlan struct {
 	Deprecated_SnapshotFiles []string                               `json:"snapshot_files,omitempty"` // Use `files` instead.
 	Files                    []string                               `json:"files,omitempty"`
 	AlpineBuild              *schema.ImageBuildPlan_AlpineBuild     `json:"alpine_build,omitempty"`
-	NodejsBuild              *schema.NodejsBuild                    `json:"nodejs_build,omitempty"`
 	Binary                   string                                 `json:"binary,omitempty"`
 	FilesFrom                *cueImageBuildPlan_FilesFrom           `json:"files_from,omitempty"`
 	MakeFilesystemImage      *cueImageBuildPlan_MakeFilesystemImage `json:"make_fs_image,omitempty"`
@@ -194,11 +193,6 @@ func (bp cueImageBuildPlan) ToSchema(ctx context.Context, pl parsing.EarlyPackag
 		set = append(set, "dockerbuild")
 	}
 
-	if bp.NodejsBuild != nil {
-		plan.NodejsBuild = bp.NodejsBuild
-		set = append(set, "nodejs_build")
-	}
-
 	if bp.LlbPlan != nil {
 		p, err := bp.LlbPlan.OutputOf.ToSchema(ctx, pl, loc)
 		if err != nil {