refactor: move proto/gen to top-level gen directory

ravisuhag · ravisuhag · commit 013b9d8de18a · 2026-03-28T00:27:19.000-05:00
Remove the proto/ wrapper directory — generated code now lives
directly at gen/ (gen/raystack/compass/v1beta1/, gen/buf/validate/).
diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -1,7 +1,7 @@
 version: v2
 # Proto source lives in the proton repo (../proton).
 # After running `buf generate`, remove unwanted generated files:
-#   find proto/gen/raystack -mindepth 1 -maxdepth 1 ! -name compass -exec rm -rf {} +
+#   find gen/raystack -mindepth 1 -maxdepth 1 ! -name compass -exec rm -rf {} +
 inputs:
   - directory: ../proton
   - module: buf.build/bufbuild/protovalidate
@@ -10,13 +10,13 @@ managed:
   override:
     - file_option: go_package
       path: raystack/compass/v1beta1/service.proto
-      value: github.com/raystack/compass/proto/gen/raystack/compass/v1beta1;compassv1beta1
+      value: github.com/raystack/compass/gen/raystack/compass/v1beta1;compassv1beta1
 plugins:
   - remote: buf.build/protocolbuffers/go:v1.36.11
-    out: proto/gen
+    out: gen
     opt:
       - paths=source_relative
   - remote: buf.build/connectrpc/go:v1.18.1
-    out: proto/gen
+    out: gen
     opt:
       - paths=source_relative
diff --git a/cli/assets.go b/cli/assets.go
@@ -7,7 +7,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/internal/client"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"github.com/raystack/salt/cli/printer"
 	"github.com/spf13/cobra"
 )
diff --git a/cli/discussions.go b/cli/discussions.go
@@ -7,7 +7,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/internal/client"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"github.com/raystack/salt/cli/printer"
 	"github.com/spf13/cobra"
 )
diff --git a/cli/lineage.go b/cli/lineage.go
@@ -6,7 +6,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/internal/client"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"github.com/raystack/salt/cli/printer"
 	"github.com/spf13/cobra"
 )
diff --git a/cli/namespace.go b/cli/namespace.go
@@ -9,7 +9,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/internal/client"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"github.com/raystack/salt/cli/printer"
 	"github.com/spf13/cobra"
 )
diff --git a/cli/search.go b/cli/search.go
@@ -6,7 +6,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/internal/client"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"github.com/raystack/salt/cli/printer"
 	"github.com/spf13/cobra"
 )
