[go: up one dir, main page]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Auth: Remove no-op authorizer interface methods. #13153

Merged
merged 4 commits into from
Mar 14, 2024
Merged

Auth: Remove no-op authorizer interface methods. #13153

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
405249e
lxd/auth: Remove no-op methods from authorizer interface.
markylaing Mar 14, 2024
290c689
lxd/instance/drivers: Remove authorizer calls to no-op methods.
markylaing Mar 14, 2024
2baa42e
lxd/storage: Remove authorizer calls to no-op methods.
markylaing Mar 14, 2024
53bd124
lxd: Remove authorizer calls to no-op methods.
markylaing Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lxd/storage: Remove authorizer calls to no-op methods. 
Signed-off-by: Mark Laing <mark.laing@canonical.com>
  • Loading branch information
@markylaing
markylaing committed Mar 14, 2024
commit 2baa42e2ee4572a9329076207f50cfecab517843
35 changes: 0 additions & 35 deletions lxd/storage/backend_lxd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4748,11 +4748,6 @@ func (b *lxdBackend) CreateCustomVolume(projectName string, volName string, desc
eventCtx["location"] = b.state.ServerName
}

err = b.state.Authorizer.AddStoragePoolVolume(b.state.ShutdownCtx, projectName, b.Name(), string(vol.Type()), volName)
if err != nil {
logger.Error("Failed to add storage volume to authorizer", logger.Ctx{"name": volName, "type": vol.Type(), "pool": b.Name(), "project": projectName, "error": err})
}

b.state.Events.SendLifecycle(projectName, lifecycle.StorageVolumeCreated.Event(vol, string(vol.Type()), projectName, op, eventCtx))

revert.Success()
Expand Down Expand Up @@ -4912,11 +4907,6 @@ func (b *lxdBackend) CreateCustomVolumeFromCopy(projectName string, srcProjectNa
eventCtx["location"] = b.state.ServerName
}

err = b.state.Authorizer.AddStoragePoolVolume(b.state.ShutdownCtx, projectName, b.Name(), string(vol.Type()), volName)
if err != nil {
logger.Error("Failed to add storage volume to authorizer", logger.Ctx{"name": volName, "type": vol.Type(), "pool": b.Name(), "project": projectName, "error": err})
}

b.state.Events.SendLifecycle(projectName, lifecycle.StorageVolumeCreated.Event(vol, string(vol.Type()), projectName, op, eventCtx))

revert.Success()
Expand Down Expand Up @@ -5347,11 +5337,6 @@ func (b *lxdBackend) CreateCustomVolumeFromMigration(projectName string, conn io
eventCtx["location"] = b.state.ServerName
}

err = b.state.Authorizer.AddStoragePoolVolume(b.state.ShutdownCtx, projectName, b.Name(), string(vol.Type()), args.Name)
if err != nil {
logger.Error("Failed to add storage volume to authorizer", logger.Ctx{"name": args.Name, "type": vol.Type(), "pool": b.Name(), "project": projectName, "error": err})
}

b.state.Events.SendLifecycle(projectName, lifecycle.StorageVolumeCreated.Event(vol, string(vol.Type()), projectName, op, eventCtx))

revert.Success()
Expand Down Expand Up @@ -5454,11 +5439,6 @@ func (b *lxdBackend) RenameCustomVolume(projectName string, volName string, newV
return err
}

err = b.state.Authorizer.RenameStoragePoolVolume(b.state.ShutdownCtx, projectName, b.Name(), string(vol.Type()), volName, newVolStorageName)
if err != nil {
logger.Error("Failed to rename storage volume in authorizer", logger.Ctx{"old_name": volName, "new_name": newVolStorageName, "type": vol.Type(), "pool": b.Name(), "project": projectName, "error": err})
}

vol = b.GetVolume(drivers.VolumeTypeCustom, drivers.ContentType(volume.ContentType), newVolStorageName, nil)
b.state.Events.SendLifecycle(projectName, lifecycle.StorageVolumeRenamed.Event(vol, string(vol.Type()), projectName, op, logger.Ctx{"old_name": volName}))

Expand Down Expand Up @@ -5727,11 +5707,6 @@ func (b *lxdBackend) DeleteCustomVolume(projectName string, volName string, op *
return err
}

err = b.state.Authorizer.DeleteStoragePoolVolume(b.state.ShutdownCtx, projectName, b.Name(), string(vol.Type()), volName)
if err != nil {
logger.Error("Failed to remove storage volume from authorizer", logger.Ctx{"name": volName, "type": vol.Type(), "pool": b.Name(), "project": projectName, "error": err})
}

b.state.Events.SendLifecycle(projectName, lifecycle.StorageVolumeDeleted.Event(vol, string(vol.Type()), projectName, op, nil))

return nil
Expand Down Expand Up @@ -7154,11 +7129,6 @@ func (b *lxdBackend) CreateCustomVolumeFromISO(projectName string, volName strin
eventCtx["location"] = b.state.ServerName
}

err = b.state.Authorizer.AddStoragePoolVolume(b.state.ShutdownCtx, projectName, b.Name(), string(vol.Type()), volName)
if err != nil {
logger.Error("Failed to add storage volume to authorizer", logger.Ctx{"name": volName, "type": vol.Type(), "pool": b.Name(), "project": projectName, "error": err})
}

b.state.Events.SendLifecycle(projectName, lifecycle.StorageVolumeCreated.Event(vol, string(vol.Type()), projectName, op, eventCtx))

revert.Success()
Expand Down Expand Up @@ -7264,11 +7234,6 @@ func (b *lxdBackend) CreateCustomVolumeFromBackup(srcBackup backup.Info, srcData
eventCtx["location"] = b.state.ServerName
}

err = b.state.Authorizer.AddStoragePoolVolume(b.state.ShutdownCtx, srcBackup.Project, b.Name(), string(vol.Type()), srcBackup.Name)
if err != nil {
logger.Error("Failed to add storage volume to authorizer", logger.Ctx{"name": srcBackup.Name, "type": vol.Type(), "pool": b.Name(), "project": srcBackup.Project, "error": err})
}

b.state.Events.SendLifecycle(srcBackup.Project, lifecycle.StorageVolumeCreated.Event(vol, string(vol.Type()), srcBackup.Project, op, eventCtx))

revert.Success()
Expand Down