From 407e4b50c29ee1b78511140ddb3933297009daf8 Mon Sep 17 00:00:00 2001 From: Matheus Moraes Date: Thu, 16 Mar 2023 14:10:14 -0300 Subject: [PATCH] moving worker to cmd --- Dockerfile.worker | 10 +++++----- Makefile | 2 +- {worker => cmd/worker}/main.go | 3 ++- docs/cluster-scan.md | 2 +- {worker => pkg/worker}/config/config.go | 2 +- {worker => pkg/worker}/config/config_test.go | 0 {worker => pkg/worker}/report/parse.go | 4 +++- {worker => pkg/worker}/report/parse_test.go | 2 +- {worker => pkg/worker}/report/popeye/parse.go | 0 {worker => pkg/worker}/report/popeye/parse_test.go | 2 +- {worker => pkg/worker}/report/popeye/parse_types.go | 0 {worker => pkg/worker}/report/popeye/popeye_types.go | 0 .../worker}/report/popeye/testdata/test_report_1.json | 0 .../worker}/report/popeye/testdata/test_report_2.json | 0 .../worker}/report/popeye/testdata/test_report_3.json | 0 .../worker}/report/popeye/testdata/test_report_4.json | 0 .../worker}/report/popeye/testdata/test_report_5.json | 0 .../worker}/report/popeye/testdata/test_report_6.json | 0 {worker => pkg/worker}/run/run.go | 7 +++---- {worker => pkg/worker}/run/run_test.go | 2 +- 20 files changed, 19 insertions(+), 17 deletions(-) rename {worker => cmd/worker}/main.go (96%) rename {worker => pkg/worker}/config/config.go (98%) rename {worker => pkg/worker}/config/config_test.go (100%) rename {worker => pkg/worker}/report/parse.go (98%) rename {worker => pkg/worker}/report/parse_test.go (99%) rename {worker => pkg/worker}/report/popeye/parse.go (100%) rename {worker => pkg/worker}/report/popeye/parse_test.go (99%) rename {worker => pkg/worker}/report/popeye/parse_types.go (100%) rename {worker => pkg/worker}/report/popeye/popeye_types.go (100%) rename {worker => pkg/worker}/report/popeye/testdata/test_report_1.json (100%) rename {worker => pkg/worker}/report/popeye/testdata/test_report_2.json (100%) rename {worker => pkg/worker}/report/popeye/testdata/test_report_3.json (100%) rename {worker => pkg/worker}/report/popeye/testdata/test_report_4.json (100%) rename {worker => pkg/worker}/report/popeye/testdata/test_report_5.json (100%) rename {worker => pkg/worker}/report/popeye/testdata/test_report_6.json (100%) rename {worker => pkg/worker}/run/run.go (96%) rename {worker => pkg/worker}/run/run_test.go (98%) diff --git a/Dockerfile.worker b/Dockerfile.worker index 6e2f4d79..24d067a8 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -21,15 +21,15 @@ COPY go.mod go.mod COPY go.sum go.sum RUN go mod download -COPY worker/ worker/ +COPY cmd/worker/main.go cmd/worker/main.go COPY apis/ apis/ COPY pkg/ pkg/ -RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o bin/worker worker/main.go +RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o worker cmd/worker/main.go FROM gcr.io/distroless/static:nonroot WORKDIR / -COPY --from=builder /workspace/bin/worker /usr/local/bin/ -USER 65534:65534 +COPY --from=builder /workspace/worker . +USER 65532:65532 -ENTRYPOINT ["/usr/local/bin/worker"] +ENTRYPOINT ["/worker"] diff --git a/Makefile b/Makefile index f9fb3fd2..cdfff454 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ clientset-gen: ## Generate clientset build: generate fmt vet ## Build manager binary. go build -o bin/manager main.go - go build -o bin/worker worker/main.go + go build -o bin/worker cmd/worker/main.go run: install manifests generate ## Run a controller from your host. go run ./main.go -default-plugins-names ${PLUGINS} -worker-image ${WORKER_IMG} diff --git a/worker/main.go b/cmd/worker/main.go similarity index 96% rename from worker/main.go rename to cmd/worker/main.go index 7ae29733..72b2a2f4 100644 --- a/worker/main.go +++ b/cmd/worker/main.go @@ -17,11 +17,12 @@ package main import ( "time" - "github.com/undistro/zora/worker/run" "go.uber.org/zap/zapcore" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log/zap" + + "github.com/undistro/zora/pkg/worker/run" ) var log = ctrl.Log.WithName("worker") diff --git a/docs/cluster-scan.md b/docs/cluster-scan.md index bb0ebde0..8e640a1d 100644 --- a/docs/cluster-scan.md +++ b/docs/cluster-scan.md @@ -129,5 +129,5 @@ kubectl get clusterissues -l cluster=mycluster,scanID=fa4e63cc-5236-40f3-aa7f-59 These docs should help you understand why it's an issue and how to fix it. - All URLs are available [here](https://github.com/undistro/zora/blob/main/worker/report/popeye/parse_types.go#L109) + All URLs are available [here](https://github.com/undistro/zora/blob/main/pkg/worker/report/popeye/parse_types.go#L109) and you can contribute to Zora adding new links. See our [contribution guidelines](https://github.com/undistro/zora/blob/main/CONTRIBUTING.md). diff --git a/worker/config/config.go b/pkg/worker/config/config.go similarity index 98% rename from worker/config/config.go rename to pkg/worker/config/config.go index 6c44caf3..61329a4a 100644 --- a/worker/config/config.go +++ b/pkg/worker/config/config.go @@ -25,7 +25,7 @@ import ( "github.com/go-logr/logr" zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1" - "github.com/undistro/zora/worker/report/popeye" + "github.com/undistro/zora/pkg/worker/report/popeye" ) const ( diff --git a/worker/config/config_test.go b/pkg/worker/config/config_test.go similarity index 100% rename from worker/config/config_test.go rename to pkg/worker/config/config_test.go diff --git a/worker/report/parse.go b/pkg/worker/report/parse.go similarity index 98% rename from worker/report/parse.go rename to pkg/worker/report/parse.go index 9341409c..0476d6be 100644 --- a/worker/report/parse.go +++ b/pkg/worker/report/parse.go @@ -20,8 +20,10 @@ import ( "strings" "github.com/go-logr/logr" + zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1" - "github.com/undistro/zora/worker/config" + "github.com/undistro/zora/pkg/worker/config" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/worker/report/parse_test.go b/pkg/worker/report/parse_test.go similarity index 99% rename from worker/report/parse_test.go rename to pkg/worker/report/parse_test.go index 75ee4e2b..4720d0da 100644 --- a/worker/report/parse_test.go +++ b/pkg/worker/report/parse_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/types" zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1" - "github.com/undistro/zora/worker/config" + "github.com/undistro/zora/pkg/worker/config" ) func TestParse(t *testing.T) { diff --git a/worker/report/popeye/parse.go b/pkg/worker/report/popeye/parse.go similarity index 100% rename from worker/report/popeye/parse.go rename to pkg/worker/report/popeye/parse.go diff --git a/worker/report/popeye/parse_test.go b/pkg/worker/report/popeye/parse_test.go similarity index 99% rename from worker/report/popeye/parse_test.go rename to pkg/worker/report/popeye/parse_test.go index 133ebbea..a55ccd6d 100644 --- a/worker/report/popeye/parse_test.go +++ b/pkg/worker/report/popeye/parse_test.go @@ -233,7 +233,7 @@ func TestParse(t *testing.T) { return cis[i].ID > cis[j].ID }) for c := 0; c < len(cis); c++ { - for r, _ := range cis[c].Resources { + for r := range cis[c].Resources { sort.Strings(cis[c].Resources[r]) } } diff --git a/worker/report/popeye/parse_types.go b/pkg/worker/report/popeye/parse_types.go similarity index 100% rename from worker/report/popeye/parse_types.go rename to pkg/worker/report/popeye/parse_types.go diff --git a/worker/report/popeye/popeye_types.go b/pkg/worker/report/popeye/popeye_types.go similarity index 100% rename from worker/report/popeye/popeye_types.go rename to pkg/worker/report/popeye/popeye_types.go diff --git a/worker/report/popeye/testdata/test_report_1.json b/pkg/worker/report/popeye/testdata/test_report_1.json similarity index 100% rename from worker/report/popeye/testdata/test_report_1.json rename to pkg/worker/report/popeye/testdata/test_report_1.json diff --git a/worker/report/popeye/testdata/test_report_2.json b/pkg/worker/report/popeye/testdata/test_report_2.json similarity index 100% rename from worker/report/popeye/testdata/test_report_2.json rename to pkg/worker/report/popeye/testdata/test_report_2.json diff --git a/worker/report/popeye/testdata/test_report_3.json b/pkg/worker/report/popeye/testdata/test_report_3.json similarity index 100% rename from worker/report/popeye/testdata/test_report_3.json rename to pkg/worker/report/popeye/testdata/test_report_3.json diff --git a/worker/report/popeye/testdata/test_report_4.json b/pkg/worker/report/popeye/testdata/test_report_4.json similarity index 100% rename from worker/report/popeye/testdata/test_report_4.json rename to pkg/worker/report/popeye/testdata/test_report_4.json diff --git a/worker/report/popeye/testdata/test_report_5.json b/pkg/worker/report/popeye/testdata/test_report_5.json similarity index 100% rename from worker/report/popeye/testdata/test_report_5.json rename to pkg/worker/report/popeye/testdata/test_report_5.json diff --git a/worker/report/popeye/testdata/test_report_6.json b/pkg/worker/report/popeye/testdata/test_report_6.json similarity index 100% rename from worker/report/popeye/testdata/test_report_6.json rename to pkg/worker/report/popeye/testdata/test_report_6.json diff --git a/worker/run/run.go b/pkg/worker/run/run.go similarity index 96% rename from worker/run/run.go rename to pkg/worker/run/run.go index 3a8bd124..5313d824 100644 --- a/worker/run/run.go +++ b/pkg/worker/run/run.go @@ -22,14 +22,13 @@ import ( "time" "github.com/go-logr/logr" - "github.com/undistro/zora/pkg/clientset/versioned" - "github.com/undistro/zora/worker/config" - "github.com/undistro/zora/worker/report" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - ctrl "sigs.k8s.io/controller-runtime" zorav1a1 "github.com/undistro/zora/apis/zora/v1alpha1" + "github.com/undistro/zora/pkg/clientset/versioned" + "github.com/undistro/zora/pkg/worker/config" + "github.com/undistro/zora/pkg/worker/report" ) // CreateClusterIssues creates instances of on the Kubernetes diff --git a/worker/run/run_test.go b/pkg/worker/run/run_test.go similarity index 98% rename from worker/run/run_test.go rename to pkg/worker/run/run_test.go index f07f432a..0bd80029 100644 --- a/worker/run/run_test.go +++ b/pkg/worker/run/run_test.go @@ -20,7 +20,7 @@ import ( "path" "testing" - "github.com/undistro/zora/worker/config" + "github.com/undistro/zora/pkg/worker/config" ) func TestDone(t *testing.T) {