Merge pull request #469 from forta-protocol/fix-docker-client-filter-bug

Fix Docker client filter bug

clients/docker.go

@@ -31,7 +31,14 @@ const (
  DockerLabelFortaSettingsAgentLogsEnable = "network.forta.settings.agent-logs.enable"
 )
 
-var defaultLabels = map[string]string{DockerLabelForta: "true"}
+type dockerLabel struct {
+ Name string
+ Value string
+}
+
+var defaultLabels = []dockerLabel{
+ {Name: DockerLabelForta, Value: "true"},
+}
 
 // Client errors
 var (
@@ -96,7 +103,7 @@ type dockerClient struct {
  workers *workers.Group
  username string
  password string
- labels map[string]string
+ labels []dockerLabel
 }
 
 func (cfg DockerContainerConfig) envVars() []string {
@@ -186,7 +193,7 @@ func (d *dockerClient) createNetwork(ctx context.Context, name string, internal
  }
 
  resp, err := d.cli.NetworkCreate(ctx, name, types.NetworkCreate{
- Labels: d.labels,
+ Labels: labelsToMap(d.labels),
  Internal: internal,
  })
  if err != nil {
@@ -420,7 +427,7 @@ func (d *dockerClient) StartContainer(ctx context.Context, config DockerContaine
  cntCfg := &container.Config{
  Image: config.Image,
  Env: config.envVars(),
- Labels: d.labels,
+ Labels: labelsToMap(d.labels),
  }
  // add custom labels
  for k, v := range config.Labels {
@@ -681,22 +688,29 @@ func (d *dockerClient) GetContainerLogs(ctx context.Context, containerID, tail s
 
 func (d *dockerClient) labelFilter() filters.Args {
  filter := filters.NewArgs()
- for k, v := range d.labels {
- filter.Add("label", fmt.Sprintf("%s=%s", k, v))
+ for _, label := range d.labels {
+ filter.Add("label", fmt.Sprintf("%s=%s", label.Name, label.Value))
  }
  return filter
 }
 
-func initLabels(name string) map[string]string {
- result := make(map[string]string)
- for k, v := range defaultLabels {
- result[k] = v
- }
+func initLabels(name string) []dockerLabel {
  if len(name) == 0 {
- return result
+ return defaultLabels
+ }
+
+ return append(defaultLabels, dockerLabel{
+ Name: DockerLabelFortaSupervisor,
+ Value: name,
+ })
+}
+
+func labelsToMap(labels []dockerLabel) map[string]string {
+ m := make(map[string]string)
+ for _, label := range labels {
+ m[label.Name] = label.Value
  }
- result[DockerLabelFortaSupervisor] = name
- return result
+ return m
 }
 
 // NewDockerClient creates a new docker client

cmd/cmd_run.go

@@ -41,6 +41,9 @@ func checkScannerState() error {
  ENSAddress: cfg.ENSConfig.ContractAddress,
  Name: "registry-client",
  })
+ if err != nil {
+ return fmt.Errorf("failed to create registry client: %v", err)
+ }
  scanner, err := registry.GetScanner(scannerAddressStr)
  if err != nil {
  return fmt.Errorf("failed to check scanner state: %v", err)

config/config.go

@@ -47,7 +47,7 @@ type RegistryConfig struct {
  JsonRpc JsonRpcConfig `yaml:"jsonRpc" json:"jsonRpc" default:"{\"url\": \"https://polygon-rpc.com\"}"`
  IPFS IPFSConfig `yaml:"ipfs" json:"ipfs"`
  ContractAddress string `yaml:"contractAddress" json:"contractAddress" validate:"eth_addr"`
- ContainerRegistry string `yaml:"containerRegistry" json:"containerRegistry" validate:"hostname_port" default:"disco.forta.network" `
+ ContainerRegistry string `yaml:"containerRegistry" json:"containerRegistry" validate:"hostname|hostname_port" default:"disco.forta.network" `
  Username string `yaml:"username" json:"username"`
  Password string `yaml:"password" json:"password"`
  Disable bool `yaml:"disable" json:"disable"` // for testing situations