WIP: Removed Extra field

kubescape · Sep 9, 2024 · d8b79ec · d8b79ec
1 parent 08d18d2
commit d8b79ec
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 102 deletions.
diff --git a/pkg/apis/softwarecomposition/types.go b/pkg/apis/softwarecomposition/types.go
@@ -286,7 +286,6 @@ type ApplicationProfileContainer struct {
 	Syscalls       []string
 	SeccompProfile SingleSeccompProfile
 	Endpoints      []HTTPEndpoint
-	Extra          map[string][]map[string]string
 }
 
 type ExecCalls struct {

diff --git a/pkg/apis/softwarecomposition/v1beta1/types.go b/pkg/apis/softwarecomposition/v1beta1/types.go
@@ -270,8 +270,7 @@ type ApplicationProfileContainer struct {
 	SeccompProfile SingleSeccompProfile `json:"seccompProfile,omitempty"`
 	// +patchMergeKey=endpoint
 	// +patchStrategy=merge
-	Endpoints []HTTPEndpoint                 `json:"endpoints" patchStrategy:"merge" patchMergeKey:"endpoint"`
-	Extra     map[string][]map[string]string `json:"extra,omitempty"`
+	Endpoints []HTTPEndpoint `json:"endpoints" patchStrategy:"merge" patchMergeKey:"endpoint"`
 }
 
 type ExecCalls struct {

diff --git a/pkg/apis/softwarecomposition/v1beta1/zz_generated.conversion.go b/pkg/apis/softwarecomposition/v1beta1/zz_generated.conversion.go
diff --git a/pkg/apis/softwarecomposition/v1beta1/zz_generated.deepcopy.go b/pkg/apis/softwarecomposition/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/apis/softwarecomposition/zz_generated.deepcopy.go b/pkg/apis/softwarecomposition/zz_generated.deepcopy.go
diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
diff --git a/pkg/registry/file/applicationprofile_processor.go b/pkg/registry/file/applicationprofile_processor.go
@@ -63,6 +63,5 @@ func deflateApplicationProfileContainer(container softwarecomposition.Applicatio
 		Syscalls:       mapset.Sorted(mapset.NewThreadUnsafeSet(container.Syscalls...)),
 		SeccompProfile: container.SeccompProfile,
 		Endpoints:      endpoints,
-		Extra:          container.Extra,
 	}
 }
diff --git a/pkg/registry/file/applicationprofile_processor_test.go b/pkg/registry/file/applicationprofile_processor_test.go
@@ -70,16 +70,6 @@ func TestApplicationProfileProcessor_PreSave(t *testing.T) {
 									Headers:   map[string][]string{},
 								},
 							},
-							Extra: map[string][]map[string]string{
-								"metadata": {
-									{"version": "v1"},
-									{"environment": "production"},
-								},
-								"security": {
-									{"encryption": "AES-256"},
-									{"audit": "enabled"},
-								},
-							},
 						},
 					},
 				},
@@ -144,16 +134,6 @@ func TestApplicationProfileProcessor_PreSave(t *testing.T) {
 									Headers:   map[string][]string{},
 								},
 							},
-							Extra: map[string][]map[string]string{
-								"metadata": {
-									{"version": "v1"},
-									{"environment": "production"},
-								},
-								"security": {
-									{"encryption": "AES-256"},
-									{"audit": "enabled"},
-								},
-							},
 						},
 					},
 				},