fix: linters

Author: turip

.dagger/build.go

@@ -239,25 +239,6 @@ func goModule() *dagger.Go {
 		WithBuildCache(cacheVolume("go-build"))
 }
 
-func goModuleCross(platform dagger.Platform) *dagger.Go {
-	container := goModule().
-		WithCgoEnabled(). // TODO: set env var instead?
-		Container().
-		With(func(c *dagger.Container) *dagger.Container {
-			if platform != "" {
-				c = c.WithEnvVariable("TARGETPLATFORM", string(platform))
-			}
-
-			return c
-		}).
-		WithDirectory("/", dag.Container().From(xxBaseImage).Rootfs()).
-		WithExec([]string{"apk", "add", "--update", "--no-cache", "ca-certificates", "make", "git", "curl", "clang", "lld"}).
-		WithExec([]string{"xx-apk", "add", "--update", "--no-cache", "musl-dev", "gcc"}).
-		WithExec([]string{"xx-go", "--wrap"})
-
-	return dag.Go(dagger.GoOpts{Container: container})
-}
-
 func (m *Build) HelmChart(
 	// Name of the chart to build.
 	name string,

.dagger/dev.go

@@ -1,9 +1,6 @@
 package main
 
 import (
-	"context"
-	"fmt"
-
 	"github.com/openmeterio/openmeter/.dagger/internal/dagger"
 )
 
@@ -19,51 +16,6 @@ type Generate struct {
 	Source *dagger.Directory
 }
 
-// Generate OpenAPI from TypeSpec.
-func (m *Generate) Openapi() *dagger.File {
-	file := typespecBase(m.Source.Directory("api/spec")).
-		WithExec([]string{"pnpm", "compile"}).
-		File("/work/output/openapi.OpenMeter.yaml").
-		WithName("openapi.yaml")
-
-	// https://github.com/microsoft/typespec/issues/2154
-	file = dag.Container().
-		From("alpine").
-		WithFile("/work/openapi.yaml", file).
-		WithWorkdir("/work").
-		File("/work/openapi.yaml")
-
-	return file
-}
-
-// Generate OpenAPI from TypeSpec.
-func (m *Generate) Openapicloud() *dagger.File {
-	file := typespecBase(m.Source.Directory("api/spec")).
-		WithExec([]string{"pnpm", "compile"}).
-		File("/work/output/openapi.OpenMeterCloud.yaml").
-		WithName("openapi.cloud.yaml")
-
-	// https://github.com/microsoft/typespec/issues/2154
-	file = dag.Container().
-		From("alpine").
-		WithFile("/work/openapi.cloud.yaml", file).
-		WithWorkdir("/work").
-		File("/work/openapi.cloud.yaml")
-
-	return file
-}
-
-func typespecBase(source *dagger.Directory) *dagger.Container {
-	return dag.Container().
-		From(NODEJS_CONTAINER_IMAGE).
-		WithEnvVariable("CI", "true").
-		WithExec([]string{"npm", "install", "-g", fmt.Sprintf("corepack@v%s", COREPACK_VERSION)}).
-		WithExec([]string{"corepack", "enable"}).
-		WithDirectory("/work", source).
-		WithWorkdir("/work").
-		WithExec([]string{"pnpm", "install", "--frozen-lockfile"})
-}
-
 // Generate the Python SDK.
 func (m *Generate) PythonSdk() *dagger.Directory {
 	// We build our image as the official autorest Dockerfile is outdated
@@ -83,59 +35,3 @@ func (m *Generate) PythonSdk() *dagger.Directory {
 		WithExec([]string{"autorest", "config.yaml"}).
 		Directory("/work/client/python")
 }
-
-// Generate the JavaScript SDK.
-func (m *Generate) JavascriptSdk() *dagger.Directory {
-	return dag.Container().
-		From(NODEJS_CONTAINER_IMAGE).
-		WithExec([]string{"npm", "install", "-g", fmt.Sprintf("corepack@v%s", COREPACK_VERSION)}).
-		WithExec([]string{"corepack", "enable"}).
-		WithDirectory("/work", m.Source.Directory("api")).
-		WithWorkdir("/work/client/javascript").
-		WithExec([]string{"pnpm", "install", "--frozen-lockfile"}).
-		WithExec([]string{"pnpm", "run", "generate"}).
-		WithExec([]string{"pnpm", "build"}).
-		WithExec([]string{"pnpm", "test"}).
-		Directory("/work/client/javascript").
-		WithoutDirectory("node_modules")
-}
-
-func (m *Generate) Server() *dagger.Directory {
-	openapi := m.Openapi()
-	cloud := m.Openapicloud()
-
-	source := m.Source.
-		WithFile("api/openapi.yaml", openapi).
-		WithFile("api/openapi.cloud.yaml", cloud)
-
-	return goModule().
-		WithSource(source).
-		Exec([]string{"go", "generate", "-x", "./api"}).
-		Directory("/work/src/api")
-}
-
-func (m *Generate) Check(ctx context.Context) error {
-	result := goModuleCross("").
-		WithSource(m.Source).
-		WithEnvVariable("GOFLAGS", "-tags=musl").
-		Exec([]string{"go", "generate", "-x", "./..."}).
-		Directory("")
-
-	err := diff(ctx, m.Source, result)
-	if err != nil {
-		return fmt.Errorf("go generate wasn't run: %w", err)
-	}
-
-	return nil
-}
-
-func diff(ctx context.Context, d1, d2 *dagger.Directory) error {
-	_, err := dag.Container(dagger.ContainerOpts{Platform: ""}).
-		From(alpineBaseImage).
-		WithDirectory("src", d1).
-		WithDirectory("res", d2).
-		WithExec([]string{"diff", "-u", "-r", "-q", "src", "res"}).
-		Sync(ctx)
-
-	return err
-}