summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2026-07-04 21:34:30 +0300
committerPaul Buetow <paul@buetow.org>2026-07-04 21:34:30 +0300
commit6ff28396bd501cdd3af2c6b9a8dfdb4e60618e4f (patch)
tree77801f9a29be1d7b4ff2b8283e56a2f4976c302d
parent31c7a348184872a05bb5c130c09b91c44fc0e52d (diff)
support files and templates
-rw-r--r--Magefile.go15
-rw-r--r--cmd/gonf/main.go8
-rw-r--r--internal/file/content.go52
-rw-r--r--internal/file/file.go10
-rw-r--r--internal/file/file_test.go62
-rw-r--r--internal/resource/resource.go3
6 files changed, 105 insertions, 45 deletions
diff --git a/Magefile.go b/Magefile.go
index b4ec4e7..44cfeee 100644
--- a/Magefile.go
+++ b/Magefile.go
@@ -21,12 +21,27 @@ func run(cmd string, args ...string) error {
return c.Run()
}
+// Default runs the program.
+func Default() error {
+ return Run()
+}
+
// Build compiles the binary.
func Build() error {
fmt.Println("building...")
return run("go", "build", "-o", binName, "./cmd/gonf")
}
+
+// Run builds and runs the program.
+func Run() error {
+ fmt.Println("running...")
+ if err := Build(); err != nil {
+ return err
+ }
+ return run("./"+binName, "version")
+}
+
// Test runs all unit tests.
func Test() error {
fmt.Println("testing...")
diff --git a/cmd/gonf/main.go b/cmd/gonf/main.go
index 9ce179d..9ac8563 100644
--- a/cmd/gonf/main.go
+++ b/cmd/gonf/main.go
@@ -5,8 +5,8 @@ import (
"fmt"
"os"
+ "codeberg.org/snonux/gonf/examples"
"codeberg.org/snonux/gonf/internal"
- "codeberg.org/snonux/gonf/internal/file"
"codeberg.org/snonux/gonf/internal/resources"
)
@@ -19,5 +19,9 @@ func main() {
}
resources.Init()
- file.HaveString("/tmp/foo.txt", "hi")
+
+ if err := examples.Run(); err != nil {
+ fmt.Fprintf(os.Stderr, "example run error: %v\n", err)
+ os.Exit(1)
+ }
}
diff --git a/internal/file/content.go b/internal/file/content.go
new file mode 100644
index 0000000..2bb787d
--- /dev/null
+++ b/internal/file/content.go
@@ -0,0 +1,52 @@
+package file
+
+import (
+ "bytes"
+ "fmt"
+ "os"
+ "strings"
+ "text/template"
+)
+
+func resolveContent(param, targetPath string) ([]byte, error) {
+ var content []byte
+ var err error
+
+ if strings.HasPrefix(param, "source://") {
+ sourcePath := strings.TrimPrefix(param, "source://")
+ content, err = os.ReadFile(sourcePath)
+ if err != nil {
+ return nil, fmt.Errorf("failed to read source file %s: %w", sourcePath, err)
+ }
+ } else {
+ content = []byte(param)
+ }
+
+ if strings.HasSuffix(targetPath, ".tmpl") || (strings.HasPrefix(param, "source://") && strings.HasSuffix(strings.TrimPrefix(param, "source://"), ".tmpl")) {
+ return applyTemplate(content, param)
+ }
+
+ return content, nil
+}
+
+func applyTemplate(content []byte, param string) ([]byte, error) {
+ data := make(map[string]string)
+ for _, env := range os.Environ() {
+ pair := strings.SplitN(env, "=", 2)
+ if len(pair) == 2 {
+ data[pair[0]] = pair[1]
+ }
+ }
+ data["Param"] = param
+
+ tmpl, err := template.New("resource").Parse(string(content))
+ if err != nil {
+ return nil, fmt.Errorf("template parse error: %w", err)
+ }
+
+ var buf bytes.Buffer
+ if err := tmpl.Execute(&buf, data); err != nil {
+ return nil, fmt.Errorf("template execute error: %w", err)
+ }
+ return buf.Bytes(), nil
+}
diff --git a/internal/file/file.go b/internal/file/file.go
index ee759e0..aed7b13 100644
--- a/internal/file/file.go
+++ b/internal/file/file.go
@@ -8,9 +8,15 @@ import (
"codeberg.org/snonux/gonf/internal/resource"
)
-func HaveString(path, content string) error {
+func Have(path, param string) error {
_ = resource.Register("File", path)
- return have(path, []byte(content))
+
+ content, err := resolveContent(param, path)
+ if err != nil {
+ log.Fatalf("failed to resolve content for %s: %v", path, err)
+ }
+
+ return have(path, content)
}
func getChecksum(path string) [32]byte {
diff --git a/internal/file/file_test.go b/internal/file/file_test.go
index f9f5dab..e41d7dc 100644
--- a/internal/file/file_test.go
+++ b/internal/file/file_test.go
@@ -3,6 +3,7 @@ package file
import (
"os"
"path/filepath"
+ "strings"
"testing"
)
@@ -10,17 +11,14 @@ func TestGetChecksum(t *testing.T) {
dir := t.TempDir()
path := filepath.Join(dir, "test.txt")
- // Existing file
if err := os.WriteFile(path, []byte("hello"), 0o644); err != nil {
t.Fatal(err)
}
checksum := getChecksum(path)
- if checksum == (checksum) {
- // Just verify it's not all zeros — a valid sha256 won't be
- _ = checksum
+ if checksum == [32]byte{} {
+ t.Error("expected non-zero checksum")
}
- // Non-existing file returns zero checksum
zeroChecksum := getChecksum(filepath.Join(dir, "no-such-file"))
var expectedZero [32]byte
if zeroChecksum != expectedZero {
@@ -59,7 +57,6 @@ func TestUpdateFromTmpChecksumChanged(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
- // tmp should be gone, target should exist with new content
if _, err := os.Stat(tmpPath); err == nil {
t.Error("tmp file should have been removed")
}
@@ -88,7 +85,6 @@ func TestUpdateFromTmpChecksumUnchanged(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
- // tmp should be gone, target unchanged
if _, err := os.Stat(tmpPath); err == nil {
t.Error("tmp file should have been removed")
}
@@ -105,7 +101,7 @@ func TestHaveStringCreateNewFile(t *testing.T) {
dir := t.TempDir()
path := filepath.Join(dir, "new.txt")
- if err := HaveString(path, "hello world"); err != nil {
+ if err := Have(path, "hello world"); err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -116,57 +112,43 @@ func TestHaveStringCreateNewFile(t *testing.T) {
if string(got) != "hello world" {
t.Errorf("expected 'hello world', got %q", got)
}
- // No .tmp file left behind
- if _, err := os.Stat(path + ".tmp"); err == nil {
- t.Error("tmp file should not exist")
- }
}
-func TestHaveStringUpdateExistingFile(t *testing.T) {
+func TestHaveSourceFile(t *testing.T) {
dir := t.TempDir()
- path := filepath.Join(dir, "existing.txt")
-
- if err := os.WriteFile(path, []byte("old"), 0o644); err != nil {
- t.Fatal(err)
- }
+ sourcePath := filepath.Join("..", "..", "assets", "testfiles", "test.txt")
+ targetPath := filepath.Join(dir, "target.txt")
- if err := HaveString(path, "new"); err != nil {
+ if err := Have(targetPath, "source://"+sourcePath); err != nil {
t.Fatalf("unexpected error: %v", err)
}
- got, err := os.ReadFile(path)
+ got, err := os.ReadFile(targetPath)
if err != nil {
t.Fatalf("reading file: %v", err)
}
- if string(got) != "new" {
- t.Errorf("expected 'new', got %q", got)
- }
- if _, err := os.Stat(path + ".tmp"); err == nil {
- t.Error("tmp file should not exist")
+ expected, _ := os.ReadFile(sourcePath)
+ if string(got) != string(expected) {
+ t.Errorf("expected %q, got %q", string(expected), string(got))
}
}
-func TestHaveStringNoChange(t *testing.T) {
+func TestHaveTemplateFile(t *testing.T) {
dir := t.TempDir()
- path := filepath.Join(dir, "same.txt")
- content := "unchanged content"
-
- if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
- t.Fatal(err)
- }
+ sourcePath := filepath.Join("..", "..", "assets", "testfiles", "test.tmpl")
+ targetPath := filepath.Join(dir, "target.conf")
- if err := HaveString(path, content); err != nil {
+ if err := Have(targetPath, "source://"+sourcePath); err != nil {
t.Fatalf("unexpected error: %v", err)
}
- got, err := os.ReadFile(path)
+ got, err := os.ReadFile(targetPath)
if err != nil {
t.Fatalf("reading file: %v", err)
}
- if string(got) != content {
- t.Errorf("expected %q, got %q", content, got)
- }
- if _, err := os.Stat(path + ".tmp"); err == nil {
- t.Error("tmp file should not exist")
+
+ expectedParam := "source://" + sourcePath
+ if !strings.Contains(string(got), expectedParam) {
+ t.Errorf("expected content to contain Param %q, got %q", expectedParam, string(got))
}
-} \ No newline at end of file
+}
diff --git a/internal/resource/resource.go b/internal/resource/resource.go
index b0f6057..f7951c3 100644
--- a/internal/resource/resource.go
+++ b/internal/resource/resource.go
@@ -2,6 +2,7 @@ package resource
import (
"fmt"
+ "log"
)
type Resource struct {
@@ -18,7 +19,7 @@ func Register(type_, name string) Resource {
}
if err := getRepository().register(r); err != nil {
- panic(err)
+ log.Fatalf("resource registration failed: %v", err)
}
return r