From d8b79ecdbe8cd295013f3a8fe274f157ff23c482 Mon Sep 17 00:00:00 2001 From: Afek Berger Date: Mon, 9 Sep 2024 13:43:04 +0300 Subject: [PATCH] WIP: Removed Extra field --- pkg/apis/softwarecomposition/types.go | 1 - pkg/apis/softwarecomposition/v1beta1/types.go | 3 +- .../v1beta1/zz_generated.conversion.go | 2 -- .../v1beta1/zz_generated.deepcopy.go | 23 -------------- .../zz_generated.deepcopy.go | 23 -------------- pkg/generated/openapi/zz_generated.openapi.go | 30 ------------------- .../file/applicationprofile_processor.go | 1 - .../file/applicationprofile_processor_test.go | 20 ------------- 8 files changed, 1 insertion(+), 102 deletions(-) diff --git a/pkg/apis/softwarecomposition/types.go b/pkg/apis/softwarecomposition/types.go index a2fe8c38e..2b0bb16cf 100644 --- 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 index abbd91131..20bd1c823 100644 --- 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 index 9e38746e6..4816f1e76 100644 --- a/pkg/apis/softwarecomposition/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/softwarecomposition/v1beta1/zz_generated.conversion.go @@ -2168,7 +2168,6 @@ func autoConvert_v1beta1_ApplicationProfileContainer_To_softwarecomposition_Appl return err } out.Endpoints = *(*[]softwarecomposition.HTTPEndpoint)(unsafe.Pointer(&in.Endpoints)) - out.Extra = *(*map[string][]map[string]string)(unsafe.Pointer(&in.Extra)) return nil } @@ -2187,7 +2186,6 @@ func autoConvert_softwarecomposition_ApplicationProfileContainer_To_v1beta1_Appl return err } out.Endpoints = *(*[]HTTPEndpoint)(unsafe.Pointer(&in.Endpoints)) - out.Extra = *(*map[string][]map[string]string)(unsafe.Pointer(&in.Extra)) return nil } diff --git a/pkg/apis/softwarecomposition/v1beta1/zz_generated.deepcopy.go b/pkg/apis/softwarecomposition/v1beta1/zz_generated.deepcopy.go index efd8c5389..c13811bc0 100644 --- a/pkg/apis/softwarecomposition/v1beta1/zz_generated.deepcopy.go +++ b/pkg/apis/softwarecomposition/v1beta1/zz_generated.deepcopy.go @@ -240,29 +240,6 @@ func (in *ApplicationProfileContainer) DeepCopyInto(out *ApplicationProfileConta (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.Extra != nil { - in, out := &in.Extra, &out.Extra - *out = make(map[string][]map[string]string, len(*in)) - for key, val := range *in { - var outVal []map[string]string - if val == nil { - (*out)[key] = nil - } else { - in, out := &val, &outVal - *out = make([]map[string]string, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - } - } - (*out)[key] = outVal - } - } return } diff --git a/pkg/apis/softwarecomposition/zz_generated.deepcopy.go b/pkg/apis/softwarecomposition/zz_generated.deepcopy.go index 7f92ce187..b241e84ce 100644 --- a/pkg/apis/softwarecomposition/zz_generated.deepcopy.go +++ b/pkg/apis/softwarecomposition/zz_generated.deepcopy.go @@ -240,29 +240,6 @@ func (in *ApplicationProfileContainer) DeepCopyInto(out *ApplicationProfileConta (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.Extra != nil { - in, out := &in.Extra, &out.Extra - *out = make(map[string][]map[string]string, len(*in)) - for key, val := range *in { - var outVal []map[string]string - if val == nil { - (*out)[key] = nil - } else { - in, out := &val, &outVal - *out = make([]map[string]string, len(*in)) - for i := range *in { - if (*in)[i] != nil { - in, out := &(*in)[i], &(*out)[i] - *out = make(map[string]string, len(*in)) - for key, val := range *in { - (*out)[key] = val - } - } - } - } - (*out)[key] = outVal - } - } return } diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index e0466bdc8..13dc49318 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -657,36 +657,6 @@ func schema_pkg_apis_softwarecomposition_v1beta1_ApplicationProfileContainer(ref }, }, }, - "extra": { - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - AdditionalProperties: &spec.SchemaOrBool{ - Allows: true, - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, - AdditionalProperties: &spec.SchemaOrBool{ - Allows: true, - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - }, - }, - }, - }, - }, - }, - }, - }, }, Required: []string{"capabilities", "execs", "opens", "syscalls", "endpoints"}, }, diff --git a/pkg/registry/file/applicationprofile_processor.go b/pkg/registry/file/applicationprofile_processor.go index 60081809c..00342c9f8 100644 --- 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 index bdeab7cff..bffab9c8f 100644 --- 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"}, - }, - }, }, }, },