refactor: Store file structure

Signed-off-by: jay-dee7 <[email protected]>

auth/auth.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/services/email"
-	"github.com/containerish/OpenRegistry/store/v2/users"
+	"github.com/containerish/OpenRegistry/store/v1/users"
 	"github.com/containerish/OpenRegistry/telemetry"
 	gh "github.com/google/go-github/v50/github"
 	"github.com/labstack/echo/v4"

auth/github.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/containerish/OpenRegistry/config"
-	v2_types "github.com/containerish/OpenRegistry/store/v2/types"
+	v2_types "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/types"
 	"github.com/google/go-github/v53/github"
 	"github.com/google/uuid"

auth/jwt.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/uuid"
 	"golang.org/x/oauth2"

auth/jwt_middleware.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/uuid"
 	echo_jwt "github.com/labstack/echo-jwt/v4"

auth/reset_password.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/containerish/OpenRegistry/services/email"
-	v2_types "github.com/containerish/OpenRegistry/store/v2/types"
+	v2_types "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/types"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/uuid"

auth/server/webauthn_server.go

@@ -12,9 +12,9 @@ import (
 	"github.com/containerish/OpenRegistry/auth"
 	"github.com/containerish/OpenRegistry/auth/webauthn"
 	"github.com/containerish/OpenRegistry/config"
-	v2_types "github.com/containerish/OpenRegistry/store/v2/types"
-	"github.com/containerish/OpenRegistry/store/v2/users"
-	webauthn_store "github.com/containerish/OpenRegistry/store/v2/webauthn"
+	v2_types "github.com/containerish/OpenRegistry/store/v1/types"
+	"github.com/containerish/OpenRegistry/store/v1/users"
+	webauthn_store "github.com/containerish/OpenRegistry/store/v1/webauthn"
 	"github.com/containerish/OpenRegistry/telemetry"
 	"github.com/containerish/OpenRegistry/types"
 	"github.com/google/uuid"

auth/signin.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"time"
 
-	v2_types "github.com/containerish/OpenRegistry/store/v2/types"
+	v2_types "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/types"
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v4"

auth/signup.go

@@ -10,8 +10,8 @@ import (
 
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/services/email"
-	store_err "github.com/containerish/OpenRegistry/store/v2"
-	v2_types "github.com/containerish/OpenRegistry/store/v2/types"
+	store_err "github.com/containerish/OpenRegistry/store/v1"
+	v2_types "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/types"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"

auth/webauthn/types.go

@@ -1,7 +1,7 @@
 package webauthn
 
 import (
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/go-webauthn/webauthn/protocol"
 	"github.com/go-webauthn/webauthn/webauthn"
 )

auth/webauthn/webauthn.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/containerish/OpenRegistry/config"
-	webauthn_store "github.com/containerish/OpenRegistry/store/v2/webauthn"
+	webauthn_store "github.com/containerish/OpenRegistry/store/v1/webauthn"
 	"github.com/fatih/color"
 	"github.com/go-webauthn/webauthn/protocol"
 	"github.com/go-webauthn/webauthn/webauthn"

cmd/migrations/migrations.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/fatih/color"
 	"github.com/uptrace/bun"
 	"github.com/uptrace/bun/dialect/pgdialect"

cmd/migrations/migrationsGenerate.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/containerish/OpenRegistry/store/v2/migrations"
+	"github.com/containerish/OpenRegistry/store/v1/migrations"
 	"github.com/fatih/color"
 	"github.com/uptrace/bun/migrate"
 	"github.com/urfave/cli/v2"

cmd/migrations/migrationsInit.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/containerish/OpenRegistry/store/v2/migrations"
+	"github.com/containerish/OpenRegistry/store/v1/migrations"
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
 )

cmd/migrations/migrationsReset.go

@@ -1,7 +1,7 @@
 package migrations
 
 import (
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/urfave/cli/v2"
 )
 

cmd/migrations/migrationsRollback.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"errors"
 
-	"github.com/containerish/OpenRegistry/store/v2/migrations"
+	"github.com/containerish/OpenRegistry/store/v1/migrations"
 	"github.com/fatih/color"
 	"github.com/urfave/cli/v2"
 )

cmd/migrations/migrationsRun.go

@@ -1,7 +1,7 @@
 package migrations
 
 import (
-	"github.com/containerish/OpenRegistry/store/v2/migrations"
+	"github.com/containerish/OpenRegistry/store/v1/migrations"
 	"github.com/urfave/cli/v2"
 )
 

