sensorlog: syncbase: Remove prefix ACLs.
Collection ACL is synced and used instead of empty prefix ACL.
Part 4 of transition plan.
MultiPart: 3/3
Change-Id: I0cfdc9fe3d3fbfbd995700702961db69b8de2009
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 4308086..2974096 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup.go
@@ -14,7 +14,6 @@
"v.io/v23/security/access"
wire "v.io/v23/services/syncbase"
"v.io/v23/syncbase"
- "v.io/v23/verror"
"v.io/x/sensorlog/internal/config"
"v.io/x/sensorlog/internal/sbmodel"
"v.io/x/sensorlog/internal/sbmodel/keyutil"
@@ -77,12 +76,8 @@
var prefixes []wire.CollectionRow
// Apply prefix ACLs to all syncgroup prefixes.
- for prefix, prefixAcl := range prefixSpec {
- // Ignore ErrNoAccess, assume we already dropped permissions.
- err := db.Collection(prefix.CollectionName).SetPrefixPermissions(ctx, syncbase.Prefix(prefix.Row), prefixAcl)
- if err != nil && verror.ErrorID(err) != verror.ErrNoAccess.ID {
- return err
- }
+ for prefix, _ := range prefixSpec {
+ // TODO(ivanpi): Prefix ACLs have been removed, use collection ACLs.
prefixes = append(prefixes, prefix)
}
diff --git a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
index a54a667..6f7044d 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/syncgroup_test.go
@@ -8,8 +8,6 @@
"reflect"
"testing"
- "v.io/v23/security"
- "v.io/v23/security/access"
_ "v.io/x/ref/runtime/factories/generic"
sbtu "v.io/x/ref/services/syncbase/testutil"
"v.io/x/sensorlog/internal/config"
@@ -50,13 +48,5 @@
}
// measured should have dropped privileges on <StreamDefCollection>/<devId>.
- expectPerms := access.Permissions{}.
- Add(security.BlessingPattern("root:one"), string(access.Resolve), string(access.Read)).
- Add(security.BlessingPattern("root:two"), string(access.Resolve), string(access.Read), string(access.Write), string(access.Admin))
- sgDataCollection := db.Collection(sbmodel.KStreamDef{}.Collection())
- if gotPerms, err := sgDataCollection.GetPrefixPermissions(ctxMeasured, devId); err != nil {
- t.Errorf("GetPrefixPermissions failed: %v", err)
- } else if got, want := gotPerms[0].Perms.Normalize(), expectPerms.Normalize(); !reflect.DeepEqual(got, want) {
- t.Errorf("Unexpected permissions on streamdef/<devId>: got %v, want %v", got, want)
- }
+ // TODO(ivanpi): Prefix ACLs have been removed, use collection ACLs.
}
