ref: required by v.io/c/14484
MultiPart: 2/3
Change-Id: Ia9270f65a732e5002ee52365103d782a6cdb9a2c
diff --git a/lib/security/securityflag/flag_test.go b/lib/security/securityflag/flag_test.go
index 6e9fbcc..47a00a9 100644
--- a/lib/security/securityflag/flag_test.go
+++ b/lib/security/securityflag/flag_test.go
@@ -59,7 +59,7 @@
return "", err
}
defer f.Close()
- if err := perms.WriteTo(f); err != nil {
+ if err := access.WritePermissions(f, perms); err != nil {
return "", err
}
return f.Name(), nil
diff --git a/services/device/deviced/internal/impl/perms/perms_test.go b/services/device/deviced/internal/impl/perms/perms_test.go
index 57645b0..0d3f838 100644
--- a/services/device/deviced/internal/impl/perms/perms_test.go
+++ b/services/device/deviced/internal/impl/perms/perms_test.go
@@ -157,7 +157,7 @@
expectedAccessList[string(tag)] = access.AccessList{In: []security.BlessingPattern{"root/$", "root/self/$", "root/self/mydevice/$"}}
}
var b bytes.Buffer
- if err := expectedAccessList.WriteTo(&b); err != nil {
+ if err := access.WritePermissions(&b, expectedAccessList); err != nil {
t.Fatalf("Failed to save AccessList:%v", err)
}
// Note, "version" below refers to the Permissions version, not the device
diff --git a/services/internal/pathperms/permsaccess.go b/services/internal/pathperms/permsaccess.go
index 2a42d02..5c5d785 100644
--- a/services/internal/pathperms/permsaccess.go
+++ b/services/internal/pathperms/permsaccess.go
@@ -177,7 +177,7 @@
ctx.Errorf("Failed to create NewSigningWriteCloser:%v", err)
return verror.New(ErrOperationFailed, nil)
}
- if err = perms.WriteTo(writer); err != nil {
+ if err = access.WritePermissions(writer, perms); err != nil {
ctx.Errorf("Failed to SavePermissions:%v", err)
return verror.New(ErrOperationFailed, nil)
}
diff --git a/services/internal/pathperms/version.go b/services/internal/pathperms/version.go
index 1cdf2d5..c278e39 100644
--- a/services/internal/pathperms/version.go
+++ b/services/internal/pathperms/version.go
@@ -17,7 +17,7 @@
// use to determine if the Permissions have been asynchronously modified.
func ComputeVersion(perms access.Permissions) (string, error) {
b := new(bytes.Buffer)
- if err := perms.WriteTo(b); err != nil {
+ if err := access.WritePermissions(b, perms); err != nil {
return "", err
}
