Skip to content

Commit 1e8822c

Browse files
config: Remove unnecessary nil checks
Signed-off-by: Daniel Kleinstein <daniel.kleinstein@gmail.com>
1 parent e373ba3 commit 1e8822c

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

api/config/v1/config.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,8 @@ func DisableResourceNamingInConfig(logger logger, config *Config) {
9797
config.Resources.MIGs = nil
9898

9999
// Disable renaming / device selection in Sharing.TimeSlicing.Resources
100-
if (config.sharing.TimeSlicing != nil) {
101-
config.Sharing.TimeSlicing.disableResoureRenaming(logger, "timeSlicing")
102-
}
103-
// Disable renaming / device selection in Sharing.MPS.Resources
104-
if (config.Sharing.MPS != nil) {
105-
config.Sharing.MPS.disableResoureRenaming(logger, "mps")
106-
}
100+
config.Sharing.TimeSlicing.disableResoureRenaming(logger, "timeSlicing")
101+
config.Sharing.MPS.disableResoureRenaming(logger, "mps")
107102
}
108103

109104
// parseConfig parses a config file as either YAML of JSON and unmarshals it into a Config struct.

api/config/v1/sharing.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (s *Sharing) SharingStrategy() SharingStrategy {
3838
return SharingStrategyMPS
3939
}
4040

41-
if s.TimeSlicing != nil && s.TimeSlicing.isReplicated() {
41+
if s.TimeSlicing.isReplicated() {
4242
return SharingStrategyTimeSlicing
4343
}
4444
return SharingStrategyNone

0 commit comments

Comments
 (0)