From 11a82f81ce9f2b5a8ea74c668a33b8eb82f7f90e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 30 Jul 2026 19:45:43 -0400 Subject: [PATCH] incusd/daemon: Drop else branches in project expansion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- cmd/incusd/daemon.go | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/cmd/incusd/daemon.go b/cmd/incusd/daemon.go index a6f6e11b19..012f632b93 100644 --- a/cmd/incusd/daemon.go +++ b/cmd/incusd/daemon.go @@ -359,20 +359,30 @@ func allowPermission(objectType auth.ObjectType, entitlement auth.Entitlement, m if objectType == auth.ObjectTypeProfile { return project.ProfileProjectFromRecord(p) - } else if objectType == auth.ObjectTypeStorageBucket { + } + + if objectType == auth.ObjectTypeStorageBucket { return project.StorageBucketProjectFromRecord(p) - } else if objectType == auth.ObjectTypeStorageVolume { + } + + if objectType == auth.ObjectTypeStorageVolume { dbVolType, err := storagePools.VolumeTypeNameToDBType(muxVars[1]) if err != nil { return projectName } return project.StorageVolumeProjectFromRecord(p, dbVolType) - } else if objectType == auth.ObjectTypeNetworkZone { + } + + if objectType == auth.ObjectTypeNetworkZone { return project.NetworkZoneProjectFromRecord(p) - } else if slices.Contains([]auth.ObjectType{auth.ObjectTypeImage, auth.ObjectTypeImageAlias}, objectType) { + } + + if slices.Contains([]auth.ObjectType{auth.ObjectTypeImage, auth.ObjectTypeImageAlias}, objectType) { return project.ImageProjectFromRecord(p) - } else if slices.Contains([]auth.ObjectType{auth.ObjectTypeNetwork, auth.ObjectTypeNetworkACL, auth.ObjectTypeNetworkAddressSet}, objectType) { + } + + if slices.Contains([]auth.ObjectType{auth.ObjectTypeNetwork, auth.ObjectTypeNetworkACL, auth.ObjectTypeNetworkAddressSet}, objectType) { return project.NetworkProjectFromRecord(p) }