Reorganised code.

Makefile

@@ -70,7 +70,7 @@ dev-image-controller:
 
 dev: dev-image-controller
 	cd java-components && mvn clean install -Dlocal -DskipTests -Ddev
-	cd domain-proxy && go build -o domain-proxy-server domain_proxy_server.go common.go && go build -o domain-proxy-client domain_proxy_client.go common.go
+	cd domain-proxy && go build -o domain-proxy-server github.com/redhat-appstudio/jvm-build-service/domain-proxy/cmd/server && go build -o domain-proxy-client github.com/redhat-appstudio/jvm-build-service/domain-proxy/cmd/client
 	docker build . -f domain-proxy/Dockerfile.local -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 	docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-domain-proxy:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 

domain-proxy/Dockerfile.all-in-one

@@ -3,8 +3,8 @@ USER 0
 WORKDIR /work
 COPY ./ .
 
-RUN go build -o domain-proxy-server domain_proxy_server.go common.go
-RUN go build -o domain-proxy-client domain_proxy_client.go common.go
+RUN go build -o domain-proxy-server github.com/redhat-appstudio/jvm-build-service/domain-proxy/cmd/server
+RUN go build -o domain-proxy-client github.com/redhat-appstudio/jvm-build-service/domain-proxy/cmd/client
 
 FROM quay.io/konflux-ci/buildah-task:latest@sha256:5cbd487022fb7ac476cbfdea25513b810f7e343ec48f89dc6a4e8c3c39fa37a2
 USER 0

domain-proxy/cmd/client/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/client"
+	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/common"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+func main() {
+	InitLogger("Domain Proxy Client")
+	client := NewDomainProxyClient(GetDomainSocket(), GetServerHttpPort(), GetByteBufferSize(), GetConnectionTimeout(), GetIdleTimeout())
+	client.Start()
+	signals := make(chan os.Signal, 1)
+	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
+	<-signals
+	client.Stop()
+}

domain-proxy/cmd/server/main.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/common"
+	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/server"
+	"os"
+	"os/signal"
+	"syscall"
+)
+
+func main() {
+	InitLogger("Domain Proxy Server")
+	server := NewDomainProxyServer(GetDomainSocket(),
+		GetByteBufferSize(),
+		GetConnectionTimeout(),
+		GetIdleTimeout(),
+		GetCsvEnvVariable(ProxyTargetWhitelistKey, DefaultProxyTargetWhitelist),
+		GetCsvEnvVariable(InternalNonProxyHostsKey, DefaultInternalNonProxyHosts), // TODO Implement Non-proxy logic
+	)
+	server.Start()
+	signals := make(chan os.Signal, 1)
+	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
+	<-signals
+	server.Stop()
+}

domain-proxy/domain_proxy_client.go → domain-proxy/pkg/client/client.go

@@ -1,12 +1,10 @@
-package main
+package client
 
 import (
 	"fmt"
+	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/common"
 	"net"
-	"os"
-	"os/signal"
 	"sync/atomic"
-	"syscall"
 	"time"
 )
 
