Address PR comments.

Author: tecarter94

.gitignore

@@ -34,8 +34,6 @@ quarkus.log
 *.out
 .env
 .quinoa
-domain-proxy-client
-domain-proxy-server
 
 # Kustomize overlays for openshift ci
 deploy/**/ci-final/**

.tekton/domain-proxy-pull-request.yaml

@@ -27,9 +27,9 @@ spec:
   - name: image-expires-after
     value: 5d
   - name: dockerfile
-    value: /domain-proxy/Dockerfile.all-in-one
+    value: /cmd/domainproxy/docker/Dockerfile.all-in-one
   - name: path-context
-    value: domain-proxy
+    value: cmd/domainproxy/docker
   pipelineSpec:
     finally:
     - name: show-sbom

.tekton/domain-proxy-push.yaml

@@ -24,9 +24,9 @@ spec:
   - name: output-image
     value: quay.io/redhat-user-workloads/konflux-jbs-pnc-tenant/jvm-build-service/domain-proxy:{{revision}}
   - name: dockerfile
-    value: /domain-proxy/Dockerfile.all-in-one
+    value: /cmd/domainproxy/docker/Dockerfile.all-in-one
   - name: path-context
-    value: domain-proxy
+    value: cmd/domainproxy/docker
   pipelineSpec:
     finally:
     - name: show-sbom

Makefile

@@ -44,6 +44,8 @@ minikube-test:
 build:
 	go build -o out/jvmbuildservice cmd/controller/main.go
 	env GOOS=linux GOARCH=amd64 GOTOOLCHAIN=auto GOSUMDB=sum.golang.org go build -mod=vendor -o out/jvmbuildservice ./cmd/controller
+	go build -o out/domainproxyserver cmd/domainproxy/server/main.go
+	go build -o out/domainproxyclient cmd/domainproxy/client/main.go
 
 clean:
 	rm -rf out
@@ -60,19 +62,18 @@ generate: generate-crds
 verify-generate-deepcopy-client: generate-deepcopy-client
 	hack/verify-codegen.sh
 
-dev-image-controller:
+dev-image: build
 	@if [ -z "$$QUAY_USERNAME" ]; then \
             echo "ERROR: QUAY_USERNAME is not set"; \
             exit 1; \
     fi
 	docker build . -t quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}"
 	docker push quay.io/$(QUAY_USERNAME)/hacbs-jvm-controller:"$${JBS_QUAY_IMAGE_TAG:-dev}"
+	docker build . -f cmd/domainproxy/docker/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}"
 
-dev: dev-image-controller
+dev: dev-image
 	cd java-components && mvn clean install -Dlocal -DskipTests -Ddev
-	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}"
 
 dev-openshift: dev
 	./deploy/openshift-development.sh

domain-proxy/cmd/client/main.go renamed to cmd/domainproxy/client/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/client"
+	. "github.com/redhat-appstudio/jvm-build-service/pkg/domainproxy/client"
 	"os"
 	"os/signal"
 	"syscall"

cmd/domainproxy/docker/Dockerfile.all-in-one

@@ -0,0 +1,15 @@
+FROM golang:alpine AS builder
+USER 0
+WORKDIR /work
+COPY ./ .
+
+RUN go build -o domainproxyserver cmd/domainproxy/server/main.go
+RUN go build -o domainproxyclient cmd/domainproxy/client/main.go
+
+FROM quay.io/konflux-ci/buildah-task:latest@sha256:5cbd487022fb7ac476cbfdea25513b810f7e343ec48f89dc6a4e8c3c39fa37a2
+USER 0
+RUN microdnf install -y iproute
+WORKDIR /work/
+
+COPY --from=builder /work/domainproxyserver /app/domain-proxy-server
+COPY --from=builder /work/domainproxyclient /app/domain-proxy-client

domain-proxy/Dockerfile.local renamed to cmd/domainproxy/docker/Dockerfile.local

@@ -1,6 +1,6 @@
 FROM quay.io/konflux-ci/buildah-task:latest@sha256:5cbd487022fb7ac476cbfdea25513b810f7e343ec48f89dc6a4e8c3c39fa37a2
 USER 0
 RUN microdnf install -y iproute
-COPY domain-proxy/domain-proxy-server /app/domain-proxy-server
-COPY domain-proxy/domain-proxy-client /app/domain-proxy-client
+COPY out/domainproxyserver /app/domain-proxy-server
+COPY out/domainproxyclient /app/domain-proxy-client
 

domain-proxy/cmd/server/main.go renamed to cmd/domainproxy/server/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	. "github.com/redhat-appstudio/jvm-build-service/domain-proxy/pkg/server"
+	. "github.com/redhat-appstudio/jvm-build-service/pkg/domainproxy/server"
 	"os"
 	"os/signal"
 	"syscall"