Skip to content

Commit a4bd5aa

Browse files
committed
lint
Signed-off-by: Valentin Daviot <valentin.daviot@scality.com>
1 parent 8566dfd commit a4bd5aa

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

pkg/infrastructure/logicalvolumediscoverer/megaraid.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
//nolint:dupl // This function is similar to the one in the SmartArray implementation.
1718
package logicalvolumediscoverer
1819

1920
import (
@@ -49,13 +50,13 @@ func (d *MegaRAID) DiscoverLogicalVolumes() ([]*domain.DiscoveredLogicalVolume,
4950
for _, ctrl := range controllers {
5051
lvs, err := d.rc.LogicalVolumes(ctrl.Metadata)
5152
if err != nil {
52-
return nil, errors.Wrapf(err, "failed to list logical volumes for MegaRAID controller %d", ctrl.Metadata.ID)
53+
return nil, errors.Wrapf(err, "failed to list logical volumes for MegaRAID controller %d", ctrl.ID)
5354
}
5455

5556
for _, lv := range lvs {
5657
volumes = append(volumes, &domain.DiscoveredLogicalVolume{
5758
ControllerType: megaraidControllerType,
58-
ControllerID: ctrl.Metadata.ID,
59+
ControllerID: ctrl.ID,
5960
LogicalVolume: lv,
6061
})
6162
}

pkg/infrastructure/logicalvolumediscoverer/smartarray.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17+
//nolint:dupl // This function is similar to the one in the MegaRAID implementation.
1718
package logicalvolumediscoverer
1819

1920
import (
@@ -49,13 +50,13 @@ func (d *SmartArray) DiscoverLogicalVolumes() ([]*domain.DiscoveredLogicalVolume
4950
for _, ctrl := range controllers {
5051
lvs, err := d.rc.LogicalVolumes(ctrl.Metadata)
5152
if err != nil {
52-
return nil, errors.Wrapf(err, "failed to list logical volumes for SmartArray controller %d", ctrl.Metadata.ID)
53+
return nil, errors.Wrapf(err, "failed to list logical volumes for SmartArray controller %d", ctrl.ID)
5354
}
5455

5556
for _, lv := range lvs {
5657
volumes = append(volumes, &domain.DiscoveredLogicalVolume{
5758
ControllerType: smartArrayControllerType,
58-
ControllerID: ctrl.Metadata.ID,
59+
ControllerID: ctrl.ID,
5960
LogicalVolume: lv,
6061
})
6162
}

0 commit comments

Comments
 (0)