experimental: Rename struct SyncgroupPrefix to a more generic 'TableRow'
Based on changes in https://vanadium-review.googlesource.com/#/c/16928/
MultiPart: 2/2
Change-Id: Ib9994734ca736529b6059aeaa80bee80cb20c5c7
diff --git a/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go b/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
index 1aaa9a9..1ee3909 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
@@ -50,13 +50,13 @@
sbutil.AddPermsForPattern(&sgAcl, admin, access.AllTypicalTags()...)
// Maps all syncgroup prefixes to ACLs.
- prefixSpec := make(map[nosql_wire.SyncgroupPrefix]access.Permissions)
+ prefixSpec := make(map[nosql_wire.TableRow]access.Permissions)
// StreamDef : <devId>
// Admin client has full permissions, measured drops to readonly.
- prefixStreamDef := nosql_wire.SyncgroupPrefix{
+ prefixStreamDef := nosql_wire.TableRow{
TableName: sbmodel.KStreamDef{}.Table(),
- RowPrefix: devId,
+ Row: devId,
}
aclStreamDef := access.Permissions{}
sbutil.AddPermsForPrincipal(&aclStreamDef, v23.GetPrincipal(ctx), access.Resolve, access.Read)
@@ -65,20 +65,20 @@
// DataPoint : <devId>
// Admin client has full permissions, measured drops to read/write.
- prefixDataPoint := nosql_wire.SyncgroupPrefix{
+ prefixDataPoint := nosql_wire.TableRow{
TableName: sbmodel.KDataPoint{}.Table(),
- RowPrefix: devId,
+ Row: devId,
}
aclDataPoint := access.Permissions{}
sbutil.AddPermsForPrincipal(&aclDataPoint, v23.GetPrincipal(ctx), access.Resolve, access.Read, access.Write)
sbutil.AddPermsForPattern(&aclDataPoint, admin, access.AllTypicalTags()...)
prefixSpec[prefixDataPoint] = aclDataPoint
- var prefixes []nosql_wire.SyncgroupPrefix
+ var prefixes []nosql_wire.TableRow
// Apply prefix ACLs to all syncgroup prefixes.
for prefix, prefixAcl := range prefixSpec {
// Ignore ErrNoAccess, assume we already dropped permissions.
- err := db.Table(prefix.TableName).SetPrefixPermissions(ctx, nosql.Prefix(prefix.RowPrefix), prefixAcl)
+ err := db.Table(prefix.TableName).SetPrefixPermissions(ctx, nosql.Prefix(prefix.Row), prefixAcl)
if err != nil && verror.ErrorID(err) != verror.ErrNoAccess.ID {
return err
}
