Move model from internal to pkg

rdimitrov · rdimitrov · commit fefb5ca3c4fe · 2025-08-20T15:58:43.000+03:00
Signed-off-by: Radoslav Dimitrov &lt;radoslav@stacklok.com&gt;
diff --git a/cmd/registry/main.go b/cmd/registry/main.go
@@ -14,7 +14,7 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/api"
 	"github.com/modelcontextprotocol/registry/internal/config"
 	"github.com/modelcontextprotocol/registry/internal/database"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/modelcontextprotocol/registry/internal/service"
 )
 
diff --git a/internal/api/handlers/v0/auth/github_at.go b/internal/api/handlers/v0/auth/github_at.go
@@ -12,7 +12,7 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // GitHubTokenExchangeInput represents the input for GitHub token exchange
diff --git a/internal/api/handlers/v0/auth/github_at_test.go b/internal/api/handlers/v0/auth/github_at_test.go
@@ -16,7 +16,7 @@ import (
 	v0auth "github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/api/handlers/v0/auth/github_oidc.go b/internal/api/handlers/v0/auth/github_oidc.go
@@ -15,7 +15,7 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // GitHubOIDCTokenExchangeInput represents the input for GitHub OIDC token exchange
diff --git a/internal/api/handlers/v0/auth/github_oidc_test.go b/internal/api/handlers/v0/auth/github_oidc_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	internalauth "github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/api/handlers/v0/auth/none.go b/internal/api/handlers/v0/auth/none.go
@@ -9,7 +9,7 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // NoneHandler handles anonymous authentication
diff --git a/internal/api/handlers/v0/auth/none_test.go b/internal/api/handlers/v0/auth/none_test.go
@@ -10,7 +10,7 @@ import (
 	v0auth "github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/api/handlers/v0/publish.go b/internal/api/handlers/v0/publish.go
@@ -8,7 +8,7 @@ import (
 	"github.com/danielgtaylor/huma/v2"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/modelcontextprotocol/registry/internal/service"
 )
 
diff --git a/internal/api/handlers/v0/publish_integration_test.go b/internal/api/handlers/v0/publish_integration_test.go
@@ -16,7 +16,7 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/modelcontextprotocol/registry/internal/service"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/internal/api/handlers/v0/publish_test.go b/internal/api/handlers/v0/publish_test.go
@@ -17,7 +17,7 @@ import (
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/internal/api/handlers/v0/servers.go b/internal/api/handlers/v0/servers.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/danielgtaylor/huma/v2"
 	"github.com/google/uuid"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/modelcontextprotocol/registry/internal/service"
 )
 
diff --git a/internal/api/handlers/v0/servers_test.go b/internal/api/handlers/v0/servers_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/danielgtaylor/huma/v2/adapters/humago"
 	"github.com/google/uuid"
 	v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
diff --git a/internal/auth/jwt.go b/internal/auth/jwt.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // PermissionAction represents the type of action that can be performed
diff --git a/internal/auth/jwt_test.go b/internal/auth/jwt_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/modelcontextprotocol/registry/internal/auth"
 	"github.com/modelcontextprotocol/registry/internal/config"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/internal/database/database.go b/internal/database/database.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // Common database errors
diff --git a/internal/database/import.go b/internal/database/import.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // ReadSeedFile reads seed data from various sources:
diff --git a/internal/database/import_test.go b/internal/database/import_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/modelcontextprotocol/registry/internal/database"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/internal/database/memory.go b/internal/database/memory.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // MemoryDB is an in-memory implementation of the Database interface
diff --git a/internal/database/mongo.go b/internal/database/mongo.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
diff --git a/internal/service/fake_service.go b/internal/service/fake_service.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/modelcontextprotocol/registry/internal/database"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // fakeRegistryService implements RegistryService interface with an in-memory database
diff --git a/internal/service/registry_service.go b/internal/service/registry_service.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/modelcontextprotocol/registry/internal/database"
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 )
 
 // registryServiceImpl implements the RegistryService interface using our Database
diff --git a/internal/service/service.go b/internal/service/service.go
@@ -1,6 +1,6 @@
 package service
 
-import "github.com/modelcontextprotocol/registry/internal/model"
+import "github.com/modelcontextprotocol/registry/pkg/model"
 
 // RegistryService defines the interface for registry operations
 type RegistryService interface {
diff --git a/pkg/model/model.go b/pkg/model/model.go
@@ -125,4 +125,4 @@ type ServerDetail struct {
 	Server   `json:",inline" bson:",inline"`
 	Packages []Package `json:"packages,omitempty" bson:"packages,omitempty"`
 	Remotes  []Remote  `json:"remotes,omitempty" bson:"remotes,omitempty"`
-}
+}
diff --git a/tools/publisher/main.go b/tools/publisher/main.go
@@ -13,7 +13,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/modelcontextprotocol/registry/internal/model"
+	"github.com/modelcontextprotocol/registry/pkg/model"
 	"github.com/modelcontextprotocol/registry/tools/publisher/auth"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`"github.com/modelcontextprotocol/registry/internal/api"`
`15`	`15`	`"github.com/modelcontextprotocol/registry/internal/config"`
`16`	`16`	`"github.com/modelcontextprotocol/registry/internal/database"`
`17`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`17`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`18`	`18`	`"github.com/modelcontextprotocol/registry/internal/service"`
`19`	`19`	`)`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"`
`13`	`13`	`"github.com/modelcontextprotocol/registry/internal/auth"`
`14`	`14`	`"github.com/modelcontextprotocol/registry/internal/config"`
`15`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`15`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// GitHubTokenExchangeInput represents the input for GitHub token exchange`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`v0auth "github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"`
`17`	`17`	`"github.com/modelcontextprotocol/registry/internal/auth"`
`18`	`18`	`"github.com/modelcontextprotocol/registry/internal/config"`
`19`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`19`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`20`	`20`	`"github.com/stretchr/testify/assert"`
`21`	`21`	`"github.com/stretchr/testify/require"`
`22`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"`
`16`	`16`	`"github.com/modelcontextprotocol/registry/internal/auth"`
`17`	`17`	`"github.com/modelcontextprotocol/registry/internal/config"`
`18`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`18`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// GitHubOIDCTokenExchangeInput represents the input for GitHub OIDC token exchange`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"`
`12`	`12`	`internalauth "github.com/modelcontextprotocol/registry/internal/auth"`
`13`	`13`	`"github.com/modelcontextprotocol/registry/internal/config"`
`14`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`14`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`15`	`15`	`"github.com/stretchr/testify/assert"`
`16`	`16`	`"github.com/stretchr/testify/require"`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"`
`10`	`10`	`"github.com/modelcontextprotocol/registry/internal/auth"`
`11`	`11`	`"github.com/modelcontextprotocol/registry/internal/config"`
`12`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`12`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`// NoneHandler handles anonymous authentication`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`v0auth "github.com/modelcontextprotocol/registry/internal/api/handlers/v0/auth"`
`11`	`11`	`"github.com/modelcontextprotocol/registry/internal/auth"`
`12`	`12`	`"github.com/modelcontextprotocol/registry/internal/config"`
`13`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`13`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`14`	`14`	`"github.com/stretchr/testify/assert"`
`15`	`15`	`"github.com/stretchr/testify/require"`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/danielgtaylor/huma/v2"`
`9`	`9`	`"github.com/modelcontextprotocol/registry/internal/auth"`
`10`	`10`	`"github.com/modelcontextprotocol/registry/internal/config"`
`11`		`- "github.com/modelcontextprotocol/registry/internal/model"`
	`11`	`+ "github.com/modelcontextprotocol/registry/pkg/model"`
`12`	`12`	`"github.com/modelcontextprotocol/registry/internal/service"`
`13`	`13`	`)`
`14`	`14`