dan/combluotion
dan/combluotion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: dan:fe860fbc8290f1c35fa75c4fbbb34d33b5e05563
Branches Tags
dan:stable
dan:develop
..
compare: dan:6f06adc37d30b2e955b086f1c9c163402cc9e950
Branches Tags
dan:develop
dan:stable

No commits in common. "fe860fbc8290f1c35fa75c4fbbb34d33b5e05563" and "6f06adc37d30b2e955b086f1c9c163402cc9e950" have entirely different histories.
fe860fbc82 ... 6f06adc37d

10 changed files with 22 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Taskfile.yml
View file

@ -43,20 +43,12 @@ tasks:
cmds:
- staticcheck ./...
vuln:
desc: Check for vulnerabilities
sources:
- '**/*.go'
cmds:
- govulncheck ./...
lint:
analyze:
desc: Do static analysis
deps:
- vet
- critic
- staticcheck
- vuln
test:
desc: Run unit tests

1
app.go
View file

@ -33,7 +33,6 @@ func NewApp(ver string, conf config.Config, db store.Store) (*App, error) {
app := App{
version: ver,
conf: conf,
storage: db,
}
selfIRI := boxap.DefaultServiceIRI(conf.BaseURL())

25
app_test.go
View file

@ -78,31 +78,6 @@ func TestService(t *testing.T) {
}
}
func TestAppStorage(t *testing.T) {
th := setupAppTest(t)
base := "http://localhost:1234/"
th.conf.EXPECT().BaseURL().Return(base).MinTimes(1)
th.conf.EXPECT().Name().Return("").AnyTimes()
a, er := NewApp("0.0.0.0", th.conf, th.store)
assert.NoError(t, er)
if assert.NotNil(t, a) {
assert.Equal(t, th.store, a.Storage())
}
}
func TestAppUser(t *testing.T) {
// TODO: Actually fill this out at some point
th := setupAppTest(t)
base := "http://localhost:1234/"
th.conf.EXPECT().BaseURL().Return(base).MinTimes(1)
th.conf.EXPECT().Name().Return("").AnyTimes()
a, er := NewApp("0.0.0.0", th.conf, th.store)
assert.NoError(t, er)
if assert.NotNil(t, a) {
assert.Zero(t, a.User())
}
}
func TestStrings(t *testing.T) {
cases := [...]struct {
given string

1
cmd/combluotion/main.go
View file

@ -49,7 +49,6 @@ func getTomlFile() string {
var confStr = `
base_url = "http://localhost:4523/"
env = "dev"
[stores]
store = "sqlite"

40
config/config_test.go
View file

@ -3,7 +3,6 @@ package config
import (
"testing"
"github.com/BurntSushi/toml"
"github.com/stretchr/testify/assert"
)
@ -13,7 +12,7 @@ func TestEnvDefaultsToDev(t *testing.T) {
}
func TestInvalidEnvReturnsDev(t *testing.T) {
c := config{env: Env(255)}
c := config{env: Env("foobar")}
assert.Equal(t, Dev, c.Env())
}
@ -25,40 +24,3 @@ func TestValidEnvReturnsCorrect(t *testing.T) {
})
}
}
func TestConfigBaseURL(t *testing.T) {
c := config{baseURL: "https://me.goodevilgenius.org"}
assert.Equal(t, c.baseURL, c.BaseURL())
}
func TestConfigStoreName(t *testing.T) {
c := config{stores: stores{store: "cockroachdb"}}
assert.Equal(t, c.stores.store, c.StoreName())
}
func TestStoresMissingStore(t *testing.T) {
ss := stores{}
st, er := ss.GetStore("cockroachdb")
assert.Nil(t, st)
assert.ErrorIs(t, er, ErrMissingStore)
}
var mockToml = `
[cockroachdb]
dsn = "cockroachdb://user:pass@127.0.0.1:26257/combluotion"
`
type mockConn struct {
CockroachDB toml.Primitive
}
func TestStoreMap(t *testing.T) {
var conn mockConn
md, _ := toml.Decode(mockToml, &conn)
st := store{"cockroachdb", conn.CockroachDB, md}
m, er := st.Map()
assert.NoError(t, er)
assert.Equal(t, "cockroachdb://user:pass@127.0.0.1:26257/combluotion", m["dsn"])
}

44
config/env.go
View file

@ -1,20 +1,12 @@
package config
import (
"errors"
"fmt"
"strings"
)
//go:generate stringer -type Env
type Env uint8
type Env string
const (
Dev Env = iota + 1
Prod
Qa
Test
Dev Env = "dev"
Prod Env = "prod"
Qa Env = "qa"
Test Env = "test"
)
var Envs = [...]Env{
@ -24,28 +16,6 @@ var Envs = [...]Env{
Test,
}
func (e Env) MarshalText() ([]byte, error) {
return []byte(e.String()), nil
}
var ErrEnvUnmarshal = errors.New("unable to unmarshal value")
func (e *Env) UnmarshalText(text []byte) error {
if e == nil {
return fmt.Errorf("%w: nil pointer", ErrEnvUnmarshal)
}
val := strings.ToUpper(string(text))
for _, ee := range Envs {
if val == strings.ToUpper(ee.String()) {
*e = ee
return nil
}
}
return fmt.Errorf("%w: invalid value: %s", ErrEnvUnmarshal, text)
}
func ValidEnvOrDev(e Env) Env {
if ValidEnv(e) {
return e
@ -61,3 +31,7 @@ func ValidEnv(env Env) bool {
}
return false
}
func (e Env) String() string {
return string(e)
}

27
config/env_string.go
View file

@ -1,27 +0,0 @@
// Code generated by "stringer -type Env"; DO NOT EDIT.
package config
import "strconv"
func _() {
// An "invalid array index" compiler error signifies that the constant values have changed.
// Re-run the stringer command to generate them again.
var x [1]struct{}
_ = x[Dev-1]
_ = x[Prod-2]
_ = x[Qa-3]
_ = x[Test-4]
}
const _Env_name = "DevProdQaTest"
var _Env_index = [...]uint8{0, 3, 7, 9, 13}
func (i Env) String() string {
i -= 1
if i >= Env(len(_Env_index)-1) {
return "Env(" + strconv.FormatInt(int64(i+1), 10) + ")"
}
return _Env_name[_Env_index[i]:_Env_index[i+1]]
}

80
config/env_test.go
View file

@ -1,81 +1,21 @@
package config
import (
"encoding"
"fmt"
"strings"
"testing"
"github.com/stretchr/testify/assert"
)
var _ encoding.TextMarshaler = Env(0)
var _ encoding.TextUnmarshaler = new(Env)
var _ fmt.Stringer = Env(0)
func TestEnvString(t *testing.T) {
testcases := []struct {
expected string
val Env
}{
{"Dev", Dev},
{"Prod", Prod},
{"Qa", Qa},
{"Test", Test},
{"Env(0)", Env(0)},
{"Env(255)", Env(255)},
}
for _, testcase := range testcases {
t.Run(testcase.expected, func(sub *testing.T) {
assert.Equal(t, testcase.expected, testcase.val.String())
by, er := testcase.val.MarshalText()
assert.NoError(t, er)
assert.Equal(t, []byte(testcase.expected), by)
cases := Envs[:]
cases = append(cases, Env("foobar"), Env(""), Env("42"), Env("✨"))
for _, e := range cases {
t.Run(string(e), func(t *testing.T) {
assert.Equal(t, string(e), e.String())
})
}
}
type unmarshaltest struct {
name string
in []byte
exp Env
err string
}
func TestEnvUnmarshalText(t *testing.T) {
testcases := []unmarshaltest{
{"empty", []byte{}, Env(0), "invalid value: "},
{"bad value", []byte("foobar"), Env(0), "invalid value: foobar"},
}
for _, e := range Envs {
testcases = append(testcases, unmarshaltest{e.String() + "-lower", []byte(strings.ToLower(e.String())), e, ""})
testcases = append(testcases, unmarshaltest{e.String() + "-upper", []byte(strings.ToUpper(e.String())), e, ""})
testcases = append(testcases, unmarshaltest{e.String(), []byte(e.String()), e, ""})
}
for _, testcase := range testcases {
t.Run(testcase.name, func(sub *testing.T) {
var e Env
er := (&e).UnmarshalText(testcase.in)
if testcase.err == "" {
assert.NoError(t, er)
assert.Equal(t, testcase.exp, e)
} else {
assert.Empty(t, e)
assert.ErrorContains(t, er, testcase.err)
assert.ErrorIs(t, er, ErrEnvUnmarshal)
}
})
}
}
func TestEnvUnmarshalTextNil(t *testing.T) {
var e *Env
er := e.UnmarshalText([]byte("prod"))
assert.ErrorContains(t, er, "nil pointer")
assert.ErrorIs(t, er, ErrEnvUnmarshal)
}
func TestValidEnv(t *testing.T) {
cases := [...]struct {
e Env
@ -85,8 +25,9 @@ func TestValidEnv(t *testing.T) {
{Prod, true},
{Qa, true},
{Test, true},
{Env(0), false},
{Env(255), false},
{Env("foobar"), false},
{Env(""), false},
{Env("✨"), false},
}
for _, c := range cases {
@ -105,8 +46,9 @@ func TestValidEnvOrDev(t *testing.T) {
{Prod, Prod},
{Qa, Qa},
{Test, Test},
{Env(0), Dev},
{Env(255), Dev},
{Env("foobar"), Dev},
{Env(""), Dev},
{Env("✨"), Dev},
}
for _, c := range cases {

2
config/load_test.go
View file

@ -23,7 +23,6 @@ func TestLoadTomlGood(t *testing.T) {
defer os.Remove(tmp.Name())
defer tmp.Close()
fmt.Fprintln(tmp, `name = "Cool"`)
fmt.Fprintln(tmp, `env = "prod"`)
fmt.Fprintln(tmp, "[stores]")
fmt.Fprintln(tmp, `store = "sqlite"`)
fmt.Fprintln(tmp, "[stores.settings.sqlite]")
@ -32,7 +31,6 @@ func TestLoadTomlGood(t *testing.T) {
c, e := LoadFromToml(tmp.Name())
assert.NoError(t, e)
assert.Equal(t, "Cool", c.Name())
assert.Equal(t, Prod, c.Env())
st, err := c.Store("")
assert.NoError(t, err)

11
store/factory_test.go
View file

@ -1,7 +1,6 @@
package store
import (
"errors"
"testing"
"github.com/stretchr/testify/assert"
@ -93,13 +92,3 @@ func TestMakeStoreNoName(t *testing.T) {
assert.NotNil(t, s)
assert.NoError(t, e)
}
func TestMakeStoreConfError(t *testing.T) {
th := setupFactoryTest(t)
mockError := errors.New("leave me alone")
th.conf.EXPECT().Store("mock").Return(nil, mockError)
s, e := MakeStore("mock", th.conf)
assert.Zero(t, s)
assert.ErrorIs(t, e, mockError)
}