Frando/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Projects Releases Wiki Activity

test: fix imports

Browse Source
This commit is contained in:
decentral1se
2024-07-07 12:03:37 +02:00
parent 0076b31253
commit c5211fbd7e
2 changed files with 59 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/envfile/envfile_test.go
View File

@ -9,9 +9,9 @@ import (
"strings"
"testing"
"coopcloud.tech/abra/pkg/app"
appPkg "coopcloud.tech/abra/pkg/app"
"coopcloud.tech/abra/pkg/config"
"coopcloud.tech/abra/pkg/envfile"
"coopcloud.tech/abra/pkg/recipe"
)
@ -31,12 +31,12 @@ var (
ServerName = "evil.corp"
)
var ExpectedAppEnv = app.AppEnv{
var ExpectedAppEnv = envfile.AppEnv{
"DOMAIN": "ecloud.evil.corp",
"RECIPE": "ecloud",
}
var ExpectedApp = app.App{
var ExpectedApp = appPkg.App{
Name: AppName,
Recipe: ExpectedAppEnv["RECIPE"],
Domain: ExpectedAppEnv["DOMAIN"],
@ -45,12 +45,12 @@ var ExpectedApp = app.App{
Server: ExpectedAppFile.Server,
}
var ExpectedAppFile = app.AppFile{
var ExpectedAppFile = appPkg.AppFile{
Path: path.Join(ValidAbraConf, "servers", ServerName, AppName+".env"),
Server: ServerName,
}
var ExpectedAppFiles = map[string]app.AppFile{
var ExpectedAppFiles = map[string]appPkg.AppFile{
AppName: ExpectedAppFile,
}
@ -79,7 +79,7 @@ func TestGetAllFilesInDirectory(t *testing.T) {
}
func TestReadEnv(t *testing.T) {
env, err := app.ReadEnv(ExpectedAppFile.Path)
env, err := envfile.ReadEnv(ExpectedAppFile.Path)
if err != nil {
t.Fatal(err)
}
@ -102,7 +102,7 @@ func TestReadAbraShEnvVars(t *testing.T) {
}
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, r.Name, "abra.sh")
abraShEnv, err := app.ReadAbraShEnvVars(abraShPath)
abraShEnv, err := envfile.ReadAbraShEnvVars(abraShPath)
if err != nil {
t.Fatal(err)
}
@ -132,7 +132,7 @@ func TestReadAbraShCmdNames(t *testing.T) {
}
abraShPath := fmt.Sprintf("%s/%s/%s", config.RECIPES_DIR, r.Name, "abra.sh")
cmdNames, err := app.ReadAbraShCmdNames(abraShPath)
cmdNames, err := appPkg.ReadAbraShCmdNames(abraShPath)
if err != nil {
t.Fatal(err)
}
@ -157,12 +157,12 @@ func TestCheckEnv(t *testing.T) {
}
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
envSample, err := app.ReadEnv(envSamplePath)
envSample, err := envfile.ReadEnv(envSamplePath)
if err != nil {
t.Fatal(err)
}
app := app.App{
app := appPkg.App{
Name: "test-app",
Recipe: r.Name,
Domain: "example.com",
@ -191,14 +191,14 @@ func TestCheckEnvError(t *testing.T) {
}
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
envSample, err := app.ReadEnv(envSamplePath)
envSample, err := envfile.ReadEnv(envSamplePath)
if err != nil {
t.Fatal(err)
}
delete(envSample, "DOMAIN")
app := app.App{
app := appPkg.App{
Name: "test-app",
Recipe: r.Name,
Domain: "example.com",
@ -227,7 +227,7 @@ func TestEnvVarCommentsRemoved(t *testing.T) {
}
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
envSample, err := app.ReadEnv(envSamplePath)
envSample, err := envfile.ReadEnv(envSamplePath)
if err != nil {
t.Fatal(err)
}
@ -259,7 +259,7 @@ func TestEnvVarModifiersIncluded(t *testing.T) {
}
envSamplePath := path.Join(config.RECIPES_DIR, r.Name, ".env.sample")
envSample, modifiers, err := app.ReadEnvWithModifiers(envSamplePath)
envSample, modifiers, err := envfile.ReadEnvWithModifiers(envSamplePath)
if err != nil {
t.Fatal(err)
}