v1: add policyID to compose request to composer

The policy ID will be added to the RHSM facts, allowing the compliance service to tie instances to the specified compliance policy.
osbuild · Sep 9, 2024 · 02aeb86 · 02aeb86
1 parent cd806cc
commit 02aeb86
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/internal/clients/composer/openapi.v2.gen.go b/internal/clients/composer/openapi.v2.gen.go
diff --git a/internal/clients/composer/openapi.v2.yml b/internal/clients/composer/openapi.v2.yml
@@ -975,6 +975,12 @@ components:
       required:
         - profile_id
       properties:
+        policy_id:
+          type: string
+          format: uuid
+          description: |
+            Puts a specified policy ID in the RHSM facts, so that any instances registered to
+            insights will be automatically connected to the compliance policy in the console.
         profile_id:
           type: string
         tailoring:
@@ -986,6 +992,12 @@ components:
       required:
         - profile_id
       properties:
+        policy_id:
+          type: string
+          format: uuid
+          description: |
+            Puts a specified policy ID in the RHSM facts, so that any instances registered to
+            insights will be automatically connected to the compliance policy in the console.
         profile_id:
           type: string
         datastream:

diff --git a/internal/v1/handler_compose_image.go b/internal/v1/handler_compose_image.go
@@ -698,6 +698,7 @@ func (h *Handlers) buildCustomizations(ctx echo.Context, cr *ComposeRequest, d *
 
 			res.Openscap = &composer.OpenSCAP{
 				ProfileId: pdata.ProfileID,
+				PolicyId:  &policy.PolicyId,
 				JsonTailoring: &composer.OpenSCAPJSONTailoring{
 					ProfileId: pdata.ProfileID,
 					Filepath:  "/etc/osbuild/openscap-tailoring.json",

diff --git a/internal/v1/handler_post_compose_test.go b/internal/v1/handler_post_compose_test.go
@@ -2492,6 +2492,7 @@ func TestComposeCustomizations(t *testing.T) {
 				Customizations: &composer.Customizations{
 					Openscap: &composer.OpenSCAP{
 						ProfileId: "openscap-ref-id",
+						PolicyId:  &policyID,
 						JsonTailoring: &composer.OpenSCAPJSONTailoring{
 							ProfileId: "openscap-ref-id",
 							Filepath:  "/etc/osbuild/openscap-tailoring.json",