diff --git a/gen/buf/validate/validate.pb.go b/gen/buf/validate/validate.pb.go
diff --git a/gen/raystack/compass/v1beta1/compassv1beta1connect/service.connect.go b/gen/raystack/compass/v1beta1/compassv1beta1connect/service.connect.go
diff --git a/gen/raystack/compass/v1beta1/service.pb.go b/gen/raystack/compass/v1beta1/service.pb.go
diff --git a/handler/asset.go b/handler/asset.go
@@ -14,7 +14,7 @@ import (
 	"github.com/raystack/compass/core/star"
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
diff --git a/handler/asset_test.go b/handler/asset_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/handler/comment.go b/handler/comment.go
@@ -10,7 +10,7 @@ import (
 	"github.com/raystack/compass/core/discussion"
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
diff --git a/handler/comment_test.go b/handler/comment_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"github.com/stretchr/testify/mock"
 	
diff --git a/handler/discussion.go b/handler/discussion.go
@@ -12,7 +12,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
diff --git a/handler/discussion_test.go b/handler/discussion_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/handler/lineage.go b/handler/lineage.go
@@ -8,7 +8,7 @@ import (
 	"connectrpc.com/connect"
 	"github.com/raystack/compass/core/asset"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
diff --git a/handler/lineage_test.go b/handler/lineage_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	
 	
diff --git a/handler/namespace.go b/handler/namespace.go
@@ -9,7 +9,7 @@ import (
 	"connectrpc.com/connect"
 	"github.com/google/uuid"
 	"github.com/raystack/compass/core/namespace"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
diff --git a/handler/namespace_test.go b/handler/namespace_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
diff --git a/handler/search.go b/handler/search.go
@@ -8,7 +8,7 @@ import (
 	"connectrpc.com/connect"
 	"github.com/raystack/compass/core/asset"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 )
 
 func (server *APIServer) SearchAssets(ctx context.Context, req *connect.Request[compassv1beta1.SearchAssetsRequest]) (*connect.Response[compassv1beta1.SearchAssetsResponse], error) {
diff --git a/handler/search_test.go b/handler/search_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/raystack/compass/core/asset"
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"github.com/stretchr/testify/mock"
 	
diff --git a/handler/tag.go b/handler/tag.go
@@ -11,7 +11,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/tag"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
diff --git a/handler/tag_template.go b/handler/tag_template.go
@@ -11,7 +11,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/tag"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
diff --git a/handler/tag_template_test.go b/handler/tag_template_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	
 	
diff --git a/handler/tag_test.go b/handler/tag_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	
 	
diff --git a/handler/type.go b/handler/type.go
@@ -6,7 +6,7 @@ import (
 
 	"connectrpc.com/connect"
 	"github.com/raystack/compass/core/asset"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 )
 
 func (server *APIServer) GetAllTypes(ctx context.Context, req *connect.Request[compassv1beta1.GetAllTypesRequest]) (*connect.Response[compassv1beta1.GetAllTypesResponse], error) {
diff --git a/handler/type_test.go b/handler/type_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	
 	
diff --git a/handler/user.go b/handler/user.go
@@ -14,7 +14,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/core/validator"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
diff --git a/handler/user_test.go b/handler/user_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/raystack/compass/core/user"
 	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
-	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
+	compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/timestamppb"
diff --git a/internal/client/client.go b/internal/client/client.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"connectrpc.com/connect"
-	"github.com/raystack/compass/proto/gen/raystack/compass/v1beta1/compassv1beta1connect"
+	"github.com/raystack/compass/gen/raystack/compass/v1beta1/compassv1beta1connect"
 )
 
 // NamespaceHeaderKey specify what namespace request is targeted for
diff --git a/internal/server/server.go b/internal/server/server.go
@@ -16,7 +16,7 @@ import (
 	"github.com/rs/cors"
 	"github.com/raystack/compass/handler"
 	"github.com/raystack/compass/internal/middleware"
-	"github.com/raystack/compass/proto/gen/raystack/compass/v1beta1/compassv1beta1connect"
+	"github.com/raystack/compass/gen/raystack/compass/v1beta1/compassv1beta1connect"
 	log "github.com/raystack/salt/observability/logger"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/MakeNowJust/heredoc"`
`8`	`8`	`"github.com/raystack/compass/core/namespace"`
`9`	`9`	`"github.com/raystack/compass/internal/client"`
`10`		`- compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"`
	`10`	`+ compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"`
`11`	`11`	`"github.com/raystack/salt/cli/printer"`
`12`	`12`	`"github.com/spf13/cobra"`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/MakeNowJust/heredoc"`
`7`	`7`	`"github.com/raystack/compass/core/namespace"`
`8`	`8`	`"github.com/raystack/compass/internal/client"`
`9`		`- compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"`
	`9`	`+ compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"`
`10`	`10`	`"github.com/raystack/salt/cli/printer"`
`11`	`11`	`"github.com/spf13/cobra"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/MakeNowJust/heredoc"`
`10`	`10`	`"github.com/raystack/compass/core/namespace"`
`11`	`11`	`"github.com/raystack/compass/internal/client"`
`12`		`- compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"`
	`12`	`+ compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"`
`13`	`13`	`"github.com/raystack/salt/cli/printer"`
`14`	`14`	`"github.com/spf13/cobra"`
`15`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/raystack/compass/core/star"`
`15`	`15`	`"github.com/raystack/compass/core/user"`
`16`	`16`	`"github.com/raystack/compass/internal/middleware"`
`17`		`- compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"`
	`17`	`+ compassv1beta1 "github.com/raystack/compass/gen/raystack/compass/v1beta1"`
`18`	`18`	`"google.golang.org/protobuf/types/known/structpb"`
`19`	`19`	`"google.golang.org/protobuf/types/known/timestamppb"`
`20`	`20`	`)`