add profobufs and fixes

Signed-off-by: Matthias Bertschy <[email protected]>
kubescape · Sep 6, 2024 · 2da000d · 2da000d
1 parent 72918a9
commit 2da000d
Show file tree

Hide file tree

Showing 11 changed files with 1,229 additions and 706 deletions.
diff --git a/pkg/apis/softwarecomposition/consts/consts.go b/pkg/apis/softwarecomposition/consts/consts.go
@@ -4,12 +4,5 @@ type NetworkDirection string
 
 const (
 	Inbound  NetworkDirection = "inbound"
-	Outbound NetworkDirection = "inbound"
-)
-
-type IsInternal string
-
-const (
-	True  IsInternal = "true"
-	False IsInternal = "false"
+	Outbound NetworkDirection = "outbound"
 )
diff --git a/pkg/apis/softwarecomposition/types.go b/pkg/apis/softwarecomposition/types.go
@@ -621,7 +621,7 @@ type Arg struct {
 type HTTPEndpoint struct {
 	Endpoint  string
 	Methods   []string
-	Internal  consts.IsInternal
+	Internal  bool
 	Direction consts.NetworkDirection
 	Headers   map[string][]string
 }
@@ -631,7 +631,6 @@ func (e *HTTPEndpoint) Equal(other *HTTPEndpoint) bool {
 		return e == other
 	}
 	return e.Endpoint == other.Endpoint && e.Direction == other.Direction && e.Internal == other.Internal
-
 }
 
 type SpecBase struct {

diff --git a/pkg/apis/softwarecomposition/v1beta1/generated.pb.go b/pkg/apis/softwarecomposition/v1beta1/generated.pb.go
diff --git a/pkg/apis/softwarecomposition/v1beta1/generated.proto b/pkg/apis/softwarecomposition/v1beta1/generated.proto
diff --git a/pkg/apis/softwarecomposition/v1beta1/types.go b/pkg/apis/softwarecomposition/v1beta1/types.go
@@ -212,7 +212,7 @@ type ApplicationProfileContainer struct {
 	Opens          []OpenCalls          `json:"opens" patchStrategy:"merge" patchMergeKey:"path" protobuf:"bytes,4,rep,name=opens"`
 	Syscalls       []string             `json:"syscalls" protobuf:"bytes,5,rep,name=syscalls"`
 	SeccompProfile SingleSeccompProfile `json:"seccompProfile,omitempty" protobuf:"bytes,6,opt,name=seccompProfile"`
-	Endpoints []HTTPEndpoint `json:"endpoints" patchStrategy:"merge" patchMergeKey:"endpoint"`
+	Endpoints      []HTTPEndpoint       `json:"endpoints" patchStrategy:"merge" patchMergeKey:"endpoint" protobuf:"bytes,7,rep,name=endpoints"`
 }
 
 type ExecCalls struct {
@@ -474,7 +474,7 @@ type SBOMSyftFiltered struct {
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	Spec   SBOMSyftSpec   `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"`
-	Status SBOMSyftStatus `json:"status,omitempty	" protobuf:"bytes,3,opt,name=status"`
+	Status SBOMSyftStatus `json:"status,omitempty\t" protobuf:"bytes,3,opt,name=status"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -563,11 +563,11 @@ type Syscall struct {
 }
 
 type HTTPEndpoint struct {
-	Endpoint  string                  `json:"endpoint,omitempty"`
-	Methods   []string                `json:"methods,omitempty"`
-	Internal  consts.IsInternal       `json:"internal,omitempty"`
-	Direction consts.NetworkDirection `json:"direction,omitempty"`
-	Headers   map[string][]string     `json:"headers,omitempty"`
+	Endpoint  string                  `json:"endpoint,omitempty" protobuf:"bytes,1,opt,name=endpoint"`
+	Methods   []string                `json:"methods,omitempty" protobuf:"bytes,2,opt,name=methods"`
+	Internal  bool                    `json:"internal,omitempty" protobuf:"bytes,3,opt,name=internal"`
+	Direction consts.NetworkDirection `json:"direction,omitempty" protobuf:"bytes,4,opt,name=direction"`
+	Headers   map[string][]string     `json:"headers,omitempty" protobuf:"bytes,5,opt,name=headers"`
 }
 
 // Arg defines the specific syscall in seccomp.

diff --git a/pkg/apis/softwarecomposition/v1beta1/zz_generated.conversion.go b/pkg/apis/softwarecomposition/v1beta1/zz_generated.conversion.go
diff --git a/pkg/generated/clientset/versioned/typed/softwarecomposition/v1beta1/applicationprofile.go b/pkg/generated/clientset/versioned/typed/softwarecomposition/v1beta1/applicationprofile.go
diff --git a/...ntset/versioned/typed/softwarecomposition/v1beta1/fake/fake_softwarecomposition_client.go b/...ntset/versioned/typed/softwarecomposition/v1beta1/fake/fake_softwarecomposition_client.go
diff --git a/...rated/clientset/versioned/typed/softwarecomposition/v1beta1/softwarecomposition_client.go b/...rated/clientset/versioned/typed/softwarecomposition/v1beta1/softwarecomposition_client.go
diff --git a/pkg/registry/file/applicationprofile_processor.go b/pkg/registry/file/applicationprofile_processor.go
@@ -54,7 +54,6 @@ func deflateApplicationProfileContainer(container softwarecomposition.Applicatio
 		logger.L().Debug("failed to analyze endpoints", loggerhelpers.Error(err))
 		endpoints = container.Endpoints
 	}
-
 	return softwarecomposition.ApplicationProfileContainer{
 		Name:           container.Name,
 		Capabilities:   mapset.Sorted(mapset.NewThreadUnsafeSet(container.Capabilities...)),

diff --git a/pkg/registry/file/applicationprofile_processor_test.go b/pkg/registry/file/applicationprofile_processor_test.go
@@ -65,7 +65,7 @@ func TestApplicationProfileProcessor_PreSave(t *testing.T) {
 								{
 									Endpoint:  "http://localhost:8080",
 									Methods:   []string{"GET"},
-									Internal:  consts.False,
+									Internal:  false,
 									Direction: consts.Inbound,
 									Headers:   map[string][]string{},
 								},
@@ -129,7 +129,7 @@ func TestApplicationProfileProcessor_PreSave(t *testing.T) {
 								{
 									Endpoint:  "http://localhost:8080",
 									Methods:   []string{"GET"},
-									Internal:  consts.False,
+									Internal:  false,
 									Direction: consts.Inbound,
 									Headers:   map[string][]string{},
 								},