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

cloudapi: change Organization customization to a string

Browse source 
Internally change Organization in the SubscriptionImageOptions
to a string instead of an int.
This commit is contained in:
Chloe Kaubisch 2021-08-12 12:18:24 +02:00 • committed by Ondřej Budai
parent b8ad702ee7
commit 11023cb8a8
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/cloudapi/server.go
View file

@ -178,7 +178,7 @@ func (h *apiHandlers) Compose(ctx echo.Context) error {
imageOptions := distro.ImageOptions{Size: imageType.Size(0)} imageOptions := distro.ImageOptions{Size: imageType.Size(0)}
if request.Customizations != nil && request.Customizations.Subscription != nil { if request.Customizations != nil && request.Customizations.Subscription != nil {
imageOptions.Subscription = &distro.SubscriptionImageOptions{ imageOptions.Subscription = &distro.SubscriptionImageOptions{
Organization: request.Customizations.Subscription.Organization, Organization: fmt.Sprintf("%d", request.Customizations.Subscription.Organization),
ActivationKey: request.Customizations.Subscription.ActivationKey, ActivationKey: request.Customizations.Subscription.ActivationKey,
ServerUrl: request.Customizations.Subscription.ServerUrl, ServerUrl: request.Customizations.Subscription.ServerUrl,
BaseUrl: request.Customizations.Subscription.BaseUrl, BaseUrl: request.Customizations.Subscription.BaseUrl,

2
internal/distro/distro.go
View file

@ -130,7 +130,7 @@ type OSTreeImageOptions struct {
// ServerUrl denotes the host to register the system with // ServerUrl denotes the host to register the system with
// BaseUrl specifies the repository URL for DNF // BaseUrl specifies the repository URL for DNF
type SubscriptionImageOptions struct { type SubscriptionImageOptions struct {
Organization int Organization string
ActivationKey string ActivationKey string
ServerUrl string ServerUrl string
BaseUrl string BaseUrl string

2
internal/distro/rhel8/distro.go
View file

@ -397,7 +397,7 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")

2
internal/distro/rhel84/distro.go
View file

@ -459,7 +459,7 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")

6
internal/distro/rhel85/pipelines.go
View file

@ -335,7 +335,7 @@ func ec2BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")
@ -695,7 +695,7 @@ func osPipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec, bpPackag
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")
@ -782,7 +782,7 @@ func ostreeTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")

6
internal/distro/rhel90/pipelines.go
View file

@ -329,7 +329,7 @@ func ec2BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")
@ -635,7 +635,7 @@ func osPipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec, bpPackag
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")
@ -717,7 +717,7 @@ func ostreeTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
if options.Subscription != nil { if options.Subscription != nil {
commands := []string{ commands := []string{
fmt.Sprintf("/usr/sbin/subscription-manager register --org=%d --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl), fmt.Sprintf("/usr/sbin/subscription-manager register --org=%s --activationkey=%s --serverurl %s --baseurl %s", options.Subscription.Organization, options.Subscription.ActivationKey, options.Subscription.ServerUrl, options.Subscription.BaseUrl),
} }
if options.Subscription.Insights { if options.Subscription.Insights {
commands = append(commands, "/usr/bin/insights-client --register") commands = append(commands, "/usr/bin/insights-client --register")