Skip to content

Agent Mesh

address review

Antonio Ojea835cf3757509
diff --git a/cmd/nano-init/main.go b/cmd/nano-init/main.go
index 0545f9f1..d471da13 100644
--- a/cmd/nano-init/main.go
+++ b/cmd/nano-init/main.go
@@ -490,14 +490,14 @@ func copyFile(src, dest string) error {
if err != nil {
return err
}
- defer func() { _ = in.Close() }()
-
+ defer in.Close()
out, err := os.OpenFile(dest, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)
if err != nil {
return err
}
- defer func() { _ = out.Close() }()
-
- _, err = io.Copy(out, in)
- return err
+ if _, err = io.Copy(out, in); err != nil {
+ out.Close()
+ return err
+ }
+ return out.Close()
}
diff --git a/internal/identity/biscuit.go b/internal/identity/biscuit.go
index aaadf9d6..c02c1c6c 100644
--- a/internal/identity/biscuit.go
+++ b/internal/identity/biscuit.go
@@ -114,7 +114,7 @@ func MintBiscuitToken(signingKey ed25519.PrivateKey, claims jwt.MapClaims, token
for r := range resolvedRoles {
if strings.HasPrefix(r, "sam:role:") {
hasCapabilityRoles = true
- } else {
+ } else if r != requestedRole {
customAccessRoles = append(customAccessRoles, r)
}
}