From 11023cb8a80168285b32b006e4bb484c89e080d1 Mon Sep 17 00:00:00 2001 From: Chloe Kaubisch Date: Thu, 12 Aug 2021 12:18:24 +0200 Subject: [PATCH] cloudapi: change Organization customization to a string Internally change Organization in the SubscriptionImageOptions to a string instead of an int. --- internal/cloudapi/server.go | 2 +- internal/distro/distro.go | 2 +- internal/distro/rhel8/distro.go | 2 +- internal/distro/rhel84/distro.go | 2 +- internal/distro/rhel85/pipelines.go | 6 +++--- internal/distro/rhel90/pipelines.go | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/cloudapi/server.go b/internal/cloudapi/server.go index c19f75508..03dc7c5d4 100644 --- a/internal/cloudapi/server.go +++ b/internal/cloudapi/server.go @@ -178,7 +178,7 @@ func (h *apiHandlers) Compose(ctx echo.Context) error { imageOptions := distro.ImageOptions{Size: imageType.Size(0)} if request.Customizations != nil && request.Customizations.Subscription != nil { imageOptions.Subscription = &distro.SubscriptionImageOptions{ - Organization: request.Customizations.Subscription.Organization, + Organization: fmt.Sprintf("%d", request.Customizations.Subscription.Organization), ActivationKey: request.Customizations.Subscription.ActivationKey, ServerUrl: request.Customizations.Subscription.ServerUrl, BaseUrl: request.Customizations.Subscription.BaseUrl, diff --git a/internal/distro/distro.go b/internal/distro/distro.go index a8fd8065d..3d886f736 100644 --- a/internal/distro/distro.go +++ b/internal/distro/distro.go @@ -130,7 +130,7 @@ type OSTreeImageOptions struct { // ServerUrl denotes the host to register the system with // BaseUrl specifies the repository URL for DNF type SubscriptionImageOptions struct { - Organization int + Organization string ActivationKey string ServerUrl string BaseUrl string diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go index 705f134ef..a99fdd584 100644 --- a/internal/distro/rhel8/distro.go +++ b/internal/distro/rhel8/distro.go @@ -397,7 +397,7 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp if options.Subscription != nil { 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 { commands = append(commands, "/usr/bin/insights-client --register") diff --git a/internal/distro/rhel84/distro.go b/internal/distro/rhel84/distro.go index d37d9e527..d69b80b24 100644 --- a/internal/distro/rhel84/distro.go +++ b/internal/distro/rhel84/distro.go @@ -459,7 +459,7 @@ func (t *imageType) pipeline(c *blueprint.Customizations, options distro.ImageOp if options.Subscription != nil { 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 { commands = append(commands, "/usr/bin/insights-client --register") diff --git a/internal/distro/rhel85/pipelines.go b/internal/distro/rhel85/pipelines.go index 740e5ffbd..b97bd7630 100644 --- a/internal/distro/rhel85/pipelines.go +++ b/internal/distro/rhel85/pipelines.go @@ -335,7 +335,7 @@ func ec2BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec, if options.Subscription != nil { 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 { 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 { 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 { commands = append(commands, "/usr/bin/insights-client --register") @@ -782,7 +782,7 @@ func ostreeTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec, if options.Subscription != nil { 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 { commands = append(commands, "/usr/bin/insights-client --register") diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90/pipelines.go index c94efe267..7a314ddd4 100644 --- a/internal/distro/rhel90/pipelines.go +++ b/internal/distro/rhel90/pipelines.go @@ -329,7 +329,7 @@ func ec2BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec, if options.Subscription != nil { 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 { 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 { 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 { commands = append(commands, "/usr/bin/insights-client --register") @@ -717,7 +717,7 @@ func ostreeTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec, if options.Subscription != nil { 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 { commands = append(commands, "/usr/bin/insights-client --register")