blueprint: add cacert customization

osbuild · Nov 29, 2024 · e307d8d · e307d8d
1 parent 1372be3
commit e307d8d
Show file tree

Hide file tree

Showing 6 changed files with 234 additions and 186 deletions.
diff --git a/internal/blueprint/blueprint.go b/internal/blueprint/blueprint.go
@@ -406,6 +406,13 @@ func Convert(bp Blueprint) iblueprint.Blueprint {
 
 			customizations.RHSM = &irhsm
 		}
+
+		if ca := c.CACerts; ca != nil {
+			ica := iblueprint.CACustomization{
+				PEMCerts: ca.PEMCerts,
+			}
+			customizations.CACerts = &ica
+		}
 	}
 
 	ibp := iblueprint.Blueprint{

diff --git a/internal/blueprint/blueprint_convert_test.go b/internal/blueprint/blueprint_convert_test.go
@@ -211,6 +211,9 @@ func TestConvert(t *testing.T) {
 							},
 						},
 					},
+					CACerts: &CACustomization{
+						PEMCerts: []string{"pem-cert"},
+					},
 				},
 				Distro: "distro",
 			},
@@ -401,6 +404,9 @@ func TestConvert(t *testing.T) {
 							},
 						},
 					},
+					CACerts: &iblueprint.CACustomization{
+						PEMCerts: []string{"pem-cert"},
+					},
 				},
 				Distro: "distro",
 			},

diff --git a/internal/blueprint/customizations.go b/internal/blueprint/customizations.go
@@ -31,6 +31,7 @@ type Customizations struct {
 	Installer          *InstallerCustomization   `json:"installer,omitempty" toml:"installer,omitempty"`
 	RPM                *RPMCustomization         `json:"rpm,omitempty" toml:"rpm,omitempty"`
 	RHSM               *RHSMCustomization        `json:"rhsm,omitempty" toml:"rhsm,omitempty"`
+	CACerts            *CACustomization          `json:"cacerts,omitempty" toml:"cacerts,omitempty"`
 }
 
 type IgnitionCustomization struct {
@@ -135,6 +136,10 @@ type OpenSCAPJSONTailoringCustomizations struct {
 	Filepath  string `json:"filepath,omitempty" toml:"filepath,omitempty"`
 }
 
+type CACustomization struct {
+	PEMCerts []string `json:"pem_certs,omitempty" toml:"pem_certs,omitempty"`
+}
+
 type CustomizationError struct {
 	Message string
 }

diff --git a/internal/cloudapi/v2/compose.go b/internal/cloudapi/v2/compose.go
@@ -1015,6 +1015,12 @@ func (request *ComposeRequest) GetBlueprintFromCustomizations() (blueprint.Bluep
 		bp.Customizations.RHSM = bpRhsm
 	}
 
+	if cacerts := request.Customizations.Cacerts; cacerts != nil {
+		bp.Customizations.CACerts = &blueprint.CACustomization{
+			PEMCerts: cacerts.PemCerts,
+		}
+	}
+
 	// Did bp.Customizations get set at all? If not, set it back to nil
 	if reflect.DeepEqual(*bp.Customizations, blueprint.Customizations{}) {
 		bp.Customizations = nil