Empty the URL arrays every time

Author: DistroByte

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24.1 as builder
+FROM golang:1.23.6 as builder
 
 COPY . /go/src/github.com/DistroByte/molocule
 

docker-compose.yaml

@@ -1,6 +1,6 @@
 module github.com/DistroByte/molecule
 
-go 1.24.1
+go 1.23.6
 
 require (
 	github.com/getkin/kin-openapi v0.131.0

go.mod

@@ -0,0 +1,12 @@
+package v1
+
+import (
+	"context"
+	"net/http"
+
+	openapi "github.com/DistroByte/molecule/internal/generated/go"
+)
+
+func (s *MoleculeAPIService) Healthcheck(ctx context.Context) (openapi.ImplResponse, error) {
+	return openapi.Response(http.StatusOK, "OK"), nil
+}

internal/api/v1/health_service.go

@@ -49,6 +49,10 @@ func (s *NomadService) ExtractAll(print bool) (map[string]string, error) {
 		return nil, err
 	}
 
+	serviceUrls = make(map[string]string)
+	hostReservedPorts = make(map[string]string)
+	servicePorts = make(map[string]string)
+
 	for _, allocation := range allocations {
 		s.processAllocation(allocation)
 	}
@@ -84,6 +88,8 @@ func (s *NomadService) ExtractURLs() (map[string]string, error) {
 		return nil, err
 	}
 
+	serviceUrls = make(map[string]string)
+
 	for _, allocation := range allocations {
 		s.processAllocation(allocation)
 	}
@@ -105,6 +111,8 @@ func (s *NomadService) ExtractHostPorts() (map[string]string, error) {
 		return nil, err
 	}
 
+	hostReservedPorts = make(map[string]string)
+
 	for _, allocation := range allocations {
 		s.processAllocation(allocation)
 	}
@@ -122,6 +130,8 @@ func (s *NomadService) ExtractServicePorts() (map[string]string, error) {
 		return nil, err
 	}
 
+	servicePorts = make(map[string]string)
+
 	for _, allocation := range allocations {
 		s.processAllocation(allocation)
 	}

internal/api/v1/nomad_service.go

@@ -1,60 +1,9 @@
 package v1
 
-import (
-	"context"
-	"net/http"
-
-	openapi "github.com/DistroByte/molecule/internal/generated/go"
-)
-
 type MoleculeAPIService struct {
 	nomadService NomadServiceInterface
 }
 
 func NewMoleculeAPIService(nomadService NomadServiceInterface) *MoleculeAPIService {
 	return &MoleculeAPIService{nomadService: nomadService}
 }
-
-func (s *MoleculeAPIService) GetURLs(ctx context.Context, print bool) (openapi.ImplResponse, error) {
-	urls, err := s.nomadService.ExtractAll(print)
-	if err != nil {
-		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
-	}
-
-	// Return the response
-	return openapi.Response(http.StatusOK, urls), nil
-}
-
-func (s *MoleculeAPIService) GetHostURLs(ctx context.Context) (openapi.ImplResponse, error) {
-	urls, err := s.nomadService.ExtractHostPorts()
-	if err != nil {
-		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
-	}
-
-	// Return the response
-	return openapi.Response(http.StatusOK, urls), nil
-}
-
-func (s *MoleculeAPIService) GetServiceURLs(ctx context.Context) (openapi.ImplResponse, error) {
-	urls, err := s.nomadService.ExtractServicePorts()
-	if err != nil {
-		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
-	}
-
-	// Return the response
-	return openapi.Response(http.StatusOK, urls), nil
-}
-
-func (s *MoleculeAPIService) GetTraefikURLs(ctx context.Context) (openapi.ImplResponse, error) {
-	urls, err := s.nomadService.ExtractURLs()
-	if err != nil {
-		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
-	}
-
-	// Return the response
-	return openapi.Response(http.StatusOK, urls), nil
-}
-
-func (s *MoleculeAPIService) Healthcheck(ctx context.Context) (openapi.ImplResponse, error) {
-	return openapi.Response(http.StatusOK, "OK"), nil
-}

internal/api/v1/service.go

@@ -0,0 +1,48 @@
+package v1
+
+import (
+	"context"
+	"net/http"
+
+	openapi "github.com/DistroByte/molecule/internal/generated/go"
+)
+
+func (s *MoleculeAPIService) GetURLs(ctx context.Context, print bool) (openapi.ImplResponse, error) {
+	urls, err := s.nomadService.ExtractAll(print)
+	if err != nil {
+		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
+	}
+
+	// Return the response
+	return openapi.Response(http.StatusOK, urls), nil
+}
+
+func (s *MoleculeAPIService) GetHostURLs(ctx context.Context) (openapi.ImplResponse, error) {
+	urls, err := s.nomadService.ExtractHostPorts()
+	if err != nil {
+		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
+	}
+
+	// Return the response
+	return openapi.Response(http.StatusOK, urls), nil
+}
+
+func (s *MoleculeAPIService) GetServiceURLs(ctx context.Context) (openapi.ImplResponse, error) {
+	urls, err := s.nomadService.ExtractServicePorts()
+	if err != nil {
+		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
+	}
+
+	// Return the response
+	return openapi.Response(http.StatusOK, urls), nil
+}
+
+func (s *MoleculeAPIService) GetTraefikURLs(ctx context.Context) (openapi.ImplResponse, error) {
+	urls, err := s.nomadService.ExtractURLs()
+	if err != nil {
+		return openapi.Response(http.StatusInternalServerError, err.Error()), nil
+	}
+
+	// Return the response
+	return openapi.Response(http.StatusOK, urls), nil
+}