fix(ci): Restructured directories to resolve CI failures

.gitignore

@@ -5,7 +5,7 @@
 *.dll
 *.so
 *.dylib
-bin/*
+bin
 Dockerfile.cross
 
 # Test binary, build with `go test -c`

nimbus-operator/Dockerfile → Dockerfile

@@ -16,8 +16,8 @@ RUN go mod download
 
 # Copy the go source
 COPY cmd/main.go cmd/main.go
-COPY pkg/api/ pkg/api/
-COPY pkg/controllers/ pkg/controllers/
+COPY api/ api/
+COPY pkg/ pkg/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command

nimbus-operator/cmd/main.go → cmd/main.go

@@ -20,11 +20,11 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	// Importing custom API types and controllers
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	nimbuspolicy "github.com/5GSEC/nimbus/nimbus-operator/pkg/exporter/nimbuspolicy"
-	securityintent "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/securityintent"
-	securityintentbinding "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/securityintentbinding"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/exporter/nimbuspolicy"
+	"github.com/5GSEC/nimbus/pkg/receiver/securityintent"
+	"github.com/5GSEC/nimbus/pkg/receiver/securityintentbinding"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 
 	// Importing third-party Kubernetes resource types
 	ciliumv2 "github.com/cilium/cilium/pkg/k8s/apis/cilium.io/v2"

nimbus-operator/go.mod → go.mod

@@ -1,4 +1,4 @@
-module github.com/5GSEC/nimbus/nimbus-operator
+module github.com/5GSEC/nimbus
 
 go 1.20
 

nimbus-operator/pkg/exporter/httpexporter/http_nimbus.go → pkg/exporter/httpexporter/http_nimbus.go

@@ -15,7 +15,7 @@ import (
 	"fmt"
 	"net/http"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 )
 
 // HttpNimbusExporter struct defines the HTTP client and the URL for exporting Nimbus policies.

nimbus-operator/pkg/exporter/nimbuspolicy/nimbuspolicy_controller.go → pkg/exporter/nimbuspolicy/nimbuspolicy_controller.go

@@ -12,9 +12,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	"github.com/5GSEC/nimbus/nimbus-operator/pkg/exporter/httpexporter"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/exporter/httpexporter"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 )
 
 // NimbusPolicyReconciler reconciles a NimbusPolicy object.

nimbus-operator/pkg/exporter/nimbuspolicy/suite_test.go → pkg/exporter/nimbuspolicy/suite_test.go

@@ -19,7 +19,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

nimbus-kubearmor/receiver/server/server.go → pkg/nimbus-kubearmor/receiver/server/server.go

@@ -6,7 +6,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"sync"
@@ -28,7 +28,7 @@ func main() {
 		}
 
 		// Read the request body
-		body, err := ioutil.ReadAll(r.Body)
+		body, err := io.ReadAll(r.Body)
 		if err != nil {
 			http.Error(w, "Error reading request body", http.StatusInternalServerError)
 			return

nimbus-operator/pkg/processor/intentbinder/intent_binder.go → pkg/processor/intentbinder/intent_binder.go

@@ -6,7 +6,7 @@ package intentbinder
 import (
 	"context"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/types"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

nimbus-operator/pkg/processor/nimbuspolicybuilder/nimbuspolicy_builder.go → pkg/processor/nimbuspolicybuilder/nimbuspolicy_builder.go

@@ -11,8 +11,8 @@ import (
 	"github.com/google/cel-go/checker/decls"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	intentbinder "github.com/5GSEC/nimbus/nimbus-operator/pkg/processor/intentbinder"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/processor/intentbinder"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"

nimbus-operator/pkg/receiver/securityintent/securityintent_controller.go → pkg/receiver/securityintent/securityintent_controller.go

@@ -12,8 +12,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 )
 
 type SecurityIntentReconciler struct {

nimbus-operator/pkg/receiver/securityintent/suite_test.go → pkg/receiver/securityintent/suite_test.go

@@ -19,7 +19,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

nimbus-operator/pkg/receiver/securityintentbinding/securityintentbinding_controller.go → pkg/receiver/securityintentbinding/securityintentbinding_controller.go

@@ -12,10 +12,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
-	"github.com/5GSEC/nimbus/nimbus-operator/pkg/processor/intentbinder"
-	"github.com/5GSEC/nimbus/nimbus-operator/pkg/processor/nimbuspolicybuilder"
-	watcher "github.com/5GSEC/nimbus/nimbus-operator/pkg/receiver/watcher"
+	v1 "github.com/5GSEC/nimbus/api/v1"
+	"github.com/5GSEC/nimbus/pkg/processor/intentbinder"
+	"github.com/5GSEC/nimbus/pkg/processor/nimbuspolicybuilder"
+	"github.com/5GSEC/nimbus/pkg/receiver/watcher"
 )
 
 // SecurityIntentBindingReconciler reconciles a SecurityIntentBinding object

nimbus-operator/pkg/receiver/securityintentbinding/suite_test.go → pkg/receiver/securityintentbinding/suite_test.go

@@ -19,7 +19,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	//+kubebuilder:scaffold:imports
 )
 

nimbus-operator/pkg/receiver/watcher/watch_binding.go → pkg/receiver/watcher/watch_binding.go

@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

nimbus-operator/pkg/receiver/watcher/watch_controller.go → pkg/receiver/watcher/watch_controller.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"fmt"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

nimbus-operator/pkg/receiver/watcher/watch_intent.go → pkg/receiver/watcher/watch_intent.go

@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 )
 

nimbus-operator/pkg/receiver/watcher/watch_nimbuspolicy.go → pkg/receiver/watcher/watch_nimbuspolicy.go

@@ -12,7 +12,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	v1 "github.com/5GSEC/nimbus/nimbus-operator/pkg/api/v1"
+	v1 "github.com/5GSEC/nimbus/api/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 )