cmd/registry/registry.go

@@ -13,13 +13,13 @@ import (
 	"github.com/containerish/OpenRegistry/registry/v2/extensions"
 	"github.com/containerish/OpenRegistry/router"
 	github_actions_server "github.com/containerish/OpenRegistry/services/kon/github_actions/v1/server"
-	store_v2 "github.com/containerish/OpenRegistry/store/v2"
-	"github.com/containerish/OpenRegistry/store/v2/automation"
-	"github.com/containerish/OpenRegistry/store/v2/emails"
-	registry_store "github.com/containerish/OpenRegistry/store/v2/registry"
-	"github.com/containerish/OpenRegistry/store/v2/sessions"
-	"github.com/containerish/OpenRegistry/store/v2/users"
-	"github.com/containerish/OpenRegistry/store/v2/webauthn"
+	store_v2 "github.com/containerish/OpenRegistry/store/v1"
+	"github.com/containerish/OpenRegistry/store/v1/automation"
+	"github.com/containerish/OpenRegistry/store/v1/emails"
+	registry_store "github.com/containerish/OpenRegistry/store/v1/registry"
+	"github.com/containerish/OpenRegistry/store/v1/sessions"
+	"github.com/containerish/OpenRegistry/store/v1/users"
+	"github.com/containerish/OpenRegistry/store/v1/webauthn"
 	"github.com/containerish/OpenRegistry/telemetry"
 	"github.com/containerish/OpenRegistry/telemetry/otel"
 	"github.com/containerish/OpenRegistry/vcs/github"

dfs/dfs.go

@@ -6,7 +6,7 @@ import (
 
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 )
 
 type DFS interface {

dfs/filebase/filebase.go

@@ -12,7 +12,7 @@ import (
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	oci_digest "github.com/opencontainers/go-digest"
 )
 

dfs/mock/mockFileSystem.go

@@ -13,7 +13,7 @@ import (
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
-	types "github.com/containerish/OpenRegistry/store/v2/types"
+	types "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/fatih/color"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"

dfs/mock/storage.go

@@ -13,7 +13,7 @@ import (
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
-	types "github.com/containerish/OpenRegistry/store/v2/types"
+	types "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/fatih/color"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"

dfs/storj/storj.go

@@ -12,7 +12,7 @@ import (
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	oci_digest "github.com/opencontainers/go-digest"
 )
 

dfs/storj/uplink/uplink.go

@@ -10,7 +10,7 @@ import (
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/fatih/color"
 	"storj.io/uplink"
 	"storj.io/uplink/edge"

health-checks/checks.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/alexliesenfeld/health"
-	store_v2 "github.com/containerish/OpenRegistry/store/v2"
+	store_v2 "github.com/containerish/OpenRegistry/store/v1"
 )
 
 func NewHealthChecksAPI(pgPing store_v2.PostgresPing) http.HandlerFunc {

registry/v2/extensions/catalog_detail.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/containerish/OpenRegistry/store/v2/registry"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/registry"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/telemetry"
 	"github.com/labstack/echo/v4"
 )

registry/v2/extensions/private_images.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/labstack/echo/v4"
 )
 

registry/v2/registry.go

@@ -17,8 +17,8 @@ import (
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	dfsImpl "github.com/containerish/OpenRegistry/dfs"
-	store_v2 "github.com/containerish/OpenRegistry/store/v2/registry"
-	types_v2 "github.com/containerish/OpenRegistry/store/v2/types"
+	store_v2 "github.com/containerish/OpenRegistry/store/v1/registry"
+	types_v2 "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/telemetry"
 	"github.com/containerish/OpenRegistry/types"
 	"github.com/labstack/echo/v4"

registry/v2/repository.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/go-playground/validator/v10"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"

registry/v2/types.go

@@ -7,7 +7,7 @@ import (
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/containerish/OpenRegistry/config"
 	dfsImpl "github.com/containerish/OpenRegistry/dfs"
-	store_v2 "github.com/containerish/OpenRegistry/store/v2/registry"
+	store_v2 "github.com/containerish/OpenRegistry/store/v1/registry"
 	"github.com/containerish/OpenRegistry/telemetry"
 	"github.com/labstack/echo/v4"
 	"github.com/uptrace/bun"

router/middlewares.go

@@ -7,8 +7,8 @@ import (
 	"regexp"
 
 	"github.com/containerish/OpenRegistry/registry/v2"
-	registry_store "github.com/containerish/OpenRegistry/store/v2/registry"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	registry_store "github.com/containerish/OpenRegistry/store/v1/registry"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/labstack/echo/v4"
 	dist_spec "github.com/opencontainers/distribution-spec/specs-go/v1"
 )

router/router.go

@@ -10,7 +10,7 @@ import (
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/registry/v2"
 	"github.com/containerish/OpenRegistry/registry/v2/extensions"
-	registry_store "github.com/containerish/OpenRegistry/store/v2/registry"
+	registry_store "github.com/containerish/OpenRegistry/store/v1/registry"
 	"github.com/google/uuid"
 	"github.com/labstack/echo-contrib/prometheus"
 	"github.com/labstack/echo/v4"

services/email/createEmail.go

@@ -3,7 +3,7 @@ package email
 import (
 	"fmt"
 
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/sendgrid/sendgrid-go/helpers/mail"
 )
 

services/email/email.go

@@ -2,7 +2,7 @@ package email
 
 import (
 	"github.com/containerish/OpenRegistry/config"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/sendgrid/sendgrid-go"
 	"github.com/sendgrid/sendgrid-go/helpers/mail"
 )

services/email/sendEmail.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 )
 
 const (

services/kon/github_actions/v1/server/build_job.go

@@ -7,7 +7,7 @@ import (
 	connect_go "github.com/bufbuild/connect-go"
 	common_v1 "github.com/containerish/OpenRegistry/common/v1"
 	v1 "github.com/containerish/OpenRegistry/services/kon/github_actions/v1"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/google/go-github/v50/github"
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
 )

services/kon/github_actions/v1/server/build_project.go

@@ -7,7 +7,7 @@ import (
 	connect_go "github.com/bufbuild/connect-go"
 	common_v1 "github.com/containerish/OpenRegistry/common/v1"
 	github_actions_v1 "github.com/containerish/OpenRegistry/services/kon/github_actions/v1"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/vcs/github"
 	"github.com/google/uuid"
 	"google.golang.org/protobuf/types/known/timestamppb"

services/kon/github_actions/v1/server/server.go

@@ -10,7 +10,7 @@ import (
 	"github.com/containerish/OpenRegistry/config"
 	github_actions_v1 "github.com/containerish/OpenRegistry/services/kon/github_actions/v1"
 	connect_v1 "github.com/containerish/OpenRegistry/services/kon/github_actions/v1/github_actions_v1connect"
-	"github.com/containerish/OpenRegistry/store/v2/automation"
+	"github.com/containerish/OpenRegistry/store/v1/automation"
 	"github.com/containerish/OpenRegistry/telemetry"
 	"github.com/containerish/OpenRegistry/vcs"
 	"github.com/fatih/color"

store/v2/automation/build.go → store/v1/automation/build.go

@@ -7,7 +7,7 @@ import (
 
 	common_v1 "github.com/containerish/OpenRegistry/common/v1"
 	gha_v1 "github.com/containerish/OpenRegistry/services/kon/github_actions/v1"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/google/uuid"
 	"github.com/uptrace/bun"
 	durationpb "google.golang.org/protobuf/types/known/durationpb"

store/v2/automation/projects.go → store/v1/automation/projects.go

@@ -7,7 +7,7 @@ import (
 
 	common_v1 "github.com/containerish/OpenRegistry/common/v1"
 	github_actions_v1 "github.com/containerish/OpenRegistry/services/kon/github_actions/v1"
-	"github.com/containerish/OpenRegistry/store/v2/types"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/google/uuid"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )

store/v2/base.go → store/v1/base.go

@@ -1,4 +1,4 @@
-package v2
+package v1
 
 import (
 	"context"

store/v2/emails/emails_impl.go → store/v1/emails/emails_impl.go

@@ -3,9 +3,9 @@ package emails
 import (
 	"context"
 
-	v2 "github.com/containerish/OpenRegistry/store/v2"
-	"github.com/containerish/OpenRegistry/store/v2/types"
-	"github.com/containerish/OpenRegistry/store/v2/users"
+	v2 "github.com/containerish/OpenRegistry/store/v1"
+	"github.com/containerish/OpenRegistry/store/v1/types"
+	"github.com/containerish/OpenRegistry/store/v1/users"
 	"github.com/google/uuid"
 	"github.com/uptrace/bun"
 )

store/v2/error_builder.go → store/v1/error_builder.go

@@ -1,4 +1,4 @@
-package v2
+package v1
 
 import (
 	"errors"