lint fixes.

This commit is contained in:
m1k1o
2021-04-04 21:15:12 +02:00
parent d2fae22042
commit 1b09721bbc
4 changed files with 14 additions and 14 deletions
+5 -5
View File
@@ -15,7 +15,7 @@ import (
func (manager *RoomManagerCtx) containerToEntry(container dockerTypes.Container) (*types.RoomEntry, error) { func (manager *RoomManagerCtx) containerToEntry(container dockerTypes.Container) (*types.RoomEntry, error) {
roomName, ok := container.Labels["m1k1o.neko_rooms.name"] roomName, ok := container.Labels["m1k1o.neko_rooms.name"]
if !ok { if !ok {
return nil, fmt.Errorf("Damaged container labels: name not found.") return nil, fmt.Errorf("damaged container labels: name not found")
} }
nekoImage, ok := container.Labels["m1k1o.neko_rooms.neko_image"] nekoImage, ok := container.Labels["m1k1o.neko_rooms.neko_image"]
@@ -27,7 +27,7 @@ func (manager *RoomManagerCtx) containerToEntry(container dockerTypes.Container)
URL, ok := container.Labels["m1k1o.neko_rooms.url"] URL, ok := container.Labels["m1k1o.neko_rooms.url"]
if !ok { if !ok {
return nil, fmt.Errorf("Damaged container labels: url not found.") return nil, fmt.Errorf("damaged container labels: url not found")
} }
epr, err := manager.getEprFromLabels(container.Labels) epr, err := manager.getEprFromLabels(container.Labels)
@@ -87,14 +87,14 @@ func (manager *RoomManagerCtx) containerFilter(args filters.Args) (*dockerTypes.
} }
if len(containers) == 0 { if len(containers) == 0 {
return nil, fmt.Errorf("Container not found.") return nil, fmt.Errorf("container not found")
} }
container := containers[0] container := containers[0]
val, ok := container.Labels["m1k1o.neko_rooms.instance"] val, ok := container.Labels["m1k1o.neko_rooms.instance"]
if !ok || val != manager.config.InstanceName { if !ok || val != manager.config.InstanceName {
return nil, fmt.Errorf("This container does not belong to neko_rooms.") return nil, fmt.Errorf("this container does not belong to neko_rooms")
} }
return &container, nil return &container, nil
@@ -120,7 +120,7 @@ func (manager *RoomManagerCtx) inspectContainer(id string) (*dockerTypes.Contain
val, ok := container.Config.Labels["m1k1o.neko_rooms.instance"] val, ok := container.Config.Labels["m1k1o.neko_rooms.instance"]
if !ok || val != manager.config.InstanceName { if !ok || val != manager.config.InstanceName {
return nil, fmt.Errorf("This container does not belong to neko_rooms.") return nil, fmt.Errorf("this container does not belong to neko_rooms")
} }
return &container, nil return &container, nil
+4 -4
View File
@@ -27,7 +27,7 @@ const (
func New(config *config.Room) *RoomManagerCtx { func New(config *config.Room) *RoomManagerCtx {
logger := log.With().Str("module", "room").Logger() logger := log.With().Str("module", "room").Logger()
cli, err := dockerClient.NewEnvClient() cli, err := dockerClient.NewClientWithOpts(dockerClient.FromEnv)
if err != nil { if err != nil {
logger.Panic().Err(err).Msg("unable to connect to docker client") logger.Panic().Err(err).Msg("unable to connect to docker client")
} else { } else {
@@ -200,7 +200,7 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
networkingConfig := &network.NetworkingConfig{ networkingConfig := &network.NetworkingConfig{
EndpointsConfig: map[string]*network.EndpointSettings{ EndpointsConfig: map[string]*network.EndpointSettings{
manager.config.TraefikNetwork: &network.EndpointSettings{}, manager.config.TraefikNetwork: {},
}, },
} }
@@ -267,12 +267,12 @@ func (manager *RoomManagerCtx) GetSettings(id string) (*types.RoomSettings, erro
roomName, ok := container.Config.Labels["m1k1o.neko_rooms.name"] roomName, ok := container.Config.Labels["m1k1o.neko_rooms.name"]
if !ok { if !ok {
return nil, fmt.Errorf("Damaged container labels: name not found.") return nil, fmt.Errorf("damaged container labels: name not found")
} }
nekoImage, ok := container.Config.Labels["m1k1o.neko_rooms.neko_image"] nekoImage, ok := container.Config.Labels["m1k1o.neko_rooms.neko_image"]
if !ok { if !ok {
return nil, fmt.Errorf("Damaged container labels: neko_image not found.") return nil, fmt.Errorf("damaged container labels: neko_image not found")
} }
epr, err := manager.getEprFromLabels(container.Config.Labels) epr, err := manager.getEprFromLabels(container.Config.Labels)
+4 -4
View File
@@ -13,7 +13,7 @@ type EprPorts struct {
func (manager *RoomManagerCtx) allocatePorts(sum uint16) (EprPorts, error) { func (manager *RoomManagerCtx) allocatePorts(sum uint16) (EprPorts, error) {
if sum < 1 { if sum < 1 {
return EprPorts{}, fmt.Errorf("Unable to allocate 0 ports.") return EprPorts{}, fmt.Errorf("unable to allocate 0 ports")
} }
min := manager.config.EprMin min := manager.config.EprMin
@@ -37,7 +37,7 @@ func (manager *RoomManagerCtx) allocatePorts(sum uint16) (EprPorts, error) {
} }
if epr.Min > max || epr.Max > max { if epr.Min > max || epr.Max > max {
return epr, fmt.Errorf("Unable to allocate ports: not enough ports.") return epr, fmt.Errorf("unable to allocate ports: not enough ports")
} }
return epr, nil return epr, nil
@@ -72,7 +72,7 @@ func (manager *RoomManagerCtx) getEprFromLabels(labels map[string]string) (EprPo
eprMinStr, ok := labels["m1k1o.neko_rooms.epr.min"] eprMinStr, ok := labels["m1k1o.neko_rooms.epr.min"]
if !ok { if !ok {
return epr, fmt.Errorf("Damaged container labels: epr.min not found.") return epr, fmt.Errorf("damaged container labels: epr.min not found")
} }
eprMin, err := strconv.ParseUint(eprMinStr, 10, 16) eprMin, err := strconv.ParseUint(eprMinStr, 10, 16)
@@ -82,7 +82,7 @@ func (manager *RoomManagerCtx) getEprFromLabels(labels map[string]string) (EprPo
eprMaxStr, ok := labels["m1k1o.neko_rooms.epr.max"] eprMaxStr, ok := labels["m1k1o.neko_rooms.epr.max"]
if !ok { if !ok {
return epr, fmt.Errorf("Damaged container labels: epr.max not found.") return epr, fmt.Errorf("damaged container labels: epr.max not found")
} }
eprMax, err := strconv.ParseUint(eprMaxStr, 10, 16) eprMax, err := strconv.ParseUint(eprMaxStr, 10, 16)
+1 -1
View File
@@ -12,7 +12,7 @@ func ArrayIn(val interface{}, array interface{}) (exists bool, index int) {
case reflect.Slice: case reflect.Slice:
s := reflect.ValueOf(array) s := reflect.ValueOf(array)
for i := 0; i < s.Len(); i++ { for i := 0; i < s.Len(); i++ {
if reflect.DeepEqual(val, s.Index(i).Interface()) == true { if reflect.DeepEqual(val, s.Index(i).Interface()) {
index = i index = i
exists = true exists = true
return return