refactor: flatten handler package, remove v1beta1 subdirectory

ravisuhag · ravisuhag · commit 3cd0e7991f96 · 2026-03-28T00:25:22.000-05:00
Move handler files from handler/v1beta1/ to handler/ and rename
package from handlersv1beta1 to handler.
diff --git a/handler/asset.go b/handler/asset.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 //go:generate mockery --name=AssetService -r --case underscore --with-expecter --structname AssetService --filename asset_service.go --output=./mocks
 import (
diff --git a/handler/asset_test.go b/handler/asset_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -16,7 +16,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/star"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/handler/comment.go b/handler/comment.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
diff --git a/handler/comment_test.go b/handler/comment_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"github.com/raystack/compass/core/discussion"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/handler/discussion.go b/handler/discussion.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 //go:generate mockery --name=DiscussionService -r --case underscore --with-expecter --structname DiscussionService --filename discussion_service.go --output=./mocks
 import (
diff --git a/handler/discussion_test.go b/handler/discussion_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"github.com/raystack/compass/core/discussion"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/handler/lineage.go b/handler/lineage.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
diff --git a/handler/lineage_test.go b/handler/lineage_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -11,7 +11,7 @@ import (
 	"github.com/raystack/compass/core/asset"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/handler/mocks/asset_service.go b/handler/mocks/asset_service.go
diff --git a/handler/mocks/discussion_service.go b/handler/mocks/discussion_service.go
diff --git a/handler/mocks/namespace_service.go b/handler/mocks/namespace_service.go
diff --git a/handler/mocks/star_service.go b/handler/mocks/star_service.go
diff --git a/handler/mocks/tag_service.go b/handler/mocks/tag_service.go
diff --git a/handler/mocks/tag_template_service.go b/handler/mocks/tag_template_service.go
diff --git a/handler/mocks/user_service.go b/handler/mocks/user_service.go
diff --git a/handler/namespace.go b/handler/namespace.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 //go:generate mockery --name=NamespaceService -r --case underscore --with-expecter --structname NamespaceService --filename namespace_service.go --output=./mocks
 
diff --git a/handler/namespace_test.go b/handler/namespace_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -9,7 +9,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"github.com/stretchr/testify/assert"
diff --git a/handler/option.go b/handler/option.go
@@ -1,3 +1,3 @@
-package handlersv1beta1
+package handler
 
 type Option func(*APIServer)
diff --git a/handler/search.go b/handler/search.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
diff --git a/handler/search_test.go b/handler/search_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/raystack/compass/core/asset"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
 	"github.com/stretchr/testify/mock"
diff --git a/handler/server.go b/handler/server.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
diff --git a/handler/star.go b/handler/star.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 //go:generate mockery --name=StarService -r --case underscore --with-expecter --structname StarService --filename star_service.go --output=./mocks
 import (
diff --git a/handler/tag.go b/handler/tag.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 //go:generate mockery --name=TagService -r --case underscore --with-expecter --structname TagService --filename tag_service.go --output=./mocks
 import (
diff --git a/handler/tag_template.go b/handler/tag_template.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 //go:generate mockery --name=TagTemplateService -r --case underscore --with-expecter --structname TagTemplateService --filename tag_template_service.go --output=./mocks
 import (
diff --git a/handler/tag_template_test.go b/handler/tag_template_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/tag"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/handler/tag_test.go b/handler/tag_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/tag"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/handler/type.go b/handler/type.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
diff --git a/handler/type_test.go b/handler/type_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 	"github.com/raystack/compass/core/asset"
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/handler/user.go b/handler/user.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 //go:generate mockery --name=UserService -r --case underscore --with-expecter --structname UserService --filename user_service.go --output=./mocks
 import (
diff --git a/handler/user_test.go b/handler/user_test.go
@@ -1,4 +1,4 @@
-package handlersv1beta1
+package handler
 
 import (
 	"context"
@@ -16,7 +16,7 @@ import (
 	"github.com/raystack/compass/core/namespace"
 	"github.com/raystack/compass/core/star"
 	"github.com/raystack/compass/core/user"
-	"github.com/raystack/compass/handler/v1beta1/mocks"
+	"github.com/raystack/compass/handler/mocks"
 	"github.com/raystack/compass/internal/middleware"
 	compassv1beta1 "github.com/raystack/compass/proto/gen/raystack/compass/v1beta1"
 	log "github.com/raystack/salt/observability/logger"
diff --git a/internal/server/server.go b/internal/server/server.go
@@ -14,7 +14,7 @@ import (
 	"connectrpc.com/validate"
 	"github.com/raystack/compass/internal/config"
 	"github.com/rs/cors"
-	handlersv1beta1 "github.com/raystack/compass/handler/v1beta1"
+	"github.com/raystack/compass/handler"
 	"github.com/raystack/compass/internal/middleware"
 	"github.com/raystack/compass/proto/gen/raystack/compass/v1beta1/compassv1beta1connect"
 	log "github.com/raystack/salt/observability/logger"
@@ -26,15 +26,15 @@ func Serve(
 	ctx context.Context,
 	cfg config.ServerConfig,
 	logger *log.Logrus,
-	namespaceService handlersv1beta1.NamespaceService,
-	assetService handlersv1beta1.AssetService,
-	starService handlersv1beta1.StarService,
-	discussionService handlersv1beta1.DiscussionService,
-	tagService handlersv1beta1.TagService,
-	tagTemplateService handlersv1beta1.TagTemplateService,
-	userService handlersv1beta1.UserService,
+	namespaceService handler.NamespaceService,
+	assetService handler.AssetService,
+	starService handler.StarService,
+	discussionService handler.DiscussionService,
+	tagService handler.TagService,
+	tagTemplateService handler.TagTemplateService,
+	userService handler.UserService,
 ) error {
-	v1beta1Handler := handlersv1beta1.NewAPIServer(
+	v1beta1Handler := handler.NewAPIServer(
 		logger,
 		namespaceService,
 		assetService,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package handlersv1beta1`
	`1`	`+package handler`
`2`	`2`
`3`	`3`	`//go:generate mockery --name=AssetService -r --case underscore --with-expecter --structname AssetService --filename asset_service.go --output=./mocks`
`4`	`4`	`import (`