@@ -94,13 +92,3 @@ func (dpc *DomainProxyClient) Stop() {
 func GetServerHttpPort() int {
 	return GetIntEnvVariable(ServerHttpPortKey, DefaultServerHttpPort)
 }
-
-func main() {
-	InitLogger("Domain Proxy Client")
-	client := NewDomainProxyClient(GetDomainSocket(), GetServerHttpPort(), GetByteBufferSize(), GetConnectionTimeout(), GetIdleTimeout())
-	client.Start()
-	signals := make(chan os.Signal, 1)
-	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
-	<-signals
-	client.Stop()
-}

domain-proxy/common.go → domain-proxy/pkg/common/common.go

@@ -1,4 +1,4 @@
-package main
+package common
 
 import (
 	"errors"
@@ -32,11 +32,11 @@ func BiDirectionalTransfer(leftConnection, rightConnection net.Conn, byteBufferS
 	defer CloseConnection(leftConnection, rightConnection, connectionType, connectionNo)
 	done := make(chan struct{}, 2)
 	if err := leftConnection.SetDeadline(time.Now().Add(idleTimeout)); err != nil {
-		handleSetDeadlineError(leftConnection, err)
+		HandleSetDeadlineError(leftConnection, err)
 		return
 	}
 	if err := rightConnection.SetDeadline(time.Now().Add(idleTimeout)); err != nil {
-		handleSetDeadlineError(rightConnection, err)
+		HandleSetDeadlineError(rightConnection, err)
 		return
 	}
 	go Transfer(leftConnection, rightConnection, done, byteBufferSize, idleTimeout, connectionType, connectionNo)
@@ -56,19 +56,19 @@ func Transfer(sourceConnection, targetConnection net.Conn, done chan struct{}, b
 			return
 		} else if n > 0 {
 			if err = sourceConnection.SetReadDeadline(time.Now().Add(idleTimeout)); err != nil {
-				handleSetDeadlineError(sourceConnection, err)
+				HandleSetDeadlineError(sourceConnection, err)
 				return
 			}
 			if err = targetConnection.SetWriteDeadline(time.Now().Add(idleTimeout)); err != nil {
-				handleSetDeadlineError(targetConnection, err)
+				HandleSetDeadlineError(targetConnection, err)
 				return
 			}
 			Logger.Printf("%d bytes transferred for %s connection %d", n, connectionType, connectionNo)
 		}
 	}
 }
 
-func handleSetDeadlineError(connection net.Conn, err error) {
+func HandleSetDeadlineError(connection net.Conn, err error) {
 	Logger.Printf("Failed to set deadline: %v", err)
 	if err = connection.Close(); err != nil {
 		HandleConnectionCloseError(err)

domain-proxy/domain_proxy_server.go → domain-proxy/pkg/server/server.go

@@ -1,24 +1,23 @@
-package main
+package server
 
 import (
 	"bufio"
 	"fmt"
+	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/common"
 	"net"
 	"net/http"
 	"os"
-	"os/signal"
 	"strconv"
 	"strings"
 	"sync/atomic"
-	"syscall"
 	"time"
 )
 
 const (
 	HttpPort                     = 80
 	HttpsPort                    = 443
 	ProxyTargetWhitelistKey      = "PROXY_TARGET_WHITELIST"
-	DefaultProxyTargetWhitelist  = "repo.maven.apache.org,repository.jboss.org,packages.confluent.io,jitpack.io,repo.gradle.org,plugins.gradle.org"
+	DefaultProxyTargetWhitelist  = "gariscus.com,neverssl.com,repo1.maven.org,repo.maven.apache.org,repository.jboss.org,packages.confluent.io,jitpack.io,repo.gradle.org,plugins.gradle.org"
 	InternalNonProxyHostsKey     = "INTERNAL_NON_PROXY_HOSTS"
 	DefaultInternalNonProxyHosts = "localhost"
 	DomainSocketToHttp           = "Domain Socket <-> HTTP"
@@ -83,7 +82,7 @@ func (dps *DomainProxyServer) startServer() {
 
 func (dps *DomainProxyServer) handleConnectionRequest(domainConnection net.Conn) {
 	if err := domainConnection.SetDeadline(time.Now().Add(dps.idleTimeout)); err != nil {
-		handleSetDeadlineError(domainConnection, err)
+		HandleSetDeadlineError(domainConnection, err)
 		return
 	}
 	reader := bufio.NewReader(domainConnection)
@@ -97,7 +96,7 @@ func (dps *DomainProxyServer) handleConnectionRequest(domainConnection net.Conn)
 	}
 	writer := &responseWriter{connection: domainConnection}
 	if err = domainConnection.SetDeadline(time.Now().Add(dps.idleTimeout)); err != nil {
-		handleSetDeadlineError(domainConnection, err)
+		HandleSetDeadlineError(domainConnection, err)
 		return
 	}
 	if request.Method == http.MethodConnect {
@@ -245,19 +244,3 @@ func (rw *responseWriter) WriteHeader(statusCode int) {
 		Logger.Printf("Failed to write headers to connection: %v", err)
 	}
 }
-
-func main() {
-	InitLogger("Domain Proxy Server")
-	server := NewDomainProxyServer(GetDomainSocket(),
-		GetByteBufferSize(),
-		GetConnectionTimeout(),
-		GetIdleTimeout(),
-		GetCsvEnvVariable(ProxyTargetWhitelistKey, DefaultProxyTargetWhitelist),
-		GetCsvEnvVariable(InternalNonProxyHostsKey, DefaultInternalNonProxyHosts), // TODO Implement Non-proxy logic
-	)
-	server.Start()
-	signals := make(chan os.Signal, 1)
-	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
-	<-signals
-	server.Stop()
-}