Skip to content

Commit

Permalink
incusd/cluster/profiles: Fix import shadowing
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <[email protected]>
Sponsored-by: https://webdock.io
(cherry picked from commit 8261a78dd1134a7a41e704361b271b328c05388a)
Signed-off-by: hamistao <[email protected]>
  • Loading branch information
stgraber authored and hamistao committed Oct 21, 2024
1 parent 7758626 commit 6240c2a
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions lxd/db/cluster/profiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,28 +54,28 @@ type ProfileFilter struct {
func (p *Profile) ToAPI(ctx context.Context, tx *sql.Tx, profileConfigs map[int]map[string]string, profileDevices map[int][]Device) (*api.Profile, error) {
var err error

var config map[string]string
var dbConfig map[string]string
if profileConfigs != nil {
config = profileConfigs[p.ID]
if config == nil {
config = map[string]string{}
dbConfig = profileConfigs[p.ID]
if dbConfig == nil {
dbConfig = map[string]string{}
}
} else {
config, err = GetProfileConfig(ctx, tx, p.ID)
dbConfig, err = GetProfileConfig(ctx, tx, p.ID)
if err != nil {
return nil, err
}
}

var devices map[string]Device
var dbDevices map[string]Device
if profileDevices != nil {
devices = map[string]Device{}
dbDevices = map[string]Device{}

for _, dev := range profileDevices[p.ID] {
devices[dev.Name] = dev
dbDevices[dev.Name] = dev
}
} else {
devices, err = GetProfileDevices(ctx, tx, p.ID)
dbDevices, err = GetProfileDevices(ctx, tx, p.ID)
if err != nil {
return nil, err
}
Expand All @@ -84,8 +84,8 @@ func (p *Profile) ToAPI(ctx context.Context, tx *sql.Tx, profileConfigs map[int]
profile := &api.Profile{
Name: p.Name,
Description: p.Description,
Config: config,
Devices: DevicesToAPI(devices),
Config: dbConfig,
Devices: DevicesToAPI(dbDevices),
}

return profile, nil
Expand Down

0 comments on commit 6240c2a

Please sign in to comment.