fix: Skip Mock DFS config parsing if not set

Signed-off-by: jay-dee7 <[email protected]>
containerish · Dec 21, 2023 · 7878904 · 7878904
1 parent 124cf89
commit 7878904
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/cmd/migrations/migrations.go b/cmd/migrations/migrations.go
@@ -223,7 +223,7 @@ func createOpenRegistryDatabase(ctx *cli.Context, opts *databaseOptions) (*bun.D
 	_, err = adminDB.
 		ExecContext(
 			ctx.Context,
-			"GRANT ALL PRIVILEGES ON DATABASE ?0 to ?1",
+			"GRANT ALL PRIVILEGES ON DATABASE ? to ?",
 			bun.Ident(opts.database),
 			bun.Ident(opts.username),
 		)

diff --git a/config/yaml.go b/config/yaml.go
@@ -150,6 +150,16 @@ func setDefaultsForDatabaseStore(cfg *OpenRegistryConfig) {
 }
 
 func parseAndSetMockStorageDriverOptions(cfg *OpenRegistryConfig) {
+	mockConfig := viper.GetStringMap("dfs.mock")
+	keys := make([]string, 0, len(mockConfig))
+	for k := range mockConfig {
+		keys = append(keys, k)
+	}
+
+	// skip is mock config is absent
+	if len(keys) == 0 {
+		return
+	}
 	mockDFSType := viper.GetString("dfs.mock.type")
 	if mockDFSType == "MemMapped" {
 		viper.Set("dfs.mock.type", MockStorageBackendMemMapped)

diff --git a/store/v1/emails/emails_impl.go b/store/v1/emails/emails_impl.go
@@ -34,16 +34,17 @@ func (es *emailStore) AddVerifyEmail(ctx context.Context, userID uuid.UUID, toke
 }
 
 func (es *emailStore) DeleteVerifyEmail(ctx context.Context, userID uuid.UUID) error {
-	if _, err := es.db.NewDelete().Model(&types.Email{}).Where("user_id = ?1", userID).Exec(ctx); err != nil {
+	if _, err := es.db.NewDelete().Model(&types.Email{}).Where("user_id = ?", userID).Exec(ctx); err != nil {
 		return v2.WrapDatabaseError(err, v2.DatabaseOperationDelete)
 	}
 
 	return nil
 }
 
 func (es *emailStore) GetVerifyEmail(ctx context.Context, userID uuid.UUID) (uuid.UUID, error) {
-	email := &types.Email{}
-	if err := es.db.NewSelect().Model(email).Where("user_id = ?1", userID).Scan(ctx); err != nil {
+	var email types.Email
+
+	if err := es.db.NewSelect().Model(&email).Where("user_id = ?", userID).Scan(ctx); err != nil {
 		return uuid.UUID{}, v2.WrapDatabaseError(err, v2.DatabaseOperationRead)
 	}
 

diff --git a/store/v1/users/users_impl.go b/store/v1/users/users_impl.go
@@ -191,7 +191,7 @@ func (us *userStore) githubUserExists(ctx context.Context, username, email strin
 		NewSelect().
 		Model(&types.User{}).
 		Where(
-			"identities->'github'->>'email' = ?1 or identities->'github'->>'username' = ?",
+			"identities->'github'->>'email' = ? or identities->'github'->>'username' = ?",
 			bun.Ident(email),
 			bun.Ident(username),
 		).
@@ -210,7 +210,7 @@ func (us *userStore) webAuthnUserExists(ctx context.Context, username, email str
 		NewSelect().
 		Model(&types.User{}).
 		Where(
-			"identities->'webauthn'->>'email' = ?1 or identities->'webauthn'->>'username' = ?",
+			"identities->'webauthn'->>'email' = ? or identities->'webauthn'->>'username' = ?",
 			bun.Ident(email),
 			bun.Ident(username),
 		).

diff --git a/store/v1/webauthn/webauthn_impl.go b/store/v1/webauthn/webauthn_impl.go
@@ -158,7 +158,7 @@ func (ws *webauthnStore) WebauthnUserExists(ctx context.Context, email, username
 		NewSelect().
 		Model(&types.User{}).
 		Where(
-			"identities->'webauthn'->>'email' = ?1 or identities->'webauthn'->>'username' = ?",
+			"identities->'webauthn'->>'email' = ? or identities->'webauthn'->>'username' = ?",
 			bun.Ident(email),
 			bun.Ident(username),
 		).