🧪 enable no auth

This commit is contained in:
Fenny
2020-11-27 15:21:43 +01:00
parent 4e9dcd8d12
commit 2fc023c798
4 changed files with 13 additions and 16 deletions

View File

@@ -9,10 +9,7 @@ jobs:
arangodb:
image: 'arangodb:latest'
env:
ARANGO_DATABASE: fiber
ARANGO_USER: username
ARANGO_PASSWORD: password
ARANGO_ROOT_PASSWORD: password
ARANGO_NO_AUTH: 1
ports:
- '8529:8529'
strategy:
@@ -32,7 +29,3 @@ jobs:
uses: actions/checkout@v2
- name: Run Test
run: cd ./arangodb && go test ./... -v -race
env:
ARANGO_DATABASE: fiber
ARANGO_USERNAME: username
ARANGO_PASSWORD: password

View File

@@ -34,9 +34,9 @@ type model struct {
}
// New creates a new storage
func New(config Config) *Storage {
func New(config ...Config) *Storage {
// Set default config
cfg := configDefault(config)
cfg := configDefault(config...)
// create connection object to arango
conn, err := http.NewConnection(http.ConnectionConfig{

View File

@@ -1,7 +1,6 @@
package arangodb
import (
"os"
"testing"
"time"
@@ -9,9 +8,6 @@ import (
)
var testStore = New(Config{
Database: os.Getenv("ARANGODB_DATABASE"),
Username: os.Getenv("ARANGODB_USERNAME"),
Password: os.Getenv("ARANGODB_PASSWORD"),
Reset: true,
})

View File

@@ -58,7 +58,15 @@ var ConfigDefault = Config{
}
// Helper function to set default values
func configDefault(cfg Config) Config {
func configDefault(config ...Config) Config {
// Return default config if nothing provided
if len(config) < 1 {
return ConfigDefault
}
// Override default config
cfg := config[0]
// Set default values
if cfg.Host == "" {
cfg.Host = ConfigDefault.Host