Browse Source

fix compilation

pull/8043/merge
Chris Lu 3 days ago
parent
commit
31a1c87db0
  1. 8
      weed/credential/filer_etc/filer_etc_identity.go

8
weed/credential/filer_etc/filer_etc_identity.go

@ -217,10 +217,12 @@ func (store *FilerEtcStore) SaveConfiguration(ctx context.Context, config *iam_p
for _, entry := range entries { for _, entry := range entries {
if !entry.IsDirectory && !validNames[entry.Name] { if !entry.IsDirectory && !validNames[entry.Name] {
// Delete obsolete identity file // Delete obsolete identity file
client.DeleteEntry(context.Background(), &filer_pb.DeleteEntryRequest{
if _, err := client.DeleteEntry(context.Background(), &filer_pb.DeleteEntryRequest{
Directory: dir, Directory: dir,
Name: entry.Name, Name: entry.Name,
})
}); err != nil {
glog.Warningf("Failed to delete obsolete identity file %s: %v", entry.Name, err)
}
} }
} }
return nil return nil
@ -273,7 +275,7 @@ func (store *FilerEtcStore) UpdateUser(ctx context.Context, username string, ide
func (store *FilerEtcStore) DeleteUser(ctx context.Context, username string) error { func (store *FilerEtcStore) DeleteUser(ctx context.Context, username string) error {
return store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { return store.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
err := client.DeleteEntry(context.Background(), &filer_pb.DeleteEntryRequest{
_, err := client.DeleteEntry(context.Background(), &filer_pb.DeleteEntryRequest{
Directory: filer.IamConfigDirectory + "/" + IamIdentitiesDirectory, Directory: filer.IamConfigDirectory + "/" + IamIdentitiesDirectory,
Name: username + ".json", Name: username + ".json",
}) })

Loading…
Cancel
Save