fix: tests + version

- Update code as per go 1.19.3
- Fix tests for unused vars
This commit is contained in:
Lakhan Samani
2022-11-27 20:40:45 +05:30
parent a366b2811d
commit 91d17a9b1f
31 changed files with 542 additions and 97 deletions

View File

@@ -2,10 +2,12 @@ package surrealdb
import (
"context"
"fmt"
"time"
"github.com/authorizerdev/authorizer/server/db/models"
"github.com/google/uuid"
"github.com/surrealdb/surrealdb.go"
)
// AddEnv to save environment information in database
@@ -16,12 +18,28 @@ func (p *provider) AddEnv(ctx context.Context, env models.Env) (models.Env, erro
env.CreatedAt = time.Now().Unix()
env.UpdatedAt = time.Now().Unix()
mapData := env.ToMap()
mapData[models.SurrealDbIdentifier] = env.ID
_, err := p.db.Create(models.Collections.Env, mapData)
if err != nil {
return env, err
}
return env, nil
}
// UpdateEnv to update environment information in database
func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, error) {
env.UpdatedAt = time.Now().Unix()
mapData := env.ToMap()
mapData[models.SurrealDbIdentifier] = env.ID
_, err := p.db.Update(models.Collections.Env, mapData)
if err != nil {
return env, err
}
return env, nil
}
@@ -29,5 +47,22 @@ func (p *provider) UpdateEnv(ctx context.Context, env models.Env) (models.Env, e
func (p *provider) GetEnv(ctx context.Context) (models.Env, error) {
var env models.Env
mapData, err := p.db.Select(models.Collections.Env)
if err != nil {
return env, err
}
envs := []models.Env{}
err = surrealdb.Unmarshal(mapData, &envs)
if err != nil {
return env, err
}
if len(envs) > 0 {
env = envs[0]
} else {
return env, fmt.Errorf("env record not found")
}
return env, nil
}

View File

@@ -1,20 +1,42 @@
package surrealdb
import (
"gorm.io/gorm"
"github.com/authorizerdev/authorizer/server/db/models"
"github.com/authorizerdev/authorizer/server/memorystore"
"github.com/surrealdb/surrealdb.go"
)
// TODO change following provider to new db provider
type provider struct {
db *gorm.DB
db *surrealdb.DB
}
// NewProvider returns a new SQL provider
// TODO change following provider to new db provider
func NewProvider() (*provider, error) {
var sqlDB *gorm.DB
dbURL := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseURL
db, err := surrealdb.New(dbURL)
if err != nil {
return nil, err
}
dbUsername := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabaseUsername
dbPassword := memorystore.RequiredEnvStoreObj.GetRequiredEnv().DatabasePassword
_, err = db.Signin(map[string]interface{}{
"user": dbUsername,
"pass": dbPassword,
})
if err != nil {
return nil, err
}
_, err = db.Use(models.DBNamespace, models.DBNamespace)
if err != nil {
return nil, err
}
return &provider{
db: sqlDB,
db: db,
}, nil
}