osbuild: add insights-client config stage

pkg/customizations/subscription/subscription.go

@@ -15,6 +15,7 @@ type ImageOptions struct {
 	BaseUrl       string `json:"base_url"`
 	Insights      bool   `json:"insights"`
 	Rhc           bool   `json:"rhc"`
+	Proxy         string `json:"proxy"`
 }
 
 type RHSMStatus string

pkg/manifest/os.go

@@ -99,35 +99,36 @@ type OSCustomizations struct {
 	ShellInit []shell.InitFile
 
 	// TODO: drop osbuild types from the API
-	Firewall            *osbuild.FirewallStageOptions
-	Grub2Config         *osbuild.GRUB2Config
-	Sysconfig           []*osbuild.SysconfigStageOptions
-	SystemdLogind       []*osbuild.SystemdLogindStageOptions
-	CloudInit           []*osbuild.CloudInitStageOptions
-	Modprobe            []*osbuild.ModprobeStageOptions
-	DracutConf          []*osbuild.DracutConfStageOptions
-	SystemdUnit         []*osbuild.SystemdUnitStageOptions
-	Authselect          *osbuild.AuthselectStageOptions
-	SELinuxConfig       *osbuild.SELinuxConfigStageOptions
-	Tuned               *osbuild.TunedStageOptions
-	Tmpfilesd           []*osbuild.TmpfilesdStageOptions
-	PamLimitsConf       []*osbuild.PamLimitsConfStageOptions
-	Sysctld             []*osbuild.SysctldStageOptions
-	DNFConfig           []*osbuild.DNFConfigStageOptions
-	DNFAutomaticConfig  *osbuild.DNFAutomaticConfigStageOptions
-	YUMConfig           *osbuild.YumConfigStageOptions
-	YUMRepos            []*osbuild.YumReposStageOptions
-	SshdConfig          *osbuild.SshdConfigStageOptions
-	GCPGuestAgentConfig *osbuild.GcpGuestAgentConfigOptions
-	AuthConfig          *osbuild.AuthconfigStageOptions
-	PwQuality           *osbuild.PwqualityConfStageOptions
-	NTPServers          []osbuild.ChronyConfigServer
-	WAAgentConfig       *osbuild.WAAgentConfStageOptions
-	UdevRules           *osbuild.UdevRulesStageOptions
-	WSLConfig           *osbuild.WSLConfStageOptions
-	LeapSecTZ           *string
-	Presets             []osbuild.Preset
-	ContainersStorage   *string
+	Firewall             *osbuild.FirewallStageOptions
+	Grub2Config          *osbuild.GRUB2Config
+	Sysconfig            []*osbuild.SysconfigStageOptions
+	SystemdLogind        []*osbuild.SystemdLogindStageOptions
+	CloudInit            []*osbuild.CloudInitStageOptions
+	Modprobe             []*osbuild.ModprobeStageOptions
+	DracutConf           []*osbuild.DracutConfStageOptions
+	SystemdUnit          []*osbuild.SystemdUnitStageOptions
+	Authselect           *osbuild.AuthselectStageOptions
+	SELinuxConfig        *osbuild.SELinuxConfigStageOptions
+	Tuned                *osbuild.TunedStageOptions
+	Tmpfilesd            []*osbuild.TmpfilesdStageOptions
+	PamLimitsConf        []*osbuild.PamLimitsConfStageOptions
+	Sysctld              []*osbuild.SysctldStageOptions
+	DNFConfig            []*osbuild.DNFConfigStageOptions
+	DNFAutomaticConfig   *osbuild.DNFAutomaticConfigStageOptions
+	YUMConfig            *osbuild.YumConfigStageOptions
+	YUMRepos             []*osbuild.YumReposStageOptions
+	SshdConfig           *osbuild.SshdConfigStageOptions
+	InsightsClientConfig *osbuild.InsightsClientConfigStageOptions
+	GCPGuestAgentConfig  *osbuild.GcpGuestAgentConfigOptions
+	AuthConfig           *osbuild.AuthconfigStageOptions
+	PwQuality            *osbuild.PwqualityConfStageOptions
+	NTPServers           []osbuild.ChronyConfigServer
+	WAAgentConfig        *osbuild.WAAgentConfStageOptions
+	UdevRules            *osbuild.UdevRulesStageOptions
+	WSLConfig            *osbuild.WSLConfStageOptions
+	LeapSecTZ            *string
+	Presets              []osbuild.Preset
+	ContainersStorage    *string
 
 	// OpenSCAP config
 	OpenSCAPRemediationConfig *oscap.RemediationConfig
@@ -586,7 +587,11 @@ func (p *OS) serialize() osbuild.Pipeline {
 	}
 
 	if p.SshdConfig != nil {
-		pipeline.AddStage((osbuild.NewSshdConfigStage(p.SshdConfig)))
+		pipeline.AddStage(osbuild.NewSshdConfigStage(p.SshdConfig))
+	}
+
+	if p.InsightsClientConfig != nil {
+		pipeline.AddStage(osbuild.NewInsightsClientConfigStage(p.InsightsClientConfig))
 	}
 
 	if p.AuthConfig != nil {

pkg/osbuild/insights_client_config_stage.go

@@ -0,0 +1,15 @@
+package osbuild
+
+type InsightsClientConfigStageOptions struct {
+	Proxy string `json:"proxy,omitempty"`
+	Path  string `json:"path,omitempty"`
+}
+
+func (InsightsClientConfigStageOptions) isStageOptions() {}
+
+func NewInsightsClientConfigStage(options *InsightsClientConfigStageOptions) *Stage {
+	return &Stage{
+		Type:    "org.osbuild.insights-client.config",
+		Options: options,
+	}
+}

pkg/osbuild/insights_client_config_stage_test.go

@@ -0,0 +1,15 @@
+package osbuild
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestNewInsightsClientConfigStage(t *testing.T) {
+	expectedStage := &Stage{
+		Type:    "org.osbuild.insights-client.config",
+		Options: &InsightsClientConfigStageOptions{},
+	}
+	actualStage := NewInsightsClientConfigStage(&InsightsClientConfigStageOptions{})
+	assert.Equal(t, expectedStage, actualStage)
+}