From fa6f3ba197d0ffe40dcef359d015f8dfa84361dd Mon Sep 17 00:00:00 2001 From: Gianluca Zuccarelli Date: Mon, 26 Jun 2023 10:50:13 +0100 Subject: [PATCH] cloudapi: openscap integration Enable the openscap customizations in the cloudapi. --- internal/cloudapi/v2/handler.go | 13 ++ internal/cloudapi/v2/openapi.v2.gen.go | 187 +++++++++++++------------ internal/cloudapi/v2/openapi.v2.yml | 9 ++ internal/cloudapi/v2/v2_test.go | 5 +- 4 files changed, 123 insertions(+), 91 deletions(-) diff --git a/internal/cloudapi/v2/handler.go b/internal/cloudapi/v2/handler.go index 2e2e5210c..248fe281f 100644 --- a/internal/cloudapi/v2/handler.go +++ b/internal/cloudapi/v2/handler.go @@ -329,6 +329,19 @@ func (h *apiHandlers) PostCompose(ctx echo.Context) error { } } + if request.Customizations != nil && request.Customizations.Openscap != nil { + openSCAPCustomization := &blueprint.OpenSCAPCustomization{ + ProfileID: request.Customizations.Openscap.ProfileId, + } + if bp.Customizations == nil { + bp.Customizations = &blueprint.Customizations{ + OpenSCAP: openSCAPCustomization, + } + } else { + bp.Customizations.OpenSCAP = openSCAPCustomization + } + } + if request.Customizations != nil && request.Customizations.CustomRepositories != nil { repoCustomizations := []blueprint.RepositoryCustomization{} for _, repo := range *request.Customizations.CustomRepositories { diff --git a/internal/cloudapi/v2/openapi.v2.gen.go b/internal/cloudapi/v2/openapi.v2.gen.go index 71fba1b6d..c35653b22 100644 --- a/internal/cloudapi/v2/openapi.v2.gen.go +++ b/internal/cloudapi/v2/openapi.v2.gen.go @@ -325,6 +325,7 @@ type Customizations struct { Directories *[]Directory `json:"directories,omitempty"` Files *[]File `json:"files,omitempty"` Filesystem *[]Filesystem `json:"filesystem,omitempty"` + Openscap *OpenSCAP `json:"openscap,omitempty"` Packages *[]string `json:"packages,omitempty"` // Extra repositories for packages specified in customizations. These @@ -526,6 +527,11 @@ type ObjectReference struct { Kind string `json:"kind"` } +// OpenSCAP defines model for OpenSCAP. +type OpenSCAP struct { + ProfileId string `json:"profile_id"` +} + // PackageMetadata defines model for PackageMetadata. type PackageMetadata struct { Arch string `json:"arch"` @@ -917,96 +923,97 @@ var swaggerSpec = []string{ "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", + "G21SOR57AAA=", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/internal/cloudapi/v2/openapi.v2.yml b/internal/cloudapi/v2/openapi.v2.yml index 2c0b29db2..4118de95e 100644 --- a/internal/cloudapi/v2/openapi.v2.yml +++ b/internal/cloudapi/v2/openapi.v2.yml @@ -863,6 +863,13 @@ components: type: boolean priority: type: integer + OpenSCAP: + type: object + required: + - profile_id + properties: + profile_id: + type: string UploadOptions: anyOf: - $ref: '#/components/schemas/AWSEC2UploadOptions' @@ -1065,6 +1072,8 @@ components: repositories will be used to depsolve and retrieve packages. Additionally, these packages will be saved and imported to the `/etc/yum.repos.d/` directory on the image + openscap: + $ref: '#/components/schemas/OpenSCAP' filesystem: type: array items: diff --git a/internal/cloudapi/v2/v2_test.go b/internal/cloudapi/v2/v2_test.go index 3478982b4..ad2496a62 100644 --- a/internal/cloudapi/v2/v2_test.go +++ b/internal/cloudapi/v2/v2_test.go @@ -973,7 +973,10 @@ func TestComposeCustomizations(t *testing.T) { "group": 1000, "data": "Hello world!" } - ] + ], + "openscap": { + "profile_id": "test_profile" + } }, "image_request":{ "architecture": "%s",