particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Many: expose rhsm.subscription_manager.rhsm.auto_enable_yum_plugins

Browse source 
Expose the ${SUBJ} customization in Cloud API. Weldr API inherited it
automatically with the update of `osbuild/blueprint` to v1.6.0.

Adjust relevant test cases and unit tests to use this new customization.

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
This commit is contained in:
Tomáš Hozza 2025-04-29 13:32:45 +02:00 • committed by Achilleas Koutsou
parent 6f4c2899f8
commit 7036e2bcb9
6 changed files with 257 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

52
internal/cloudapi/v2/compose.go
View file

@ -469,32 +469,37 @@ func (rbp *Blueprint) GetCustomizationsFromBlueprintRequest() (*blueprint.Custom
}
conf := rhsm.Config
if conf.DnfPlugins != nil {
if dnfPlugins := conf.DnfPlugins; dnfPlugins != nil {
bpRhsm.Config.DNFPlugins = &blueprint.SubManDNFPluginsConfig{}
if conf.DnfPlugins.ProductId != nil && conf.DnfPlugins.ProductId.Enabled != nil {
if dnfPlugins.ProductId != nil && dnfPlugins.ProductId.Enabled != nil {
bpRhsm.Config.DNFPlugins.ProductID = &blueprint.DNFPluginConfig{
Enabled: common.ToPtr(*conf.DnfPlugins.ProductId.Enabled),
Enabled: common.ToPtr(*dnfPlugins.ProductId.Enabled),
}
}
if conf.DnfPlugins.SubscriptionManager != nil && conf.DnfPlugins.SubscriptionManager.Enabled != nil {
if dnfPlugins.SubscriptionManager != nil && dnfPlugins.SubscriptionManager.Enabled != nil {
bpRhsm.Config.DNFPlugins.SubscriptionManager = &blueprint.DNFPluginConfig{
Enabled: common.ToPtr(*conf.DnfPlugins.SubscriptionManager.Enabled),
Enabled: common.ToPtr(*dnfPlugins.SubscriptionManager.Enabled),
}
}
}
if conf.SubscriptionManager != nil {
bpRhsm.Config.SubscriptionManager = &blueprint.SubManConfig{}
if conf.SubscriptionManager.Rhsm != nil && conf.SubscriptionManager.Rhsm.ManageRepos != nil {
bpRhsm.Config.SubscriptionManager.RHSMConfig = &blueprint.SubManRHSMConfig{
ManageRepos: common.ToPtr(*conf.SubscriptionManager.Rhsm.ManageRepos),
if subMan := conf.SubscriptionManager; subMan != nil {
bpSubMan := &blueprint.SubManConfig{}
if subMan.Rhsm != nil {
bpSubMan.RHSMConfig = &blueprint.SubManRHSMConfig{}
if subMan.Rhsm.ManageRepos != nil {
bpSubMan.RHSMConfig.ManageRepos = common.ToPtr(*subMan.Rhsm.ManageRepos)
}
if subMan.Rhsm.AutoEnableYumPlugins != nil {
bpSubMan.RHSMConfig.AutoEnableYumPlugins = common.ToPtr(*subMan.Rhsm.AutoEnableYumPlugins)
}
}
if conf.SubscriptionManager.Rhsmcertd != nil && conf.SubscriptionManager.Rhsmcertd.AutoRegistration != nil {
bpRhsm.Config.SubscriptionManager.RHSMCertdConfig = &blueprint.SubManRHSMCertdConfig{
AutoRegistration: common.ToPtr(*conf.SubscriptionManager.Rhsmcertd.AutoRegistration),
if subMan.Rhsmcertd != nil && subMan.Rhsmcertd.AutoRegistration != nil {
bpSubMan.RHSMCertdConfig = &blueprint.SubManRHSMCertdConfig{
AutoRegistration: common.ToPtr(*subMan.Rhsmcertd.AutoRegistration),
}
}
bpRhsm.Config.SubscriptionManager = bpSubMan
}
c.RHSM = bpRhsm
@ -1054,18 +1059,23 @@ func (request *ComposeRequest) GetBlueprintFromCustomizations() (blueprint.Bluep
}
}
if conf.SubscriptionManager != nil {
bpRhsm.Config.SubscriptionManager = &blueprint.SubManConfig{}
if conf.SubscriptionManager.Rhsm != nil && conf.SubscriptionManager.Rhsm.ManageRepos != nil {
bpRhsm.Config.SubscriptionManager.RHSMConfig = &blueprint.SubManRHSMConfig{
ManageRepos: common.ToPtr(*conf.SubscriptionManager.Rhsm.ManageRepos),
if subMan := conf.SubscriptionManager; subMan != nil {
bpSubMan := &blueprint.SubManConfig{}
if subMan.Rhsm != nil {
bpSubMan.RHSMConfig = &blueprint.SubManRHSMConfig{}
if subMan.Rhsm.ManageRepos != nil {
bpSubMan.RHSMConfig.ManageRepos = common.ToPtr(*subMan.Rhsm.ManageRepos)
}
if subMan.Rhsm.AutoEnableYumPlugins != nil {
bpSubMan.RHSMConfig.AutoEnableYumPlugins = common.ToPtr(*subMan.Rhsm.AutoEnableYumPlugins)
}
}
if conf.SubscriptionManager.Rhsmcertd != nil && conf.SubscriptionManager.Rhsmcertd.AutoRegistration != nil {
bpRhsm.Config.SubscriptionManager.RHSMCertdConfig = &blueprint.SubManRHSMCertdConfig{
AutoRegistration: common.ToPtr(*conf.SubscriptionManager.Rhsmcertd.AutoRegistration),
if subMan.Rhsmcertd != nil && subMan.Rhsmcertd.AutoRegistration != nil {
bpSubMan.RHSMCertdConfig = &blueprint.SubManRHSMCertdConfig{
AutoRegistration: common.ToPtr(*subMan.Rhsmcertd.AutoRegistration),
}
}
bpRhsm.Config.SubscriptionManager = bpSubMan
}
bp.Customizations.RHSM = bpRhsm