From 01bffc8388cdfb24fa521912df9cd4dad306f9f1 Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Wed, 22 May 2024 14:25:35 -0700
Subject: [PATCH 1/2] latest

---
 cmd/mfer/main.go     | 2 +-
 go.mod               | 2 +-
 internal/cli/gen.go  | 4 ++--
 internal/cli/mfer.go | 2 +-
 mfer/deserialize.go  | 4 ++--
 mfer/example_test.go | 2 +-
 mfer/manifest.go     | 2 +-
 mfer/mf.go           | 3 +++
 mfer/mfer_test.go    | 2 +-
 mfer/serialize.go    | 2 +-
 10 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 mfer/mf.go

diff --git a/cmd/mfer/main.go b/cmd/mfer/main.go
index b713fd2..af1255f 100644
--- a/cmd/mfer/main.go
+++ b/cmd/mfer/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"git.eeqj.de/sneak/mfer/internal/cli"
+	"sneak.berlin/go/mfer/internal/cli"
 )
 
 var (
diff --git a/go.mod b/go.mod
index 2d4dcff..eb75322 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module git.eeqj.de/sneak/mfer
+module sneak.berlin/go/mfer
 
 go 1.17
 
diff --git a/internal/cli/gen.go b/internal/cli/gen.go
index 1ed57ef..bcff557 100644
--- a/internal/cli/gen.go
+++ b/internal/cli/gen.go
@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"path/filepath"
 
-	"git.eeqj.de/sneak/mfer/internal/log"
-	"git.eeqj.de/sneak/mfer/mfer"
 	"github.com/urfave/cli/v2"
+	"sneak.berlin/go/mfer/internal/log"
+	"sneak.berlin/go/mfer/mfer"
 )
 
 func (mfa *CLIApp) generateManifestOperation(ctx *cli.Context) error {
diff --git a/internal/cli/mfer.go b/internal/cli/mfer.go
index 9f85ae1..51dce77 100644
--- a/internal/cli/mfer.go
+++ b/internal/cli/mfer.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"git.eeqj.de/sneak/mfer/internal/log"
 	"github.com/urfave/cli/v2"
+	"sneak.berlin/go/mfer/internal/log"
 )
 
 type CLIApp struct {
diff --git a/mfer/deserialize.go b/mfer/deserialize.go
index 85ff318..4bc1fcb 100644
--- a/mfer/deserialize.go
+++ b/mfer/deserialize.go
@@ -6,9 +6,9 @@ import (
 	"errors"
 	"io"
 
-	"git.eeqj.de/sneak/mfer/internal/bork"
-	"git.eeqj.de/sneak/mfer/internal/log"
 	"google.golang.org/protobuf/proto"
+	"sneak.berlin/go/mfer/internal/bork"
+	"sneak.berlin/go/mfer/internal/log"
 )
 
 func (m *manifest) validateProtoOuter() error {
diff --git a/mfer/example_test.go b/mfer/example_test.go
index af4164b..98fae36 100644
--- a/mfer/example_test.go
+++ b/mfer/example_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"git.eeqj.de/sneak/mfer/internal/log"
 	"github.com/stretchr/testify/assert"
+	"sneak.berlin/go/mfer/internal/log"
 )
 
 func TestAPIExample(t *testing.T) {
diff --git a/mfer/manifest.go b/mfer/manifest.go
index d85e5c5..691715c 100644
--- a/mfer/manifest.go
+++ b/mfer/manifest.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"git.eeqj.de/sneak/mfer/internal/log"
 	"github.com/spf13/afero"
+	"sneak.berlin/go/mfer/internal/log"
 )
 
 type manifestFile struct {
diff --git a/mfer/mf.go b/mfer/mf.go
new file mode 100644
index 0000000..1bb16da
--- /dev/null
+++ b/mfer/mf.go
@@ -0,0 +1,3 @@
+package mfer
+
+//go:generate protoc ./mf.proto --go_out=paths=source_relative:.
diff --git a/mfer/mfer_test.go b/mfer/mfer_test.go
index 18858a6..4df8d44 100644
--- a/mfer/mfer_test.go
+++ b/mfer/mfer_test.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"testing"
 
-	"git.eeqj.de/sneak/mfer/internal/log"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
+	"sneak.berlin/go/mfer/internal/log"
 )
 
 // Add those variables as well
diff --git a/mfer/serialize.go b/mfer/serialize.go
index 00e8a5e..1b8ea68 100644
--- a/mfer/serialize.go
+++ b/mfer/serialize.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-//go:generate protoc --go_out=. --go_opt=paths=source_relative mf.proto
+// was go-generate protoc --go_out=. --go_opt=paths=source_relative mf.proto
 
 // rot13("MANIFEST")
 const MAGIC string = "ZNAVSRFG"
-- 
2.40.1


From 13f39d598f5bbc2820bd5c75a47f05cc6424e530 Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Wed, 22 May 2024 14:34:05 -0700
Subject: [PATCH 2/2] remove gofumpt from linting

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8bdb0ed..f42c488 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,7 @@ fixme:
 	@grep -nir fixme . | grep -v Makefile
 
 devprereqs:
-	which gofumpt || go install -v mvdan.cc/gofumpt@latest
-	which golangci-lint || go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
+	which golangci-lint || go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
 mfer/mf.pb.go: mfer/mf.proto
 	cd mfer && go generate .
-- 
2.40.1