adyxax/gonf
1
0
Fork 0
Code Issues Activity

chore(gonf): add a DECLARED promise status and make it the default instead of PROMISED

Browse source
This commit is contained in:
Julien Dessaux 2024-09-04 09:11:35 +02:00
parent 48f2e9a2cb
commit 00cb3a2488
Signed by: adyxax
GPG key ID: F92E51B86E07177E
6 changed files with 49 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/commands.go
View file

@ -23,7 +23,7 @@ func CommandWithEnv(env []string, cmd string, args ...string) *CommandPromise {
cmd: cmd,
env: env,
err: nil,
status: PROMISED,
status: DECLARED,
}
}
@ -44,7 +44,10 @@ func (c *CommandPromise) IfRepaired(p ...Promise) Promise {
}
func (c *CommandPromise) Promise() *CommandPromise {
commands = append(commands, c)
if c.status == DECLARED {
c.status = PROMISED
commands = append(commands, c)
}
return c
}

9
pkg/files.go
View file

@ -45,7 +45,7 @@ func Directory(filename any) *FilePromise {
filename: interfaceToTemplateValue(filename),
fileType: DIRECTORY,
permissions: nil,
status: PROMISED,
status: DECLARED,
}
}
@ -58,7 +58,7 @@ func File(filename any) *FilePromise {
filename: interfaceToTemplateValue(filename),
fileType: FILE,
permissions: nil,
status: PROMISED,
status: DECLARED,
}
}
@ -88,7 +88,10 @@ func (f *FilePromise) IfRepaired(p ...Promise) Promise {
}
func (f *FilePromise) Promise() *FilePromise {
files = append(files, f)
if f.status == DECLARED {
f.status = PROMISED
files = append(files, f)
}
return f
}

7
pkg/packages.go
View file

@ -19,7 +19,7 @@ func Package(names ...string) *PackagePromise {
chain: nil,
err: nil,
names: names,
status: PROMISED,
status: DECLARED,
}
}
@ -36,7 +36,10 @@ func (p *PackagePromise) IfRepaired(ps ...Promise) Promise {
}
func (p *PackagePromise) Promise() *PackagePromise {
packages = append(packages, p)
if p.status == DECLARED {
p.status = PROMISED
packages = append(packages, p)
}
return p
}

5
pkg/promises.go
View file

@ -9,7 +9,8 @@ type Promise interface {
type Status int
const (
PROMISED = iota
DECLARED = iota
PROMISED
BROKEN
KEPT
REPAIRED
@ -17,6 +18,8 @@ const (
func (s Status) String() string {
switch s {
case DECLARED:
return "declared"
case PROMISED:
return "promised"
case BROKEN:

20
stdlib/backups/borg/client.go
View file

@ -33,13 +33,18 @@ type BorgClient struct {
status gonf.Status
}
var borgClient *BorgClient = nil
func (b *BorgClient) IfRepaired(p ...gonf.Promise) gonf.Promise {
b.chain = append(b.chain, p...)
return b
}
func (b *BorgClient) Promise() *BorgClient {
gonf.MakeCustomPromise(b).Promise()
if b.status == gonf.DECLARED {
b.status = gonf.PROMISED
gonf.MakeCustomPromise(b).Promise()
}
return b
}
@ -101,12 +106,15 @@ func (b BorgClient) Status() gonf.Status {
}
func Client() *BorgClient {
return &BorgClient{
chain: nil,
jobs: make(map[string]*Job),
path: "/etc/borg/",
status: gonf.PROMISED,
if borgClient == nil {
borgClient = &BorgClient{
chain: nil,
jobs: make(map[string]*Job),
path: "/etc/borg/",
status: gonf.DECLARED,
}
}
return borgClient
}
func (b *BorgClient) Add(name string, path string, privateKey []byte, hostname string) *BorgClient {

22
stdlib/backups/borg/server.go
View file

@ -15,13 +15,18 @@ type BorgServer struct {
status gonf.Status
}
var borgServer *BorgServer = nil
func (b *BorgServer) IfRepaired(p ...gonf.Promise) gonf.Promise {
b.chain = append(b.chain, p...)
return b
}
func (b *BorgServer) Promise() *BorgServer {
gonf.MakeCustomPromise(b).Promise()
if b.status == gonf.DECLARED {
b.status = gonf.PROMISED
gonf.MakeCustomPromise(b).Promise()
}
return b
}
@ -80,13 +85,16 @@ func (b BorgServer) Status() gonf.Status {
}
func Server() *BorgServer {
return &BorgServer{
chain: nil,
clients: make(map[string][]byte),
path: "/srv/borg/",
user: "borg",
status: gonf.PROMISED,
if borgServer == nil {
borgServer = &BorgServer{
chain: nil,
clients: make(map[string][]byte),
path: "/srv/borg/",
user: "borg",
status: gonf.DECLARED,
}
}
return borgServer
}
func (b *BorgServer) Add(name string, publicKey []byte) *BorgServer {