BUG/MEDIUM: properly detect starting of dataplane

notify event for when dataplaneapi is starting was not properly
checking all possible options. When using it only with https,
dataplaneapi incorrectly read port where it was listening.
With this commit, patch to server.go was created
so we receive notification in right time regardless of setup

Author: oktalz

Makefile

@@ -35,7 +35,9 @@ generate:
 		--build-arg GID=$(shell id -g) \
 		-t dataplaneapi-swagger-gen .
 	docker run --rm -it -v "$(PWD)":/data dataplaneapi-swagger-gen
+	generate/post_swagger.sh
 
 .PHONY: generate-native
 generate-native:
 	generate/swagger/script.sh
+	generate/post_swagger.sh

cmd/dataplaneapi/main.go

@@ -16,13 +16,10 @@
 package main
 
 import (
-	"crypto/tls"
 	"fmt"
-	"net/http"
 	"os"
 	"path"
 	"syscall"
-	"time"
 
 	loads "github.com/go-openapi/loads"
 	"github.com/go-openapi/runtime"
@@ -228,28 +225,7 @@ func startServer(cfg *configuration.Configuration) (reload configuration.AtomicB
 	}()
 
 	server.ConfigureAPI()
-	schema := "http"
-	if len(server.EnabledListeners) > 0 {
-		schema = server.EnabledListeners[0]
-	}
-	path := fmt.Sprintf("%s://%s:%d%s", schema, server.Host, server.Port, cfg.RuntimeData.APIBasePath)
-	go func(path string) {
-		tr := &http.Transport{
-			// we just need to check if we have a response
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, //nolint:gosec
-		}
-		client := &http.Client{Transport: tr}
-		numTrys := 0
-		for ; numTrys < 10; numTrys++ {
-			_, err := client.Get(path)
-			if err == nil {
-				cfg.Notify.ServerStarted.Notify()
-				return
-			}
-			time.Sleep(500 * time.Millisecond)
-		}
-		log.Fatalf("check if dataplane is running failed on %s", path)
-	}(path)
+	dataplaneapi.SetServerStartedCallback(cfg.Notify.ServerStarted.Notify)
 	if err := server.Serve(); err != nil {
 		log.Fatalf("Error running HAProxy Data Plane API: %s", err.Error())
 	}

configure_data_plane.go

@@ -69,14 +69,19 @@ import (
 // go:generate swagger generate server --target ../../../../../../github.com/haproxytech --name controller --spec ../../../../../../../../haproxy-api/haproxy-open-api-spec/build/haproxy_spec.yaml --server-package controller --tags Stats --tags Information --tags Configuration --tags Discovery --tags Frontend --tags Backend --tags Bind --tags Server --tags TCPRequestRule --tags HTTPRequestRule --tags HTTPResponseRule --tags Acl --tags BackendSwitchingRule --tags ServerSwitchingRule --tags TCPResponseRule --skip-models --exclude-main
 
 var (
-	Version   string
-	BuildTime string
-	mWorker   = false
-	logFile   *os.File
-	AppLogger *log.Logger
-	AccLogger *log.Logger
+	Version               string
+	BuildTime             string
+	mWorker               = false
+	logFile               *os.File
+	AppLogger             *log.Logger
+	AccLogger             *log.Logger
+	serverStartedCallback func()
 )
 
+func SetServerStartedCallback(callFunc func()) {
+	serverStartedCallback = callFunc
+}
+
 func configureFlags(api *operations.DataPlaneAPI) {
 	cfg := dataplaneapi_config.Get()
 

generate/post_swagger.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+echo -n " ---> adding serverStartedCallback() to "
+sed -i "s/wg.Wait()/serverStartedCallback()\nwg.Wait()/g" server.go
+go fmt server.go

generate/swagger/script.sh

@@ -101,13 +101,13 @@ swagger generate server -f $SPEC_DIR/haproxy_spec.yaml \
     -r $SPEC_DIR/copyright.txt
 
 echo " ---> removing doc.go"
-rm doc.go
+rm doc.go || echo "doc.go does not exists"
 echo " ---> removing embedded_spec.go"
-rm embedded_spec.go
+rm embedded_spec.go  ||  echo "embedded_spec.go does not exists"
 echo " ---> removing server.go"
-rm server.go
+rm server.go ||  echo "server.go does not exists"
 echo " ---> removing operations/*"
-rm -rf operations/*
+rm -rf operations/* ||  echo "operations/ does not exists"
 
 echo " ---> copy generated files to destination"
 cp -a $DST_DIR/dataplaneapi/. .