all: apply modernisers
Test / Create distribution (push) Successful in 58s
Test / Sandbox (push) Successful in 2m48s
Test / ShareFS (push) Successful in 3m53s
Test / Hakurei (push) Successful in 4m0s
Test / Sandbox (race detector) (push) Successful in 5m37s
Test / Hakurei (race detector) (push) Successful in 6m40s
Test / Flake checks (push) Successful in 1m12s
Test / Create distribution (push) Successful in 58s
Test / Sandbox (push) Successful in 2m48s
Test / ShareFS (push) Successful in 3m53s
Test / Hakurei (push) Successful in 4m0s
Test / Sandbox (race detector) (push) Successful in 5m37s
Test / Hakurei (race detector) (push) Successful in 6m40s
Test / Flake checks (push) Successful in 1m12s
Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -6,6 +6,7 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"hakurei.app/check"
|
||||
)
|
||||
@@ -78,17 +79,17 @@ type FSImplError struct{ Value FilesystemConfig }
|
||||
|
||||
func (f FSImplError) Error() string {
|
||||
implType := reflect.TypeOf(f.Value)
|
||||
var name string
|
||||
for implType != nil && implType.Kind() == reflect.Ptr {
|
||||
name += "*"
|
||||
var buf strings.Builder
|
||||
for implType != nil && implType.Kind() == reflect.Pointer {
|
||||
buf.WriteByte('*')
|
||||
implType = implType.Elem()
|
||||
}
|
||||
if implType != nil {
|
||||
name += implType.Name()
|
||||
buf.WriteString(implType.Name())
|
||||
} else {
|
||||
name += "nil"
|
||||
buf.WriteString("nil")
|
||||
}
|
||||
return fmt.Sprintf("implementation %s not supported", name)
|
||||
return "implementation " + buf.String() + " not supported"
|
||||
}
|
||||
|
||||
// FilesystemConfigJSON is the [json] adapter for [FilesystemConfig].
|
||||
|
||||
+2
-2
@@ -103,7 +103,7 @@ func TestFilesystemConfigJSON(t *testing.T) {
|
||||
t.Run("marshal", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
wantErr := tc.wantErr
|
||||
if errors.As(wantErr, new(hst.FSTypeError)) {
|
||||
if _, ok := errors.AsType[hst.FSTypeError](wantErr); ok {
|
||||
// for unsupported implementation tc
|
||||
wantErr = hst.FSImplError{Value: stubFS{"cat"}}
|
||||
}
|
||||
@@ -139,7 +139,7 @@ func TestFilesystemConfigJSON(t *testing.T) {
|
||||
t.Run("unmarshal", func(t *testing.T) {
|
||||
t.Parallel()
|
||||
if tc.data == "\x00" && tc.sData == "\x00" {
|
||||
if errors.As(tc.wantErr, new(hst.FSImplError)) {
|
||||
if _, ok := errors.AsType[hst.FSImplError](tc.wantErr); ok {
|
||||
// this error is only returned on marshal
|
||||
return
|
||||
}
|
||||
|
||||
+1
-6
@@ -43,18 +43,13 @@ func (e *FSEphemeral) Apply(z *ApplyState) {
|
||||
return
|
||||
}
|
||||
|
||||
size := e.Size
|
||||
if size < 0 {
|
||||
size = 0
|
||||
}
|
||||
|
||||
perm := e.Perm
|
||||
if perm == 0 {
|
||||
perm = fsEphemeralDefaultPerm
|
||||
}
|
||||
|
||||
if e.Write {
|
||||
z.Tmpfs(e.Target, size, perm)
|
||||
z.Tmpfs(e.Target, max(e.Size, 0), perm)
|
||||
} else {
|
||||
z.Readonly(e.Target, perm)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user