From 2d56a42a2895c905818ecbe7626d15deb5bae521 Mon Sep 17 00:00:00 2001
From: Justin Chadwell <me@jedevc.com>
Date: Fri, 3 May 2024 11:22:05 +0100
Subject: [PATCH] fixups

Signed-off-by: Justin Chadwell <me@jedevc.com>
---
 .github/dependabot.yml |  6 ------
 .golangci.yml          |  4 ++++
 ci/docs.go             | 19 +++++++++----------
 ci/sdk_go.go           |  2 +-
 ci/sdk_php.go          |  2 +-
 ci/sdk_python.go       |  2 +-
 ci/sdk_typescript.go   |  2 +-
 core/modfunc.go        |  1 -
 dagger.json            |  2 +-
 9 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 83a41b61cca..57f3c4281dd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -129,9 +129,3 @@ updates:
         applies-to: version-updates
         patterns:
           - "*"
-
-  # ignore all npm dependencies in sdk/rust
-  - package-ecosystem: "npm"
-    directory: "/sdk/rust"
-    ignore:
-      - dependency-name: "*"
diff --git a/.golangci.yml b/.golangci.yml
index 200e361a2f7..158e8baacc3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -46,6 +46,10 @@ issues:
         # this is sometimes done for clarity
         - unparam
 
+  exclude-dirs:
+    # these files are already linted in sdk/go
+    - internal/telemetry
+    - internal/querybuilder
 
 linters-settings:
   revive:
diff --git a/ci/docs.go b/ci/docs.go
index 741ccb16931..fe4aab598c0 100644
--- a/ci/docs.go
+++ b/ci/docs.go
@@ -63,18 +63,17 @@ func (d Docs) Lint(ctx context.Context) error {
 // Regenerate the API schema and CLI reference docs
 func (d Docs) Generate(ctx context.Context) (*dagger.Directory, error) {
 	eg, ctx := errgroup.WithContext(ctx)
+	_ = ctx
 
 	var sdl *dagger.Directory
 	eg.Go(func() error {
-		var err error
-		sdl, err = d.GenerateSdl(ctx)
-		return err
+		sdl = d.GenerateSdl()
+		return nil
 	})
 	var cli *dagger.Directory
 	eg.Go(func() error {
-		var err error
-		cli, err = d.GenerateCli(ctx)
-		return err
+		cli = d.GenerateCli()
+		return nil
 	})
 
 	if err := eg.Wait(); err != nil {
@@ -85,7 +84,7 @@ func (d Docs) Generate(ctx context.Context) (*dagger.Directory, error) {
 }
 
 // Regenerate the API schema
-func (d Docs) GenerateSdl(ctx context.Context) (*Directory, error) {
+func (d Docs) GenerateSdl() *Directory {
 	introspectionJSON :=
 		util.GoBase(d.Dagger.Source).
 			WithExec([]string{"go", "run", "./cmd/introspect"}, dagger.ContainerWithExecOpts{
@@ -100,14 +99,14 @@ func (d Docs) GenerateSdl(ctx context.Context) (*Directory, error) {
 		WithExec([]string{"graphql-json-to-sdl", "/src/schema.json", "/src/schema.graphql"}).
 		File("/src/schema.graphql")
 
-	return dag.Directory().WithFile(generatedSchemaPath, generated), nil
+	return dag.Directory().WithFile(generatedSchemaPath, generated)
 }
 
 // Regenerate the CLI reference docs
-func (d Docs) GenerateCli(ctx context.Context) (*Directory, error) {
+func (d Docs) GenerateCli() *Directory {
 	// Should we keep `--include-experimental`?
 	generated := util.GoBase(d.Dagger.Source).
 		WithExec([]string{"go", "run", "./cmd/dagger", "gen", "--frontmatter=" + cliZenFrontmatter, "--output=cli.mdx", "--include-experimental"}).
 		File("cli.mdx")
-	return dag.Directory().WithFile(generatedCliZenPath, generated), nil
+	return dag.Directory().WithFile(generatedCliZenPath, generated)
 }
diff --git a/ci/sdk_go.go b/ci/sdk_go.go
index 9e971e40801..28f39d96fd3 100644
--- a/ci/sdk_go.go
+++ b/ci/sdk_go.go
@@ -106,7 +106,7 @@ func (t GoSDK) Publish(
 }
 
 // Bump the Go SDK's Engine dependency
-func (t GoSDK) Bump(ctx context.Context, version string) (*Directory, error) {
+func (t GoSDK) Bump(version string) (*Directory, error) {
 	// trim leading v from version
 	version = strings.TrimPrefix(version, "v")
 
diff --git a/ci/sdk_php.go b/ci/sdk_php.go
index 3cef2feb7ab..139016c2579 100644
--- a/ci/sdk_php.go
+++ b/ci/sdk_php.go
@@ -83,7 +83,7 @@ func (t PHPSDK) Publish(
 }
 
 // Bump the PHP SDK's Engine dependency
-func (t PHPSDK) Bump(ctx context.Context, version string) (*Directory, error) {
+func (t PHPSDK) Bump(version string) (*Directory, error) {
 	version = strings.TrimPrefix(version, "v")
 	content := fmt.Sprintf(`<?php /* Code generated by dagger. DO NOT EDIT. */ return '%s';
 `, version)
diff --git a/ci/sdk_python.go b/ci/sdk_python.go
index 37233356d06..07adbf3dd20 100644
--- a/ci/sdk_python.go
+++ b/ci/sdk_python.go
@@ -155,7 +155,7 @@ func (t PythonSDK) Publish(
 }
 
 // Bump the Python SDK's Engine dependency
-func (t PythonSDK) Bump(ctx context.Context, version string) (*dagger.Directory, error) {
+func (t PythonSDK) Bump(version string) (*dagger.Directory, error) {
 	// trim leading v from version
 	version = strings.TrimPrefix(version, "v")
 	engineReference := fmt.Sprintf("# Code generated by dagger. DO NOT EDIT.\n\nCLI_VERSION = %q\n", version)
diff --git a/ci/sdk_typescript.go b/ci/sdk_typescript.go
index c98554bb97a..4252f049aa4 100644
--- a/ci/sdk_typescript.go
+++ b/ci/sdk_typescript.go
@@ -156,7 +156,7 @@ always-auth=true`, plaintext)
 }
 
 // Bump the Typescript SDK's Engine dependency
-func (t TypescriptSDK) Bump(ctx context.Context, version string) (*Directory, error) {
+func (t TypescriptSDK) Bump(version string) (*Directory, error) {
 	// trim leading v from version
 	version = strings.TrimPrefix(version, "v")
 
diff --git a/core/modfunc.go b/core/modfunc.go
index c9f28c4120f..2adc71c4444 100644
--- a/core/modfunc.go
+++ b/core/modfunc.go
@@ -16,7 +16,6 @@ import (
 	"github.com/dagger/dagger/analytics"
 	"github.com/dagger/dagger/core/pipeline"
 	"github.com/dagger/dagger/dagql"
-	"github.com/dagger/dagger/dagql/call"
 	"github.com/dagger/dagger/engine/buildkit"
 )
 
diff --git a/dagger.json b/dagger.json
index 734384405d2..ec3665f0539 100644
--- a/dagger.json
+++ b/dagger.json
@@ -15,4 +15,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}