From 17cbcbcdbf0c9f39f02c301d4cd4b4af6a0cc157 Mon Sep 17 00:00:00 2001 From: Dimitri Saridakis Date: Wed, 8 Feb 2023 20:52:04 +0000 Subject: [PATCH] Add cluster id to create kafka (#1804) * feat: addition of descriptions and examples to dedicated * feat: Allows the CLI to install stage env addons when terraforming customer-cloud dataplane clusters * refactor: the default api url is now set when creating a connection instead of in the registercluster cmd file * refactor: update some func and var names * refactor: add cluster-id flag to create kafka cmd to allow kafka creation on CC cluster * refactor: doc and small refactor --- docs/commands/rhoas.md | 2 +- docs/commands/rhoas_dedicated.md | 10 +- .../rhoas_dedicated_register-cluster.md | 6 +- docs/commands/rhoas_kafka_create.md | 1 + go.mod | 2 +- go.sum | 4 +- pkg/cmd/dedicated/dedicated.go | 12 +- pkg/cmd/dedicated/register/registercluster.go | 79 ++-- pkg/cmd/kafka/create/create.go | 11 +- .../localize/locales/en/cmd/dedicated.en.toml | 34 +- .../localize/locales/en/cmd/kafka.en.toml | 4 + pkg/shared/connection/api/api.go | 4 +- .../api/defaultapi/default_client.go | 16 +- .../kafkamgmt/apiv1/client/README.md | 10 +- .../kafkamgmt/apiv1/client/api_default.go | 189 +++++++++- .../api_enterprise_dataplane_clusters.go | 342 +++++++++++++++++- .../kafkamgmt/apiv1/client/api_errors.go | 2 +- .../kafkamgmt/apiv1/client/api_security.go | 2 +- .../kafkamgmt/apiv1/client/client.go | 4 +- .../kafkamgmt/apiv1/client/configuration.go | 2 +- .../apiv1/client/model_cloud_provider.go | 2 +- .../apiv1/client/model_cloud_provider_list.go | 2 +- .../model_cloud_provider_list_all_of.go | 35 +- .../apiv1/client/model_cloud_region.go | 2 +- .../apiv1/client/model_cloud_region_list.go | 2 +- .../client/model_cloud_region_list_all_of.go | 35 +- .../apiv1/client/model_enterprise_cluster.go | 2 +- .../client/model_enterprise_cluster_all_of.go | 2 +- .../client/model_enterprise_cluster_list.go | 2 +- .../model_enterprise_cluster_list_all_of.go | 35 +- ...terprise_cluster_with_addon_parameters.go} | 88 ++--- ...e_cluster_with_addon_parameters_all_of.go} | 70 ++-- .../model_enterprise_osd_cluster_payload.go | 2 +- .../kafkamgmt/apiv1/client/model_error.go | 2 +- .../apiv1/client/model_error_list.go | 2 +- .../apiv1/client/model_error_list_all_of.go | 35 +- .../client/model_fleetshard_parameter.go | 2 +- .../apiv1/client/model_instant_query.go | 2 +- .../client/model_kafka_promote_request.go | 184 ++++++++++ .../apiv1/client/model_kafka_request.go | 123 ++++++- .../client/model_kafka_request_all_of.go | 123 ++++++- .../apiv1/client/model_kafka_request_list.go | 2 +- .../client/model_kafka_request_list_all_of.go | 35 +- .../client/model_kafka_request_payload.go | 49 ++- .../client/model_kafka_update_request.go | 2 +- .../kafkamgmt/apiv1/client/model_list.go | 33 +- .../model_metrics_instant_query_list.go | 2 +- ...model_metrics_instant_query_list_all_of.go | 2 +- .../client/model_metrics_range_query_list.go | 2 +- .../model_metrics_range_query_list_all_of.go | 2 +- .../apiv1/client/model_object_reference.go | 2 +- .../apiv1/client/model_range_query.go | 2 +- .../client/model_region_capacity_list_item.go | 2 +- .../apiv1/client/model_service_account.go | 2 +- .../client/model_service_account_all_of.go | 2 +- .../client/model_service_account_list.go | 2 +- .../model_service_account_list_all_of.go | 2 +- .../client/model_service_account_list_item.go | 2 +- .../model_service_account_list_item_all_of.go | 2 +- .../client/model_service_account_request.go | 2 +- .../apiv1/client/model_sso_provider.go | 2 +- .../apiv1/client/model_sso_provider_all_of.go | 2 +- .../model_supported_kafka_billing_model.go | 4 +- .../model_supported_kafka_instance_type.go | 2 +- ...del_supported_kafka_instance_types_list.go | 2 +- ...ported_kafka_instance_types_list_all_of.go | 2 +- .../client/model_supported_kafka_size.go | 2 +- ...l_supported_kafka_size_bytes_value_item.go | 2 +- .../kafkamgmt/apiv1/client/model_values.go | 2 +- .../apiv1/client/model_version_metadata.go | 2 +- .../client/model_version_metadata_all_of.go | 2 +- .../kafkamgmt/apiv1/client/response.go | 2 +- .../kafkamgmt/apiv1/client/utils.go | 2 +- vendor/modules.txt | 2 +- 74 files changed, 1316 insertions(+), 351 deletions(-) rename vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/{model_enterprise_cluster_registration_response.go => model_enterprise_cluster_with_addon_parameters.go} (61%) rename vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/{model_enterprise_cluster_registration_response_all_of.go => model_enterprise_cluster_with_addon_parameters_all_of.go} (58%) create mode 100644 vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_promote_request.go diff --git a/docs/commands/rhoas.md b/docs/commands/rhoas.md index 6604ec87d..99f8391d4 100644 --- a/docs/commands/rhoas.md +++ b/docs/commands/rhoas.md @@ -41,7 +41,7 @@ $ rhoas cluster connect * [rhoas completion](rhoas_completion.md) - Install command completion for your shell (bash, zsh, fish or powershell) * [rhoas connector](rhoas_connector.md) - Connectors commands * [rhoas context](rhoas_context.md) - Group, share and manage your rhoas services -* [rhoas dedicated](rhoas_dedicated.md) - shortDescription +* [rhoas dedicated](rhoas_dedicated.md) - Manage your OpenShift clusters which host your kafkas. * [rhoas generate-config](rhoas_generate-config.md) - Generate configurations for the service context * [rhoas kafka](rhoas_kafka.md) - Create, view, use, and manage your Kafka instances * [rhoas login](rhoas_login.md) - Log in to RHOAS diff --git a/docs/commands/rhoas_dedicated.md b/docs/commands/rhoas_dedicated.md index 199e5260d..ca3c7e6b0 100644 --- a/docs/commands/rhoas_dedicated.md +++ b/docs/commands/rhoas_dedicated.md @@ -1,15 +1,19 @@ ## rhoas dedicated -shortDescription +Manage your OpenShift clusters which host your kafkas. ### Synopsis -longDescription +Red Hat OpenShift Streams for Apache Kafka allows you to use your own OpenShift clusters to provision your +kafkas. These Kafka instances will be managed by Red Hat OpenShift Streams for Apache Kafka. + ### Examples ``` -example +# Register an OpenShift cluster with Red Hat OpenShift Streams for Apache Kafka. +rhoas dedicated register-cluster + ``` ### Options inherited from parent commands diff --git a/docs/commands/rhoas_dedicated_register-cluster.md b/docs/commands/rhoas_dedicated_register-cluster.md index f465983e0..719e6589f 100644 --- a/docs/commands/rhoas_dedicated_register-cluster.md +++ b/docs/commands/rhoas_dedicated_register-cluster.md @@ -26,7 +26,9 @@ rhoas cluster register-cluster --cluster-id 1234-5678-90ab-cdef ### Options ``` - --cluster-id string The ID of the OpenShift cluster to register: + --access-token string The access token to use to authenticate with the OpenShift Cluster Management API. + --cluster-id string The ID of the OpenShift cluster to register: + --cluster-mgmt-api-url string The API URL of the OpenShift Cluster Management API. ``` ### Options inherited from parent commands @@ -38,5 +40,5 @@ rhoas cluster register-cluster --cluster-id 1234-5678-90ab-cdef ### SEE ALSO -* [rhoas dedicated](rhoas_dedicated.md) - shortDescription +* [rhoas dedicated](rhoas_dedicated.md) - Manage your OpenShift clusters which host your kafkas. diff --git a/docs/commands/rhoas_kafka_create.md b/docs/commands/rhoas_kafka_create.md index d4110dc9f..819cf456f 100644 --- a/docs/commands/rhoas_kafka_create.md +++ b/docs/commands/rhoas_kafka_create.md @@ -31,6 +31,7 @@ $ rhoas kafka create -o yaml ``` --billing-model string Billing model to be used + --cluster-id string ID of the Customer-Cloud dataplane cluster to create the Kafka instance on. --dry-run Validate all user provided arguments without creating the Kafka instance --marketplace string Name of the marketplace where the instance is purchased on --marketplace-account-id string Cloud Account ID for the marketplace diff --git a/go.mod b/go.mod index d8383127d..f59520eb6 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/redhat-developer/app-services-sdk-go/accountmgmt v0.3.0 github.com/redhat-developer/app-services-sdk-go/connectormgmt v0.10.0 github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.11.0 - github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.17.0 + github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.19.0 github.com/redhat-developer/app-services-sdk-go/registryinstance v0.8.2 github.com/redhat-developer/app-services-sdk-go/registrymgmt v0.11.1 github.com/redhat-developer/app-services-sdk-go/serviceaccountmgmt v0.9.0 diff --git a/go.sum b/go.sum index d23a4a140..8ebc2a96a 100644 --- a/go.sum +++ b/go.sum @@ -819,8 +819,8 @@ github.com/redhat-developer/app-services-sdk-go/connectormgmt v0.10.0 h1:CURbTHI github.com/redhat-developer/app-services-sdk-go/connectormgmt v0.10.0/go.mod h1:t3IV0eKUPgCQjoInv2l8B/NMm2OVemCxGFO/z91wsCU= github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.11.0 h1:WdwVjneugUC898RSHuc2vLwlcNgPh3oF7/fuxEEGGPg= github.com/redhat-developer/app-services-sdk-go/kafkainstance v0.11.0/go.mod h1:yazwUm4IHuIWrQ0CCsqN0h7rHZx51nlFbYWKnUn7B84= -github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.17.0 h1:Lp0D3pF2A1VYsbFk+KE1QQ+PfdW3HySTnIuUHrvb1iQ= -github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.17.0/go.mod h1:ILvcakLEXMLZyRdO//WJZNk9fdFbnU+cM3XrBvubE64= +github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.19.0 h1:RVDEeUfBgMzAK+BCnlhfHGHp2YYW6GH6jgYOv2jwYVY= +github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.19.0/go.mod h1:ILvcakLEXMLZyRdO//WJZNk9fdFbnU+cM3XrBvubE64= github.com/redhat-developer/app-services-sdk-go/registryinstance v0.8.2 h1:U2je87d/DIeOaQIycg2Y7TLiESmGu0/0rQC5n64Od0Y= github.com/redhat-developer/app-services-sdk-go/registryinstance v0.8.2/go.mod h1:HkNzOWHTW/SomobQ4343+yR4oTmiyvm85BIWlsh0qbA= github.com/redhat-developer/app-services-sdk-go/registrymgmt v0.11.1 h1:VOv3wcodQ6EpKp2RRntMMTMuQSnNv1sqLezdbv18mjs= diff --git a/pkg/cmd/dedicated/dedicated.go b/pkg/cmd/dedicated/dedicated.go index 6814ba5c3..7926985e3 100644 --- a/pkg/cmd/dedicated/dedicated.go +++ b/pkg/cmd/dedicated/dedicated.go @@ -6,16 +6,12 @@ import ( "github.com/spf13/cobra" ) -// TO-DO add localizer and descriptions func NewDedicatedCmd(f *factory.Factory) *cobra.Command { cmd := &cobra.Command{ - Use: "dedicated", - // Short: f.Localizer.MustLocalize("kafka.topic.cmd.shortDescription"), - Short: "shortDescription", - // Long: f.Localizer.MustLocalize("kafka.topic.cmd.longDescription"), - Long: "longDescription", - // Example: f.Localizer.MustLocalize("kafka.topic.cmd.example"), - Example: "example", + Use: "dedicated", + Short: f.Localizer.MustLocalize("dedicated.cmd.shortDescription"), + Long: f.Localizer.MustLocalize("dedicated.cmd.longDescription"), + Example: f.Localizer.MustLocalize("dedicated.cmd.example"), } cmd.AddCommand( diff --git a/pkg/cmd/dedicated/register/registercluster.go b/pkg/cmd/dedicated/register/registercluster.go index 9f3f30f4f..7a894e927 100644 --- a/pkg/cmd/dedicated/register/registercluster.go +++ b/pkg/cmd/dedicated/register/registercluster.go @@ -3,6 +3,8 @@ package register import ( "context" "fmt" + "github.com/redhat-developer/app-services-cli/internal/build" + "github.com/redhat-developer/app-services-cli/pkg/core/config" "strings" "github.com/AlecAivazis/survey/v2" @@ -15,12 +17,11 @@ import ( ) type options struct { - selectedClusterId string - // clusterManagementApiUrl string - // accessToken string - clusterList []clustersmgmtv1.Cluster - selectedCluster clustersmgmtv1.Cluster - // clusterMachinePoolList clustersmgmtv1.MachinePoolList + selectedClusterId string + clusterManagementApiUrl string + accessToken string + clusterList []clustersmgmtv1.Cluster + selectedCluster clustersmgmtv1.Cluster existingMachinePoolList []clustersmgmtv1.MachinePool selectedClusterMachinePool clustersmgmtv1.MachinePool requestedMachinePoolNodeCount int @@ -32,18 +33,18 @@ type options struct { // list of consts should come from KFM const ( - machinePoolId = "kafka-standard" - machinePoolTaintKey = "bf2.org/kafkaInstanceProfileType" - machinePoolTaintEffect = "NoExecute" - machinePoolTaintValue = "standard" - // machinePoolInstanceType = "m5.2xlarge" + machinePoolId = "kafka-standard" + machinePoolTaintKey = "bf2.org/kafkaInstanceProfileType" + machinePoolTaintEffect = "NoExecute" + machinePoolTaintValue = "standard" machinePoolInstanceType = "r5.xlarge" machinePoolLabelKey = "bf2.org/kafkaInstanceProfileType" machinePoolLabelValue = "standard" clusterReadyState = "ready" fleetshardAddonId = "kas-fleetshard-operator" strimziAddonId = "managed-kafka" - // clusterManagementAPIURL = "https://api.openshift.com" + fleetshardAddonIdQE = "kas-fleetshard-operator-qe" + strimziAddonIdQE = "managed-kafka-qe" ) func NewRegisterClusterCommand(f *factory.Factory) *cobra.Command { @@ -62,19 +63,16 @@ func NewRegisterClusterCommand(f *factory.Factory) *cobra.Command { }, } - // TO-DO add flags - // add a flag for clustermgmt url, i.e --cluster-management-api-url, make the flag hidden, default to api.openshift.com - // supply customer mgmt access token via a flag, i.e --access-token, make the flag hidden, default to "" flags := kafkaFlagutil.NewFlagSet(cmd, f.Localizer) - // flags.StringVar(&opts.clusterManagementApiUrl, "cluster-management-api-url", clusterManagementAPIURL, "cluster management api url") - // flags.StringVar(&opts.accessToken, "access-token", "", "access token") - // this flag will allow the user to pass the cluster id as a flag + flags.StringVar(&opts.clusterManagementApiUrl, "cluster-mgmt-api-url", "", f.Localizer.MustLocalize("dedicated.registerCluster.flag.clusterMgmtApiUrl.description")) + flags.StringVar(&opts.accessToken, "access-token", "", f.Localizer.MustLocalize("dedicated.registercluster.flag.accessToken.description")) flags.StringVar(&opts.selectedClusterId, "cluster-id", "", f.Localizer.MustLocalize("dedicated.registerCluster.flag.clusterId.description")) return cmd } func runRegisterClusterCmd(opts *options) (err error) { + // Set the base URL for the cluster management API err = setListClusters(opts) if err != nil { return err @@ -114,12 +112,11 @@ func runRegisterClusterCmd(opts *options) (err error) { } func getClusterList(opts *options) (*clustersmgmtv1.ClusterList, error) { - // ocm client connection conn, err := opts.f.Connection() if err != nil { return nil, err } - client, cc, err := conn.API().OCMClustermgmt() + client, cc, err := conn.API().OCMClustermgmt(opts.clusterManagementApiUrl, opts.accessToken) if err != nil { return nil, err } @@ -147,9 +144,7 @@ func setListClusters(opts *options) error { func validateClusters(clusters *clustersmgmtv1.ClusterList, cls []clustersmgmtv1.Cluster) []clustersmgmtv1.Cluster { for _, cluster := range clusters.Slice() { - // TO-DO the cluster must be multiAZ if cluster.State() == clusterReadyState && cluster.MultiAZ() == true { - // if cluster.State() == clusterReadyState { cls = append(cls, *cluster) } } @@ -223,7 +218,7 @@ func getMachinePoolList(opts *options) (*clustersmgmtv1.MachinePoolsListResponse if err != nil { return nil, err } - client, cc, err := conn.API().OCMClustermgmt() + client, cc, err := conn.API().OCMClustermgmt(opts.clusterManagementApiUrl, opts.accessToken) if err != nil { return nil, err } @@ -295,12 +290,11 @@ func createMachinePoolRequestForDedicated(machinePoolNodeCount int) (*clustersmg // TO-DO this function should be moved to an ocm client / provider area func createMachinePool(opts *options, mprequest *clustersmgmtv1.MachinePool) error { - // create a new machine pool via ocm conn, err := opts.f.Connection() if err != nil { return err } - client, cc, err := conn.API().OCMClustermgmt() + client, cc, err := conn.API().OCMClustermgmt(opts.clusterManagementApiUrl, opts.accessToken) if err != nil { return err } @@ -384,17 +378,12 @@ func selectAccessPrivateNetworkInteractivePrompt(opts *options) error { Help: opts.f.Localizer.MustLocalize("dedicated.registerCluster.prompt.selectPublicNetworkAccess.help"), Default: false, } - accessKafkasViaPublicNetwork := false - err := survey.AskOne(prompt, &accessKafkasViaPublicNetwork) + accessFromPublicNetwork := true + err := survey.AskOne(prompt, &accessFromPublicNetwork) if err != nil { return err } - if accessKafkasViaPublicNetwork { - opts.accessKafkasViaPrivateNetwork = false - } else { - opts.accessKafkasViaPrivateNetwork = true - } - + opts.accessKafkasViaPrivateNetwork = !accessFromPublicNetwork return nil } @@ -416,7 +405,7 @@ func createAddonWithParams(opts *options, addonId string, params *[]kafkamgmtcli if err != nil { return err } - client, cc, err := conn.API().OCMClustermgmt() + client, cc, err := conn.API().OCMClustermgmt(opts.clusterManagementApiUrl, opts.accessToken) if err != nil { return err } @@ -439,6 +428,20 @@ func createAddonWithParams(opts *options, addonId string, params *[]kafkamgmtcli return nil } +func getStrimziAddonIdByEnv(con *config.Config) string { + if con.APIUrl == build.ProductionAPIURL { + return strimziAddonId + } + return strimziAddonIdQE +} + +func getKafkaFleetShardAddonIdByEnv(con *config.Config) string { + if con.APIUrl == build.ProductionAPIURL { + return fleetshardAddonId + } + return fleetshardAddonIdQE +} + // TO-DO go through errs and make them more user friendly with actual error messages. func registerClusterWithKasFleetManager(opts *options) error { clusterIngressDNSName, err := parseDNSURL(opts) @@ -465,11 +468,15 @@ func registerClusterWithKasFleetManager(opts *options) error { if err != nil { return err } - err = createAddonWithParams(opts, strimziAddonId, nil) + con, err := opts.f.Config.Load() + if err != nil { + return err + } + err = createAddonWithParams(opts, getStrimziAddonIdByEnv(con), nil) if err != nil { return err } - err = createAddonWithParams(opts, fleetshardAddonId, response.FleetshardParameters) + err = createAddonWithParams(opts, getKafkaFleetShardAddonIdByEnv(con), response.FleetshardParameters) if err != nil { return err } diff --git a/pkg/cmd/kafka/create/create.go b/pkg/cmd/kafka/create/create.go index 7d77e1ced..3ffdf63ee 100644 --- a/pkg/cmd/kafka/create/create.go +++ b/pkg/cmd/kafka/create/create.go @@ -49,10 +49,11 @@ const ( ) type options struct { - name string - provider string - region string - size string + name string + provider string + region string + size string + clusterId string marketplaceAcctId string marketplace string @@ -143,6 +144,7 @@ func NewCreateCommand(f *factory.Factory) *cobra.Command { flags.BoolVarP(&opts.dryRun, "dry-run", "", false, f.Localizer.MustLocalize("kafka.create.flag.dryrun.description")) flags.StringVar(&opts.billingModel, FlagBillingModel, "", f.Localizer.MustLocalize("kafka.create.flag.billingModel.description")) flags.AddBypassTermsCheck(&opts.bypassChecks) + flags.StringVar(&opts.clusterId, "cluster-id", "", f.Localizer.MustLocalize("kafka.create.flag.clusterId.description")) _ = cmd.RegisterFlagCompletionFunc(FlagProvider, func(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) { return GetCloudProviderCompletionValues(f) @@ -237,6 +239,7 @@ func runCreate(opts *options) error { Name: opts.name, Region: &opts.region, CloudProvider: &opts.provider, + ClusterId: *kafkamgmtclient.NewNullableString(&opts.clusterId), } if !opts.bypassChecks { diff --git a/pkg/core/localize/locales/en/cmd/dedicated.en.toml b/pkg/core/localize/locales/en/cmd/dedicated.en.toml index 043c4c392..64d1cfd95 100644 --- a/pkg/core/localize/locales/en/cmd/dedicated.en.toml +++ b/pkg/core/localize/locales/en/cmd/dedicated.en.toml @@ -26,7 +26,7 @@ one = 'The ID of the OpenShift cluster to register:' one = 'Select the ready cluster to register' [dedicated.registerCluster.prompt.selectPublicNetworkAccess.message] -one = 'Would you like your Kakfas to be accessible via a public network?' +one = 'Would you like your Kafkas to be accessible via a public network?' [dedicated.registerCluster.prompt.selectPublicNetworkAccess.help] one = 'If you select yes, your Kafka will be accessible via a public network' @@ -42,4 +42,34 @@ There will be N/3 streaming units in your Kafka cluster, where N is the machine ''' [dedicated.registerCluster.info.foundValidMachinePool] -one = 'Using the valid machine pool:' \ No newline at end of file +one = 'Using the valid machine pool:' + +[dedicated.cmd.shortDescription] +one = 'Manage your OpenShift clusters which host your kafkas.' + +[dedicated.cmd.longDescription] +one = ''' +Red Hat OpenShift Streams for Apache Kafka allows you to use your own OpenShift clusters to provision your +kafkas. These Kafka instances will be managed by Red Hat OpenShift Streams for Apache Kafka. +''' + +[dedicated.cmd.example] +one = ''' +# Register an OpenShift cluster with Red Hat OpenShift Streams for Apache Kafka. +rhoas dedicated register-cluster +''' + +[dedicated.registerCluster.kfmResponse.status.clusterAccepted] +one = ''' +The cluster has been accepted. Red Hat OpenShift Streams for Apache Kafka control plane is now +terraforming your cluster for use with your Kafkas. +''' + +[dedicated.registerCluster.kfmResponse.status.conflict] +one = 'The cluster has already been registered with Red Hat OpenShift Streams for Apache Kafka.' + +[dedicated.registerCluster.flag.clusterMgmtApiUrl.description] +one = 'The API URL of the OpenShift Cluster Management API.' + +[dedicated.registercluster.flag.accessToken.description] +one = 'The access token to use to authenticate with the OpenShift Cluster Management API.' \ No newline at end of file diff --git a/pkg/core/localize/locales/en/cmd/kafka.en.toml b/pkg/core/localize/locales/en/cmd/kafka.en.toml index 308021514..8863b1581 100644 --- a/pkg/core/localize/locales/en/cmd/kafka.en.toml +++ b/pkg/core/localize/locales/en/cmd/kafka.en.toml @@ -1144,3 +1144,7 @@ one = 'Kafka instance "{{.Name}}" is not ready yet' [kafka.update.flag.owner] description = 'Description for the --owner flag' one = 'ID of the Kafka instance owner' + +[kafka.create.flag.clusterId.description] +description = 'Description for the --cluster-id flag' +one = 'ID of the Customer-Cloud data plane cluster to create the Kafka instance on.' diff --git a/pkg/shared/connection/api/api.go b/pkg/shared/connection/api/api.go index 5d8d9db2d..f8c28cf62 100644 --- a/pkg/shared/connection/api/api.go +++ b/pkg/shared/connection/api/api.go @@ -1,10 +1,10 @@ package api import ( + ocmclustersmgmtv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" "net/http" "net/url" - ocmclustersmgmtv1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1" "github.com/redhat-developer/app-services-cli/pkg/api/generic" "github.com/redhat-developer/app-services-cli/pkg/api/rbac" "github.com/redhat-developer/app-services-cli/pkg/core/logging" @@ -29,7 +29,7 @@ type API interface { RBAC() rbac.RbacAPI GenericAPI() generic.GenericAPI GetConfig() Config - OCMClustermgmt() (*ocmclustersmgmtv1.Client, func(), error) + OCMClustermgmt(apiGateway, accessToken string) (*ocmclustersmgmtv1.Client, func(), error) } type Config struct { diff --git a/pkg/shared/connection/api/defaultapi/default_client.go b/pkg/shared/connection/api/defaultapi/default_client.go index 10f7e990f..82f67cf7c 100644 --- a/pkg/shared/connection/api/defaultapi/default_client.go +++ b/pkg/shared/connection/api/defaultapi/default_client.go @@ -290,10 +290,16 @@ func (a *defaultAPI) CreateOAuthTransport(accessToken string) *http.Client { } } -func (a *defaultAPI) CreateOCMConnection() (*ocmSdkClient.Connection, func(), error) { +func (a *defaultAPI) createOCMConnection(clusterMgmtApiUrl, accessToken string) (*ocmSdkClient.Connection, func(), error) { + if clusterMgmtApiUrl == "" { + clusterMgmtApiUrl = build.ProductionAPIURL + } + if accessToken == "" { + accessToken = a.AccessToken + } connection, err := ocmSdkClient.NewConnectionBuilder(). - // the access token and url here should be specified and configurable - Tokens(a.AccessToken). + URL(clusterMgmtApiUrl). + Tokens(accessToken). Build() if err != nil { fmt.Fprintf(os.Stderr, "Can't build connection: %v\n", err) @@ -305,8 +311,8 @@ func (a *defaultAPI) CreateOCMConnection() (*ocmSdkClient.Connection, func(), er } // create an OCM clustermgmt client -func (a *defaultAPI) OCMClustermgmt() (*ocmclustersmgmtv1.Client, func(), error) { - connection, closeConnection, err := a.CreateOCMConnection() +func (a *defaultAPI) OCMClustermgmt(clusterMgmtApiUrl, accessToken string) (*ocmclustersmgmtv1.Client, func(), error) { + connection, closeConnection, err := a.createOCMConnection(clusterMgmtApiUrl, accessToken) if err != nil { return nil, nil, err } diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/README.md b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/README.md index 38e8c55a0..1521c280a 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/README.md +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/README.md @@ -5,7 +5,7 @@ Kafka Management API is a REST API to manage Kafka instances ## Overview This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client. -- API version: 1.14.0 +- API version: 1.15.0 - Package version: 1.0.0 - Build package: org.openapitools.codegen.languages.GoClientCodegen @@ -89,8 +89,11 @@ Class | Method | HTTP request | Description *DefaultApi* | [**GetMetricsByInstantQuery**](docs/DefaultApi.md#getmetricsbyinstantquery) | **Get** /api/kafkas_mgmt/v1/kafkas/{id}/metrics/query | *DefaultApi* | [**GetMetricsByRangeQuery**](docs/DefaultApi.md#getmetricsbyrangequery) | **Get** /api/kafkas_mgmt/v1/kafkas/{id}/metrics/query_range | *DefaultApi* | [**GetVersionMetadata**](docs/DefaultApi.md#getversionmetadata) | **Get** /api/kafkas_mgmt/v1 | +*DefaultApi* | [**PromoteKafka**](docs/DefaultApi.md#promotekafka) | **Post** /api/kafkas_mgmt/v1/kafkas/{id}/promote | *DefaultApi* | [**UpdateKafkaById**](docs/DefaultApi.md#updatekafkabyid) | **Patch** /api/kafkas_mgmt/v1/kafkas/{id} | *EnterpriseDataplaneClustersApi* | [**DeleteEnterpriseClusterById**](docs/EnterpriseDataplaneClustersApi.md#deleteenterpriseclusterbyid) | **Delete** /api/kafkas_mgmt/v1/clusters/{id} | +*EnterpriseDataplaneClustersApi* | [**GetEnterpriseClusterById**](docs/EnterpriseDataplaneClustersApi.md#getenterpriseclusterbyid) | **Get** /api/kafkas_mgmt/v1/clusters/{id} | +*EnterpriseDataplaneClustersApi* | [**GetEnterpriseClusterWithAddonParameters**](docs/EnterpriseDataplaneClustersApi.md#getenterpriseclusterwithaddonparameters) | **Get** /api/kafkas_mgmt/v1/clusters/{id}/addon_parameters | *EnterpriseDataplaneClustersApi* | [**GetEnterpriseOsdClusters**](docs/EnterpriseDataplaneClustersApi.md#getenterpriseosdclusters) | **Get** /api/kafkas_mgmt/v1/clusters | *EnterpriseDataplaneClustersApi* | [**RegisterEnterpriseOsdCluster**](docs/EnterpriseDataplaneClustersApi.md#registerenterpriseosdcluster) | **Post** /api/kafkas_mgmt/v1/clusters | *ErrorsApi* | [**GetErrorById**](docs/ErrorsApi.md#geterrorbyid) | **Get** /api/kafkas_mgmt/v1/errors/{id} | @@ -115,14 +118,15 @@ Class | Method | HTTP request | Description - [EnterpriseClusterAllOf](docs/EnterpriseClusterAllOf.md) - [EnterpriseClusterList](docs/EnterpriseClusterList.md) - [EnterpriseClusterListAllOf](docs/EnterpriseClusterListAllOf.md) - - [EnterpriseClusterRegistrationResponse](docs/EnterpriseClusterRegistrationResponse.md) - - [EnterpriseClusterRegistrationResponseAllOf](docs/EnterpriseClusterRegistrationResponseAllOf.md) + - [EnterpriseClusterWithAddonParameters](docs/EnterpriseClusterWithAddonParameters.md) + - [EnterpriseClusterWithAddonParametersAllOf](docs/EnterpriseClusterWithAddonParametersAllOf.md) - [EnterpriseOsdClusterPayload](docs/EnterpriseOsdClusterPayload.md) - [Error](docs/Error.md) - [ErrorList](docs/ErrorList.md) - [ErrorListAllOf](docs/ErrorListAllOf.md) - [FleetshardParameter](docs/FleetshardParameter.md) - [InstantQuery](docs/InstantQuery.md) + - [KafkaPromoteRequest](docs/KafkaPromoteRequest.md) - [KafkaRequest](docs/KafkaRequest.md) - [KafkaRequestAllOf](docs/KafkaRequestAllOf.md) - [KafkaRequestList](docs/KafkaRequestList.md) diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go index 9906608fe..33dc2d739 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_default.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -190,6 +190,20 @@ type DefaultApi interface { */ GetVersionMetadataExecute(r ApiGetVersionMetadataRequest) (VersionMetadata, *_nethttp.Response, error) + /* + * PromoteKafka Method for PromoteKafka + * Promote a Kafka instance. Promotion is performed asynchronously. The `async` query parameter has to be set to `true`. Only kafka instances with an `eval` billing_model are supported + * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param id The ID of record + * @return ApiPromoteKafkaRequest + */ + PromoteKafka(ctx _context.Context, id string) ApiPromoteKafkaRequest + + /* + * PromoteKafkaExecute executes the request + */ + PromoteKafkaExecute(r ApiPromoteKafkaRequest) (*_nethttp.Response, error) + /* * UpdateKafkaById Method for UpdateKafkaById * Update a Kafka instance by id @@ -1847,6 +1861,179 @@ func (a *DefaultApiService) GetVersionMetadataExecute(r ApiGetVersionMetadataReq return localVarReturnValue, localVarHTTPResponse, nil } +type ApiPromoteKafkaRequest struct { + ctx _context.Context + ApiService DefaultApi + id string + async *bool + kafkaPromoteRequest *KafkaPromoteRequest +} + +func (r ApiPromoteKafkaRequest) Async(async bool) ApiPromoteKafkaRequest { + r.async = &async + return r +} +func (r ApiPromoteKafkaRequest) KafkaPromoteRequest(kafkaPromoteRequest KafkaPromoteRequest) ApiPromoteKafkaRequest { + r.kafkaPromoteRequest = &kafkaPromoteRequest + return r +} + +func (r ApiPromoteKafkaRequest) Execute() (*_nethttp.Response, error) { + return r.ApiService.PromoteKafkaExecute(r) +} + +/* + * PromoteKafka Method for PromoteKafka + * Promote a Kafka instance. Promotion is performed asynchronously. The `async` query parameter has to be set to `true`. Only kafka instances with an `eval` billing_model are supported + * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param id The ID of record + * @return ApiPromoteKafkaRequest + */ +func (a *DefaultApiService) PromoteKafka(ctx _context.Context, id string) ApiPromoteKafkaRequest { + return ApiPromoteKafkaRequest{ + ApiService: a, + ctx: ctx, + id: id, + } +} + +/* + * Execute executes the request + */ +func (a *DefaultApiService) PromoteKafkaExecute(r ApiPromoteKafkaRequest) (*_nethttp.Response, error) { + var ( + localVarHTTPMethod = _nethttp.MethodPost + localVarPostBody interface{} + localVarFormFileName string + localVarFileName string + localVarFileBytes []byte + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "DefaultApiService.PromoteKafka") + if err != nil { + return nil, GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/api/kafkas_mgmt/v1/kafkas/{id}/promote" + localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := _neturl.Values{} + localVarFormParams := _neturl.Values{} + if r.async == nil { + return nil, reportError("async is required and must be specified") + } + if r.kafkaPromoteRequest == nil { + return nil, reportError("kafkaPromoteRequest is required and must be specified") + } + + localVarQueryParams.Add("async", parameterToString(*r.async, "")) + // to determine the Content-Type header + localVarHTTPContentTypes := []string{"application/json"} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + // body params + localVarPostBody = r.kafkaPromoteRequest + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) + if err != nil { + return nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarHTTPResponse, err + } + + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 400 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 401 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 403 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 404 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 409 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.model = v + return localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 500 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarHTTPResponse, newErr + } + newErr.model = v + } + return localVarHTTPResponse, newErr + } + + return localVarHTTPResponse, nil +} + type ApiUpdateKafkaByIdRequest struct { ctx _context.Context ApiService DefaultApi diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go index ca8f986aa..3ee851d38 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_enterprise_dataplane_clusters.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -41,6 +41,36 @@ type EnterpriseDataplaneClustersApi interface { */ DeleteEnterpriseClusterByIdExecute(r ApiDeleteEnterpriseClusterByIdRequest) (Error, *_nethttp.Response, error) + /* + * GetEnterpriseClusterById Method for GetEnterpriseClusterById + * Returns enterprise data plane cluster by ID + * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param id ID of the enterprise data plane cluster + * @return ApiGetEnterpriseClusterByIdRequest + */ + GetEnterpriseClusterById(ctx _context.Context, id string) ApiGetEnterpriseClusterByIdRequest + + /* + * GetEnterpriseClusterByIdExecute executes the request + * @return EnterpriseCluster + */ + GetEnterpriseClusterByIdExecute(r ApiGetEnterpriseClusterByIdRequest) (EnterpriseCluster, *_nethttp.Response, error) + + /* + * GetEnterpriseClusterWithAddonParameters Method for GetEnterpriseClusterWithAddonParameters + * Returns enterprise data plane cluster by ID along with its addon parameters + * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param id ID of the enterprise data plane cluster + * @return ApiGetEnterpriseClusterWithAddonParametersRequest + */ + GetEnterpriseClusterWithAddonParameters(ctx _context.Context, id string) ApiGetEnterpriseClusterWithAddonParametersRequest + + /* + * GetEnterpriseClusterWithAddonParametersExecute executes the request + * @return EnterpriseClusterWithAddonParameters + */ + GetEnterpriseClusterWithAddonParametersExecute(r ApiGetEnterpriseClusterWithAddonParametersRequest) (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) + /* * GetEnterpriseOsdClusters Method for GetEnterpriseOsdClusters * List all Enterprise data plane clusters @@ -65,9 +95,9 @@ type EnterpriseDataplaneClustersApi interface { /* * RegisterEnterpriseOsdClusterExecute executes the request - * @return EnterpriseClusterRegistrationResponse + * @return EnterpriseClusterWithAddonParameters */ - RegisterEnterpriseOsdClusterExecute(r ApiRegisterEnterpriseOsdClusterRequest) (EnterpriseClusterRegistrationResponse, *_nethttp.Response, error) + RegisterEnterpriseOsdClusterExecute(r ApiRegisterEnterpriseOsdClusterRequest) (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) } // EnterpriseDataplaneClustersApiService EnterpriseDataplaneClustersApi service @@ -78,17 +108,12 @@ type ApiDeleteEnterpriseClusterByIdRequest struct { ApiService EnterpriseDataplaneClustersApi async *bool id string - force *bool } func (r ApiDeleteEnterpriseClusterByIdRequest) Async(async bool) ApiDeleteEnterpriseClusterByIdRequest { r.async = &async return r } -func (r ApiDeleteEnterpriseClusterByIdRequest) Force(force bool) ApiDeleteEnterpriseClusterByIdRequest { - r.force = &force - return r -} func (r ApiDeleteEnterpriseClusterByIdRequest) Execute() (Error, *_nethttp.Response, error) { return r.ApiService.DeleteEnterpriseClusterByIdExecute(r) @@ -138,9 +163,6 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu } localVarQueryParams.Add("async", parameterToString(*r.async, "")) - if r.force != nil { - localVarQueryParams.Add("force", parameterToString(*r.force, "")) - } // to determine the Content-Type header localVarHTTPContentTypes := []string{} @@ -244,6 +266,296 @@ func (a *EnterpriseDataplaneClustersApiService) DeleteEnterpriseClusterByIdExecu return localVarReturnValue, localVarHTTPResponse, nil } +type ApiGetEnterpriseClusterByIdRequest struct { + ctx _context.Context + ApiService EnterpriseDataplaneClustersApi + id string +} + + +func (r ApiGetEnterpriseClusterByIdRequest) Execute() (EnterpriseCluster, *_nethttp.Response, error) { + return r.ApiService.GetEnterpriseClusterByIdExecute(r) +} + +/* + * GetEnterpriseClusterById Method for GetEnterpriseClusterById + * Returns enterprise data plane cluster by ID + * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param id ID of the enterprise data plane cluster + * @return ApiGetEnterpriseClusterByIdRequest + */ +func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterById(ctx _context.Context, id string) ApiGetEnterpriseClusterByIdRequest { + return ApiGetEnterpriseClusterByIdRequest{ + ApiService: a, + ctx: ctx, + id: id, + } +} + +/* + * Execute executes the request + * @return EnterpriseCluster + */ +func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterByIdExecute(r ApiGetEnterpriseClusterByIdRequest) (EnterpriseCluster, *_nethttp.Response, error) { + var ( + localVarHTTPMethod = _nethttp.MethodGet + localVarPostBody interface{} + localVarFormFileName string + localVarFileName string + localVarFileBytes []byte + localVarReturnValue EnterpriseCluster + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.GetEnterpriseClusterById") + if err != nil { + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/api/kafkas_mgmt/v1/clusters/{id}" + localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := _neturl.Values{} + localVarFormParams := _neturl.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 401 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 403 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 404 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 500 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + +type ApiGetEnterpriseClusterWithAddonParametersRequest struct { + ctx _context.Context + ApiService EnterpriseDataplaneClustersApi + id string +} + + +func (r ApiGetEnterpriseClusterWithAddonParametersRequest) Execute() (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) { + return r.ApiService.GetEnterpriseClusterWithAddonParametersExecute(r) +} + +/* + * GetEnterpriseClusterWithAddonParameters Method for GetEnterpriseClusterWithAddonParameters + * Returns enterprise data plane cluster by ID along with its addon parameters + * @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background(). + * @param id ID of the enterprise data plane cluster + * @return ApiGetEnterpriseClusterWithAddonParametersRequest + */ +func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterWithAddonParameters(ctx _context.Context, id string) ApiGetEnterpriseClusterWithAddonParametersRequest { + return ApiGetEnterpriseClusterWithAddonParametersRequest{ + ApiService: a, + ctx: ctx, + id: id, + } +} + +/* + * Execute executes the request + * @return EnterpriseClusterWithAddonParameters + */ +func (a *EnterpriseDataplaneClustersApiService) GetEnterpriseClusterWithAddonParametersExecute(r ApiGetEnterpriseClusterWithAddonParametersRequest) (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) { + var ( + localVarHTTPMethod = _nethttp.MethodGet + localVarPostBody interface{} + localVarFormFileName string + localVarFileName string + localVarFileBytes []byte + localVarReturnValue EnterpriseClusterWithAddonParameters + ) + + localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.GetEnterpriseClusterWithAddonParameters") + if err != nil { + return localVarReturnValue, nil, GenericOpenAPIError{error: err.Error()} + } + + localVarPath := localBasePath + "/api/kafkas_mgmt/v1/clusters/{id}/addon_parameters" + localVarPath = strings.Replace(localVarPath, "{"+"id"+"}", _neturl.PathEscape(parameterToString(r.id, "")), -1) + + localVarHeaderParams := make(map[string]string) + localVarQueryParams := _neturl.Values{} + localVarFormParams := _neturl.Values{} + + // to determine the Content-Type header + localVarHTTPContentTypes := []string{} + + // set Content-Type header + localVarHTTPContentType := selectHeaderContentType(localVarHTTPContentTypes) + if localVarHTTPContentType != "" { + localVarHeaderParams["Content-Type"] = localVarHTTPContentType + } + + // to determine the Accept header + localVarHTTPHeaderAccepts := []string{"application/json"} + + // set Accept header + localVarHTTPHeaderAccept := selectHeaderAccept(localVarHTTPHeaderAccepts) + if localVarHTTPHeaderAccept != "" { + localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept + } + req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, localVarFormFileName, localVarFileName, localVarFileBytes) + if err != nil { + return localVarReturnValue, nil, err + } + + localVarHTTPResponse, err := a.client.callAPI(req) + if err != nil || localVarHTTPResponse == nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + localVarBody, err := _ioutil.ReadAll(localVarHTTPResponse.Body) + localVarHTTPResponse.Body.Close() + localVarHTTPResponse.Body = _ioutil.NopCloser(bytes.NewBuffer(localVarBody)) + if err != nil { + return localVarReturnValue, localVarHTTPResponse, err + } + + if localVarHTTPResponse.StatusCode >= 300 { + newErr := GenericOpenAPIError{ + body: localVarBody, + error: localVarHTTPResponse.Status, + } + if localVarHTTPResponse.StatusCode == 401 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 403 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 404 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + return localVarReturnValue, localVarHTTPResponse, newErr + } + if localVarHTTPResponse.StatusCode == 500 { + var v Error + err = a.client.decode(&v, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr.error = err.Error() + return localVarReturnValue, localVarHTTPResponse, newErr + } + newErr.model = v + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + err = a.client.decode(&localVarReturnValue, localVarBody, localVarHTTPResponse.Header.Get("Content-Type")) + if err != nil { + newErr := GenericOpenAPIError{ + body: localVarBody, + error: err.Error(), + } + return localVarReturnValue, localVarHTTPResponse, newErr + } + + return localVarReturnValue, localVarHTTPResponse, nil +} + type ApiGetEnterpriseOsdClustersRequest struct { ctx _context.Context ApiService EnterpriseDataplaneClustersApi @@ -396,7 +708,7 @@ func (r ApiRegisterEnterpriseOsdClusterRequest) EnterpriseOsdClusterPayload(ente return r } -func (r ApiRegisterEnterpriseOsdClusterRequest) Execute() (EnterpriseClusterRegistrationResponse, *_nethttp.Response, error) { +func (r ApiRegisterEnterpriseOsdClusterRequest) Execute() (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) { return r.ApiService.RegisterEnterpriseOsdClusterExecute(r) } @@ -415,16 +727,16 @@ func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdCluster(ctx /* * Execute executes the request - * @return EnterpriseClusterRegistrationResponse + * @return EnterpriseClusterWithAddonParameters */ -func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExecute(r ApiRegisterEnterpriseOsdClusterRequest) (EnterpriseClusterRegistrationResponse, *_nethttp.Response, error) { +func (a *EnterpriseDataplaneClustersApiService) RegisterEnterpriseOsdClusterExecute(r ApiRegisterEnterpriseOsdClusterRequest) (EnterpriseClusterWithAddonParameters, *_nethttp.Response, error) { var ( localVarHTTPMethod = _nethttp.MethodPost localVarPostBody interface{} localVarFormFileName string localVarFileName string localVarFileBytes []byte - localVarReturnValue EnterpriseClusterRegistrationResponse + localVarReturnValue EnterpriseClusterWithAddonParameters ) localBasePath, err := a.client.cfg.ServerURLWithContext(r.ctx, "EnterpriseDataplaneClustersApiService.RegisterEnterpriseOsdCluster") diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go index 76e1fa01d..8ce0024b6 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_errors.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go index 2c477f9f0..0664ccffb 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/api_security.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/client.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/client.go index a53f49809..7c451d5eb 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/client.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/client.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -42,7 +42,7 @@ var ( xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`) ) -// APIClient manages communication with the Kafka Management API API v1.14.0 +// APIClient manages communication with the Kafka Management API API v1.15.0 // In most cases there should be only one, shared, APIClient. type APIClient struct { cfg *Configuration diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go index 97f52e9ba..c8fd23f44 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/configuration.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go index bd9f82852..0c68a57fe 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go index f798809b7..2dce5f4e4 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go index 6e166645b..b184a4982 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_provider_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -17,15 +17,16 @@ import ( // CloudProviderListAllOf struct for CloudProviderListAllOf type CloudProviderListAllOf struct { - Items *[]CloudProvider `json:"items,omitempty"` + Items []CloudProvider `json:"items"` } // NewCloudProviderListAllOf instantiates a new CloudProviderListAllOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewCloudProviderListAllOf() *CloudProviderListAllOf { +func NewCloudProviderListAllOf(items []CloudProvider) *CloudProviderListAllOf { this := CloudProviderListAllOf{} + this.Items = items return &this } @@ -37,41 +38,33 @@ func NewCloudProviderListAllOfWithDefaults() *CloudProviderListAllOf { return &this } -// GetItems returns the Items field value if set, zero value otherwise. +// GetItems returns the Items field value func (o *CloudProviderListAllOf) GetItems() []CloudProvider { - if o == nil || o.Items == nil { + if o == nil { var ret []CloudProvider return ret } - return *o.Items + + return o.Items } -// GetItemsOk returns a tuple with the Items field value if set, nil otherwise +// GetItemsOk returns a tuple with the Items field value // and a boolean to check if the value has been set. func (o *CloudProviderListAllOf) GetItemsOk() (*[]CloudProvider, bool) { - if o == nil || o.Items == nil { + if o == nil { return nil, false } - return o.Items, true -} - -// HasItems returns a boolean if a field has been set. -func (o *CloudProviderListAllOf) HasItems() bool { - if o != nil && o.Items != nil { - return true - } - - return false + return &o.Items, true } -// SetItems gets a reference to the given []CloudProvider and assigns it to the Items field. +// SetItems sets field value func (o *CloudProviderListAllOf) SetItems(v []CloudProvider) { - o.Items = &v + o.Items = v } func (o CloudProviderListAllOf) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} - if o.Items != nil { + if true { toSerialize["items"] = o.Items } return json.Marshal(toSerialize) diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go index 254d38bbb..4e2aa66da 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go index 8092bc1f1..6c58356d6 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go index b99cc0c5c..7af551701 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_cloud_region_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -17,15 +17,16 @@ import ( // CloudRegionListAllOf struct for CloudRegionListAllOf type CloudRegionListAllOf struct { - Items *[]CloudRegion `json:"items,omitempty"` + Items []CloudRegion `json:"items"` } // NewCloudRegionListAllOf instantiates a new CloudRegionListAllOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewCloudRegionListAllOf() *CloudRegionListAllOf { +func NewCloudRegionListAllOf(items []CloudRegion) *CloudRegionListAllOf { this := CloudRegionListAllOf{} + this.Items = items return &this } @@ -37,41 +38,33 @@ func NewCloudRegionListAllOfWithDefaults() *CloudRegionListAllOf { return &this } -// GetItems returns the Items field value if set, zero value otherwise. +// GetItems returns the Items field value func (o *CloudRegionListAllOf) GetItems() []CloudRegion { - if o == nil || o.Items == nil { + if o == nil { var ret []CloudRegion return ret } - return *o.Items + + return o.Items } -// GetItemsOk returns a tuple with the Items field value if set, nil otherwise +// GetItemsOk returns a tuple with the Items field value // and a boolean to check if the value has been set. func (o *CloudRegionListAllOf) GetItemsOk() (*[]CloudRegion, bool) { - if o == nil || o.Items == nil { + if o == nil { return nil, false } - return o.Items, true -} - -// HasItems returns a boolean if a field has been set. -func (o *CloudRegionListAllOf) HasItems() bool { - if o != nil && o.Items != nil { - return true - } - - return false + return &o.Items, true } -// SetItems gets a reference to the given []CloudRegion and assigns it to the Items field. +// SetItems sets field value func (o *CloudRegionListAllOf) SetItems(v []CloudRegion) { - o.Items = &v + o.Items = v } func (o CloudRegionListAllOf) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} - if o.Items != nil { + if true { toSerialize["items"] = o.Items } return json.Marshal(toSerialize) diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go index 2774b41e5..813ada980 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go index 503ac7dde..335858668 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go index 80b23a88c..da1d297b8 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go index e5507f587..6d461fe82 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -17,15 +17,16 @@ import ( // EnterpriseClusterListAllOf struct for EnterpriseClusterListAllOf type EnterpriseClusterListAllOf struct { - Items *[]EnterpriseCluster `json:"items,omitempty"` + Items []EnterpriseCluster `json:"items"` } // NewEnterpriseClusterListAllOf instantiates a new EnterpriseClusterListAllOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewEnterpriseClusterListAllOf() *EnterpriseClusterListAllOf { +func NewEnterpriseClusterListAllOf(items []EnterpriseCluster) *EnterpriseClusterListAllOf { this := EnterpriseClusterListAllOf{} + this.Items = items return &this } @@ -37,41 +38,33 @@ func NewEnterpriseClusterListAllOfWithDefaults() *EnterpriseClusterListAllOf { return &this } -// GetItems returns the Items field value if set, zero value otherwise. +// GetItems returns the Items field value func (o *EnterpriseClusterListAllOf) GetItems() []EnterpriseCluster { - if o == nil || o.Items == nil { + if o == nil { var ret []EnterpriseCluster return ret } - return *o.Items + + return o.Items } -// GetItemsOk returns a tuple with the Items field value if set, nil otherwise +// GetItemsOk returns a tuple with the Items field value // and a boolean to check if the value has been set. func (o *EnterpriseClusterListAllOf) GetItemsOk() (*[]EnterpriseCluster, bool) { - if o == nil || o.Items == nil { + if o == nil { return nil, false } - return o.Items, true -} - -// HasItems returns a boolean if a field has been set. -func (o *EnterpriseClusterListAllOf) HasItems() bool { - if o != nil && o.Items != nil { - return true - } - - return false + return &o.Items, true } -// SetItems gets a reference to the given []EnterpriseCluster and assigns it to the Items field. +// SetItems sets field value func (o *EnterpriseClusterListAllOf) SetItems(v []EnterpriseCluster) { - o.Items = &v + o.Items = v } func (o EnterpriseClusterListAllOf) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} - if o.Items != nil { + if true { toSerialize["items"] = o.Items } return json.Marshal(toSerialize) diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_registration_response.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters.go similarity index 61% rename from vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_registration_response.go rename to vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters.go index 1071479ef..84c168f9e 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_registration_response.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -15,8 +15,8 @@ import ( "encoding/json" ) -// EnterpriseClusterRegistrationResponse Enterprise cluster registration endpoint response -type EnterpriseClusterRegistrationResponse struct { +// EnterpriseClusterWithAddonParameters Enterprise cluster with addon parameters +type EnterpriseClusterWithAddonParameters struct { Id string `json:"id"` Kind string `json:"kind"` Href string `json:"href"` @@ -29,12 +29,12 @@ type EnterpriseClusterRegistrationResponse struct { FleetshardParameters *[]FleetshardParameter `json:"fleetshard_parameters,omitempty"` } -// NewEnterpriseClusterRegistrationResponse instantiates a new EnterpriseClusterRegistrationResponse object +// NewEnterpriseClusterWithAddonParameters instantiates a new EnterpriseClusterWithAddonParameters object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewEnterpriseClusterRegistrationResponse(id string, kind string, href string, accessKafkasViaPrivateNetwork bool) *EnterpriseClusterRegistrationResponse { - this := EnterpriseClusterRegistrationResponse{} +func NewEnterpriseClusterWithAddonParameters(id string, kind string, href string, accessKafkasViaPrivateNetwork bool) *EnterpriseClusterWithAddonParameters { + this := EnterpriseClusterWithAddonParameters{} this.Id = id this.Kind = kind this.Href = href @@ -42,16 +42,16 @@ func NewEnterpriseClusterRegistrationResponse(id string, kind string, href strin return &this } -// NewEnterpriseClusterRegistrationResponseWithDefaults instantiates a new EnterpriseClusterRegistrationResponse object +// NewEnterpriseClusterWithAddonParametersWithDefaults instantiates a new EnterpriseClusterWithAddonParameters object // This constructor will only assign default values to properties that have it defined, // but it doesn't guarantee that properties required by API are set -func NewEnterpriseClusterRegistrationResponseWithDefaults() *EnterpriseClusterRegistrationResponse { - this := EnterpriseClusterRegistrationResponse{} +func NewEnterpriseClusterWithAddonParametersWithDefaults() *EnterpriseClusterWithAddonParameters { + this := EnterpriseClusterWithAddonParameters{} return &this } // GetId returns the Id field value -func (o *EnterpriseClusterRegistrationResponse) GetId() string { +func (o *EnterpriseClusterWithAddonParameters) GetId() string { if o == nil { var ret string return ret @@ -62,7 +62,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetId() string { // GetIdOk returns a tuple with the Id field value // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponse) GetIdOk() (*string, bool) { +func (o *EnterpriseClusterWithAddonParameters) GetIdOk() (*string, bool) { if o == nil { return nil, false } @@ -70,12 +70,12 @@ func (o *EnterpriseClusterRegistrationResponse) GetIdOk() (*string, bool) { } // SetId sets field value -func (o *EnterpriseClusterRegistrationResponse) SetId(v string) { +func (o *EnterpriseClusterWithAddonParameters) SetId(v string) { o.Id = v } // GetKind returns the Kind field value -func (o *EnterpriseClusterRegistrationResponse) GetKind() string { +func (o *EnterpriseClusterWithAddonParameters) GetKind() string { if o == nil { var ret string return ret @@ -86,7 +86,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetKind() string { // GetKindOk returns a tuple with the Kind field value // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponse) GetKindOk() (*string, bool) { +func (o *EnterpriseClusterWithAddonParameters) GetKindOk() (*string, bool) { if o == nil { return nil, false } @@ -94,12 +94,12 @@ func (o *EnterpriseClusterRegistrationResponse) GetKindOk() (*string, bool) { } // SetKind sets field value -func (o *EnterpriseClusterRegistrationResponse) SetKind(v string) { +func (o *EnterpriseClusterWithAddonParameters) SetKind(v string) { o.Kind = v } // GetHref returns the Href field value -func (o *EnterpriseClusterRegistrationResponse) GetHref() string { +func (o *EnterpriseClusterWithAddonParameters) GetHref() string { if o == nil { var ret string return ret @@ -110,7 +110,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetHref() string { // GetHrefOk returns a tuple with the Href field value // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponse) GetHrefOk() (*string, bool) { +func (o *EnterpriseClusterWithAddonParameters) GetHrefOk() (*string, bool) { if o == nil { return nil, false } @@ -118,12 +118,12 @@ func (o *EnterpriseClusterRegistrationResponse) GetHrefOk() (*string, bool) { } // SetHref sets field value -func (o *EnterpriseClusterRegistrationResponse) SetHref(v string) { +func (o *EnterpriseClusterWithAddonParameters) SetHref(v string) { o.Href = v } // GetAccessKafkasViaPrivateNetwork returns the AccessKafkasViaPrivateNetwork field value -func (o *EnterpriseClusterRegistrationResponse) GetAccessKafkasViaPrivateNetwork() bool { +func (o *EnterpriseClusterWithAddonParameters) GetAccessKafkasViaPrivateNetwork() bool { if o == nil { var ret bool return ret @@ -134,7 +134,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetAccessKafkasViaPrivateNetwork // GetAccessKafkasViaPrivateNetworkOk returns a tuple with the AccessKafkasViaPrivateNetwork field value // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponse) GetAccessKafkasViaPrivateNetworkOk() (*bool, bool) { +func (o *EnterpriseClusterWithAddonParameters) GetAccessKafkasViaPrivateNetworkOk() (*bool, bool) { if o == nil { return nil, false } @@ -142,12 +142,12 @@ func (o *EnterpriseClusterRegistrationResponse) GetAccessKafkasViaPrivateNetwork } // SetAccessKafkasViaPrivateNetwork sets field value -func (o *EnterpriseClusterRegistrationResponse) SetAccessKafkasViaPrivateNetwork(v bool) { +func (o *EnterpriseClusterWithAddonParameters) SetAccessKafkasViaPrivateNetwork(v bool) { o.AccessKafkasViaPrivateNetwork = v } // GetClusterId returns the ClusterId field value if set, zero value otherwise. -func (o *EnterpriseClusterRegistrationResponse) GetClusterId() string { +func (o *EnterpriseClusterWithAddonParameters) GetClusterId() string { if o == nil || o.ClusterId == nil { var ret string return ret @@ -157,7 +157,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetClusterId() string { // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponse) GetClusterIdOk() (*string, bool) { +func (o *EnterpriseClusterWithAddonParameters) GetClusterIdOk() (*string, bool) { if o == nil || o.ClusterId == nil { return nil, false } @@ -165,7 +165,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetClusterIdOk() (*string, bool) } // HasClusterId returns a boolean if a field has been set. -func (o *EnterpriseClusterRegistrationResponse) HasClusterId() bool { +func (o *EnterpriseClusterWithAddonParameters) HasClusterId() bool { if o != nil && o.ClusterId != nil { return true } @@ -174,12 +174,12 @@ func (o *EnterpriseClusterRegistrationResponse) HasClusterId() bool { } // SetClusterId gets a reference to the given string and assigns it to the ClusterId field. -func (o *EnterpriseClusterRegistrationResponse) SetClusterId(v string) { +func (o *EnterpriseClusterWithAddonParameters) SetClusterId(v string) { o.ClusterId = &v } // GetStatus returns the Status field value if set, zero value otherwise. -func (o *EnterpriseClusterRegistrationResponse) GetStatus() string { +func (o *EnterpriseClusterWithAddonParameters) GetStatus() string { if o == nil || o.Status == nil { var ret string return ret @@ -189,7 +189,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetStatus() string { // GetStatusOk returns a tuple with the Status field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponse) GetStatusOk() (*string, bool) { +func (o *EnterpriseClusterWithAddonParameters) GetStatusOk() (*string, bool) { if o == nil || o.Status == nil { return nil, false } @@ -197,7 +197,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetStatusOk() (*string, bool) { } // HasStatus returns a boolean if a field has been set. -func (o *EnterpriseClusterRegistrationResponse) HasStatus() bool { +func (o *EnterpriseClusterWithAddonParameters) HasStatus() bool { if o != nil && o.Status != nil { return true } @@ -206,12 +206,12 @@ func (o *EnterpriseClusterRegistrationResponse) HasStatus() bool { } // SetStatus gets a reference to the given string and assigns it to the Status field. -func (o *EnterpriseClusterRegistrationResponse) SetStatus(v string) { +func (o *EnterpriseClusterWithAddonParameters) SetStatus(v string) { o.Status = &v } // GetFleetshardParameters returns the FleetshardParameters field value if set, zero value otherwise. -func (o *EnterpriseClusterRegistrationResponse) GetFleetshardParameters() []FleetshardParameter { +func (o *EnterpriseClusterWithAddonParameters) GetFleetshardParameters() []FleetshardParameter { if o == nil || o.FleetshardParameters == nil { var ret []FleetshardParameter return ret @@ -221,7 +221,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetFleetshardParameters() []Flee // GetFleetshardParametersOk returns a tuple with the FleetshardParameters field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponse) GetFleetshardParametersOk() (*[]FleetshardParameter, bool) { +func (o *EnterpriseClusterWithAddonParameters) GetFleetshardParametersOk() (*[]FleetshardParameter, bool) { if o == nil || o.FleetshardParameters == nil { return nil, false } @@ -229,7 +229,7 @@ func (o *EnterpriseClusterRegistrationResponse) GetFleetshardParametersOk() (*[] } // HasFleetshardParameters returns a boolean if a field has been set. -func (o *EnterpriseClusterRegistrationResponse) HasFleetshardParameters() bool { +func (o *EnterpriseClusterWithAddonParameters) HasFleetshardParameters() bool { if o != nil && o.FleetshardParameters != nil { return true } @@ -238,11 +238,11 @@ func (o *EnterpriseClusterRegistrationResponse) HasFleetshardParameters() bool { } // SetFleetshardParameters gets a reference to the given []FleetshardParameter and assigns it to the FleetshardParameters field. -func (o *EnterpriseClusterRegistrationResponse) SetFleetshardParameters(v []FleetshardParameter) { +func (o *EnterpriseClusterWithAddonParameters) SetFleetshardParameters(v []FleetshardParameter) { o.FleetshardParameters = &v } -func (o EnterpriseClusterRegistrationResponse) MarshalJSON() ([]byte, error) { +func (o EnterpriseClusterWithAddonParameters) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if true { toSerialize["id"] = o.Id @@ -268,38 +268,38 @@ func (o EnterpriseClusterRegistrationResponse) MarshalJSON() ([]byte, error) { return json.Marshal(toSerialize) } -type NullableEnterpriseClusterRegistrationResponse struct { - value *EnterpriseClusterRegistrationResponse +type NullableEnterpriseClusterWithAddonParameters struct { + value *EnterpriseClusterWithAddonParameters isSet bool } -func (v NullableEnterpriseClusterRegistrationResponse) Get() *EnterpriseClusterRegistrationResponse { +func (v NullableEnterpriseClusterWithAddonParameters) Get() *EnterpriseClusterWithAddonParameters { return v.value } -func (v *NullableEnterpriseClusterRegistrationResponse) Set(val *EnterpriseClusterRegistrationResponse) { +func (v *NullableEnterpriseClusterWithAddonParameters) Set(val *EnterpriseClusterWithAddonParameters) { v.value = val v.isSet = true } -func (v NullableEnterpriseClusterRegistrationResponse) IsSet() bool { +func (v NullableEnterpriseClusterWithAddonParameters) IsSet() bool { return v.isSet } -func (v *NullableEnterpriseClusterRegistrationResponse) Unset() { +func (v *NullableEnterpriseClusterWithAddonParameters) Unset() { v.value = nil v.isSet = false } -func NewNullableEnterpriseClusterRegistrationResponse(val *EnterpriseClusterRegistrationResponse) *NullableEnterpriseClusterRegistrationResponse { - return &NullableEnterpriseClusterRegistrationResponse{value: val, isSet: true} +func NewNullableEnterpriseClusterWithAddonParameters(val *EnterpriseClusterWithAddonParameters) *NullableEnterpriseClusterWithAddonParameters { + return &NullableEnterpriseClusterWithAddonParameters{value: val, isSet: true} } -func (v NullableEnterpriseClusterRegistrationResponse) MarshalJSON() ([]byte, error) { +func (v NullableEnterpriseClusterWithAddonParameters) MarshalJSON() ([]byte, error) { return json.Marshal(v.value) } -func (v *NullableEnterpriseClusterRegistrationResponse) UnmarshalJSON(src []byte) error { +func (v *NullableEnterpriseClusterWithAddonParameters) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) } diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_registration_response_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters_all_of.go similarity index 58% rename from vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_registration_response_all_of.go rename to vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters_all_of.go index 6cd87cf70..03b9088fe 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_registration_response_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_cluster_with_addon_parameters_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -15,8 +15,8 @@ import ( "encoding/json" ) -// EnterpriseClusterRegistrationResponseAllOf struct for EnterpriseClusterRegistrationResponseAllOf -type EnterpriseClusterRegistrationResponseAllOf struct { +// EnterpriseClusterWithAddonParametersAllOf struct for EnterpriseClusterWithAddonParametersAllOf +type EnterpriseClusterWithAddonParametersAllOf struct { // Indicates whether Kafkas created on this data plane cluster have to be accessed via private network AccessKafkasViaPrivateNetwork bool `json:"access_kafkas_via_private_network"` // OCM cluster id of the registered Enterprise cluster @@ -26,26 +26,26 @@ type EnterpriseClusterRegistrationResponseAllOf struct { FleetshardParameters *[]FleetshardParameter `json:"fleetshard_parameters,omitempty"` } -// NewEnterpriseClusterRegistrationResponseAllOf instantiates a new EnterpriseClusterRegistrationResponseAllOf object +// NewEnterpriseClusterWithAddonParametersAllOf instantiates a new EnterpriseClusterWithAddonParametersAllOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewEnterpriseClusterRegistrationResponseAllOf(accessKafkasViaPrivateNetwork bool) *EnterpriseClusterRegistrationResponseAllOf { - this := EnterpriseClusterRegistrationResponseAllOf{} +func NewEnterpriseClusterWithAddonParametersAllOf(accessKafkasViaPrivateNetwork bool) *EnterpriseClusterWithAddonParametersAllOf { + this := EnterpriseClusterWithAddonParametersAllOf{} this.AccessKafkasViaPrivateNetwork = accessKafkasViaPrivateNetwork return &this } -// NewEnterpriseClusterRegistrationResponseAllOfWithDefaults instantiates a new EnterpriseClusterRegistrationResponseAllOf object +// NewEnterpriseClusterWithAddonParametersAllOfWithDefaults instantiates a new EnterpriseClusterWithAddonParametersAllOf object // This constructor will only assign default values to properties that have it defined, // but it doesn't guarantee that properties required by API are set -func NewEnterpriseClusterRegistrationResponseAllOfWithDefaults() *EnterpriseClusterRegistrationResponseAllOf { - this := EnterpriseClusterRegistrationResponseAllOf{} +func NewEnterpriseClusterWithAddonParametersAllOfWithDefaults() *EnterpriseClusterWithAddonParametersAllOf { + this := EnterpriseClusterWithAddonParametersAllOf{} return &this } // GetAccessKafkasViaPrivateNetwork returns the AccessKafkasViaPrivateNetwork field value -func (o *EnterpriseClusterRegistrationResponseAllOf) GetAccessKafkasViaPrivateNetwork() bool { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetAccessKafkasViaPrivateNetwork() bool { if o == nil { var ret bool return ret @@ -56,7 +56,7 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetAccessKafkasViaPrivateNe // GetAccessKafkasViaPrivateNetworkOk returns a tuple with the AccessKafkasViaPrivateNetwork field value // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponseAllOf) GetAccessKafkasViaPrivateNetworkOk() (*bool, bool) { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetAccessKafkasViaPrivateNetworkOk() (*bool, bool) { if o == nil { return nil, false } @@ -64,12 +64,12 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetAccessKafkasViaPrivateNe } // SetAccessKafkasViaPrivateNetwork sets field value -func (o *EnterpriseClusterRegistrationResponseAllOf) SetAccessKafkasViaPrivateNetwork(v bool) { +func (o *EnterpriseClusterWithAddonParametersAllOf) SetAccessKafkasViaPrivateNetwork(v bool) { o.AccessKafkasViaPrivateNetwork = v } // GetClusterId returns the ClusterId field value if set, zero value otherwise. -func (o *EnterpriseClusterRegistrationResponseAllOf) GetClusterId() string { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetClusterId() string { if o == nil || o.ClusterId == nil { var ret string return ret @@ -79,7 +79,7 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetClusterId() string { // GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponseAllOf) GetClusterIdOk() (*string, bool) { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetClusterIdOk() (*string, bool) { if o == nil || o.ClusterId == nil { return nil, false } @@ -87,7 +87,7 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetClusterIdOk() (*string, } // HasClusterId returns a boolean if a field has been set. -func (o *EnterpriseClusterRegistrationResponseAllOf) HasClusterId() bool { +func (o *EnterpriseClusterWithAddonParametersAllOf) HasClusterId() bool { if o != nil && o.ClusterId != nil { return true } @@ -96,12 +96,12 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) HasClusterId() bool { } // SetClusterId gets a reference to the given string and assigns it to the ClusterId field. -func (o *EnterpriseClusterRegistrationResponseAllOf) SetClusterId(v string) { +func (o *EnterpriseClusterWithAddonParametersAllOf) SetClusterId(v string) { o.ClusterId = &v } // GetStatus returns the Status field value if set, zero value otherwise. -func (o *EnterpriseClusterRegistrationResponseAllOf) GetStatus() string { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetStatus() string { if o == nil || o.Status == nil { var ret string return ret @@ -111,7 +111,7 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetStatus() string { // GetStatusOk returns a tuple with the Status field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponseAllOf) GetStatusOk() (*string, bool) { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetStatusOk() (*string, bool) { if o == nil || o.Status == nil { return nil, false } @@ -119,7 +119,7 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetStatusOk() (*string, boo } // HasStatus returns a boolean if a field has been set. -func (o *EnterpriseClusterRegistrationResponseAllOf) HasStatus() bool { +func (o *EnterpriseClusterWithAddonParametersAllOf) HasStatus() bool { if o != nil && o.Status != nil { return true } @@ -128,12 +128,12 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) HasStatus() bool { } // SetStatus gets a reference to the given string and assigns it to the Status field. -func (o *EnterpriseClusterRegistrationResponseAllOf) SetStatus(v string) { +func (o *EnterpriseClusterWithAddonParametersAllOf) SetStatus(v string) { o.Status = &v } // GetFleetshardParameters returns the FleetshardParameters field value if set, zero value otherwise. -func (o *EnterpriseClusterRegistrationResponseAllOf) GetFleetshardParameters() []FleetshardParameter { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetFleetshardParameters() []FleetshardParameter { if o == nil || o.FleetshardParameters == nil { var ret []FleetshardParameter return ret @@ -143,7 +143,7 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetFleetshardParameters() [ // GetFleetshardParametersOk returns a tuple with the FleetshardParameters field value if set, nil otherwise // and a boolean to check if the value has been set. -func (o *EnterpriseClusterRegistrationResponseAllOf) GetFleetshardParametersOk() (*[]FleetshardParameter, bool) { +func (o *EnterpriseClusterWithAddonParametersAllOf) GetFleetshardParametersOk() (*[]FleetshardParameter, bool) { if o == nil || o.FleetshardParameters == nil { return nil, false } @@ -151,7 +151,7 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) GetFleetshardParametersOk() } // HasFleetshardParameters returns a boolean if a field has been set. -func (o *EnterpriseClusterRegistrationResponseAllOf) HasFleetshardParameters() bool { +func (o *EnterpriseClusterWithAddonParametersAllOf) HasFleetshardParameters() bool { if o != nil && o.FleetshardParameters != nil { return true } @@ -160,11 +160,11 @@ func (o *EnterpriseClusterRegistrationResponseAllOf) HasFleetshardParameters() b } // SetFleetshardParameters gets a reference to the given []FleetshardParameter and assigns it to the FleetshardParameters field. -func (o *EnterpriseClusterRegistrationResponseAllOf) SetFleetshardParameters(v []FleetshardParameter) { +func (o *EnterpriseClusterWithAddonParametersAllOf) SetFleetshardParameters(v []FleetshardParameter) { o.FleetshardParameters = &v } -func (o EnterpriseClusterRegistrationResponseAllOf) MarshalJSON() ([]byte, error) { +func (o EnterpriseClusterWithAddonParametersAllOf) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if true { toSerialize["access_kafkas_via_private_network"] = o.AccessKafkasViaPrivateNetwork @@ -181,38 +181,38 @@ func (o EnterpriseClusterRegistrationResponseAllOf) MarshalJSON() ([]byte, error return json.Marshal(toSerialize) } -type NullableEnterpriseClusterRegistrationResponseAllOf struct { - value *EnterpriseClusterRegistrationResponseAllOf +type NullableEnterpriseClusterWithAddonParametersAllOf struct { + value *EnterpriseClusterWithAddonParametersAllOf isSet bool } -func (v NullableEnterpriseClusterRegistrationResponseAllOf) Get() *EnterpriseClusterRegistrationResponseAllOf { +func (v NullableEnterpriseClusterWithAddonParametersAllOf) Get() *EnterpriseClusterWithAddonParametersAllOf { return v.value } -func (v *NullableEnterpriseClusterRegistrationResponseAllOf) Set(val *EnterpriseClusterRegistrationResponseAllOf) { +func (v *NullableEnterpriseClusterWithAddonParametersAllOf) Set(val *EnterpriseClusterWithAddonParametersAllOf) { v.value = val v.isSet = true } -func (v NullableEnterpriseClusterRegistrationResponseAllOf) IsSet() bool { +func (v NullableEnterpriseClusterWithAddonParametersAllOf) IsSet() bool { return v.isSet } -func (v *NullableEnterpriseClusterRegistrationResponseAllOf) Unset() { +func (v *NullableEnterpriseClusterWithAddonParametersAllOf) Unset() { v.value = nil v.isSet = false } -func NewNullableEnterpriseClusterRegistrationResponseAllOf(val *EnterpriseClusterRegistrationResponseAllOf) *NullableEnterpriseClusterRegistrationResponseAllOf { - return &NullableEnterpriseClusterRegistrationResponseAllOf{value: val, isSet: true} +func NewNullableEnterpriseClusterWithAddonParametersAllOf(val *EnterpriseClusterWithAddonParametersAllOf) *NullableEnterpriseClusterWithAddonParametersAllOf { + return &NullableEnterpriseClusterWithAddonParametersAllOf{value: val, isSet: true} } -func (v NullableEnterpriseClusterRegistrationResponseAllOf) MarshalJSON() ([]byte, error) { +func (v NullableEnterpriseClusterWithAddonParametersAllOf) MarshalJSON() ([]byte, error) { return json.Marshal(v.value) } -func (v *NullableEnterpriseClusterRegistrationResponseAllOf) UnmarshalJSON(src []byte) error { +func (v *NullableEnterpriseClusterWithAddonParametersAllOf) UnmarshalJSON(src []byte) error { v.isSet = true return json.Unmarshal(src, &v.value) } diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go index b14469aff..74ecf2296 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_enterprise_osd_cluster_payload.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go index 3158f5ee5..af56f673e 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go index 954888dd6..99a630eac 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go index 2fd81a08d..556211053 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_error_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -17,15 +17,16 @@ import ( // ErrorListAllOf struct for ErrorListAllOf type ErrorListAllOf struct { - Items *[]Error `json:"items,omitempty"` + Items []Error `json:"items"` } // NewErrorListAllOf instantiates a new ErrorListAllOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewErrorListAllOf() *ErrorListAllOf { +func NewErrorListAllOf(items []Error) *ErrorListAllOf { this := ErrorListAllOf{} + this.Items = items return &this } @@ -37,41 +38,33 @@ func NewErrorListAllOfWithDefaults() *ErrorListAllOf { return &this } -// GetItems returns the Items field value if set, zero value otherwise. +// GetItems returns the Items field value func (o *ErrorListAllOf) GetItems() []Error { - if o == nil || o.Items == nil { + if o == nil { var ret []Error return ret } - return *o.Items + + return o.Items } -// GetItemsOk returns a tuple with the Items field value if set, nil otherwise +// GetItemsOk returns a tuple with the Items field value // and a boolean to check if the value has been set. func (o *ErrorListAllOf) GetItemsOk() (*[]Error, bool) { - if o == nil || o.Items == nil { + if o == nil { return nil, false } - return o.Items, true -} - -// HasItems returns a boolean if a field has been set. -func (o *ErrorListAllOf) HasItems() bool { - if o != nil && o.Items != nil { - return true - } - - return false + return &o.Items, true } -// SetItems gets a reference to the given []Error and assigns it to the Items field. +// SetItems sets field value func (o *ErrorListAllOf) SetItems(v []Error) { - o.Items = &v + o.Items = v } func (o ErrorListAllOf) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} - if o.Items != nil { + if true { toSerialize["items"] = o.Items } return json.Marshal(toSerialize) diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go index 197199de7..e4fd69509 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_fleetshard_parameter.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go index 7f5ba5c25..13cc5a5e9 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_instant_query.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_promote_request.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_promote_request.go new file mode 100644 index 000000000..b0036e784 --- /dev/null +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_promote_request.go @@ -0,0 +1,184 @@ +/* + * Kafka Management API + * + * Kafka Management API is a REST API to manage Kafka instances + * + * API version: 1.15.0 + * Contact: rhosak-support@redhat.com + */ + +// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT. + +package kafkamgmtclient + +import ( + "encoding/json" +) + +// KafkaPromoteRequest struct for KafkaPromoteRequest +type KafkaPromoteRequest struct { + // The desired Kafka billing model to promote the kafka instance to. Promotion is performed asynchronously. Accepted values: ['marketplace', 'standard'] + DesiredKafkaBillingModel string `json:"desired_kafka_billing_model"` + // The desired billing marketplace to promote the kafka instance to. Accepted values: ['aws', 'rhm']. Only considered when desired_kafka_billing_model is 'marketplace' + DesiredMarketplace *string `json:"desired_marketplace,omitempty"` + // The desired Kafka billing cloud account ID to promote the kafka instance to. Only considered when desired_kafka_billing_model is 'marketplace' + DesiredBillingCloudAccountId *string `json:"desired_billing_cloud_account_id,omitempty"` +} + +// NewKafkaPromoteRequest instantiates a new KafkaPromoteRequest object +// This constructor will assign default values to properties that have it defined, +// and makes sure properties required by API are set, but the set of arguments +// will change when the set of required properties is changed +func NewKafkaPromoteRequest(desiredKafkaBillingModel string) *KafkaPromoteRequest { + this := KafkaPromoteRequest{} + this.DesiredKafkaBillingModel = desiredKafkaBillingModel + return &this +} + +// NewKafkaPromoteRequestWithDefaults instantiates a new KafkaPromoteRequest object +// This constructor will only assign default values to properties that have it defined, +// but it doesn't guarantee that properties required by API are set +func NewKafkaPromoteRequestWithDefaults() *KafkaPromoteRequest { + this := KafkaPromoteRequest{} + return &this +} + +// GetDesiredKafkaBillingModel returns the DesiredKafkaBillingModel field value +func (o *KafkaPromoteRequest) GetDesiredKafkaBillingModel() string { + if o == nil { + var ret string + return ret + } + + return o.DesiredKafkaBillingModel +} + +// GetDesiredKafkaBillingModelOk returns a tuple with the DesiredKafkaBillingModel field value +// and a boolean to check if the value has been set. +func (o *KafkaPromoteRequest) GetDesiredKafkaBillingModelOk() (*string, bool) { + if o == nil { + return nil, false + } + return &o.DesiredKafkaBillingModel, true +} + +// SetDesiredKafkaBillingModel sets field value +func (o *KafkaPromoteRequest) SetDesiredKafkaBillingModel(v string) { + o.DesiredKafkaBillingModel = v +} + +// GetDesiredMarketplace returns the DesiredMarketplace field value if set, zero value otherwise. +func (o *KafkaPromoteRequest) GetDesiredMarketplace() string { + if o == nil || o.DesiredMarketplace == nil { + var ret string + return ret + } + return *o.DesiredMarketplace +} + +// GetDesiredMarketplaceOk returns a tuple with the DesiredMarketplace field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *KafkaPromoteRequest) GetDesiredMarketplaceOk() (*string, bool) { + if o == nil || o.DesiredMarketplace == nil { + return nil, false + } + return o.DesiredMarketplace, true +} + +// HasDesiredMarketplace returns a boolean if a field has been set. +func (o *KafkaPromoteRequest) HasDesiredMarketplace() bool { + if o != nil && o.DesiredMarketplace != nil { + return true + } + + return false +} + +// SetDesiredMarketplace gets a reference to the given string and assigns it to the DesiredMarketplace field. +func (o *KafkaPromoteRequest) SetDesiredMarketplace(v string) { + o.DesiredMarketplace = &v +} + +// GetDesiredBillingCloudAccountId returns the DesiredBillingCloudAccountId field value if set, zero value otherwise. +func (o *KafkaPromoteRequest) GetDesiredBillingCloudAccountId() string { + if o == nil || o.DesiredBillingCloudAccountId == nil { + var ret string + return ret + } + return *o.DesiredBillingCloudAccountId +} + +// GetDesiredBillingCloudAccountIdOk returns a tuple with the DesiredBillingCloudAccountId field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *KafkaPromoteRequest) GetDesiredBillingCloudAccountIdOk() (*string, bool) { + if o == nil || o.DesiredBillingCloudAccountId == nil { + return nil, false + } + return o.DesiredBillingCloudAccountId, true +} + +// HasDesiredBillingCloudAccountId returns a boolean if a field has been set. +func (o *KafkaPromoteRequest) HasDesiredBillingCloudAccountId() bool { + if o != nil && o.DesiredBillingCloudAccountId != nil { + return true + } + + return false +} + +// SetDesiredBillingCloudAccountId gets a reference to the given string and assigns it to the DesiredBillingCloudAccountId field. +func (o *KafkaPromoteRequest) SetDesiredBillingCloudAccountId(v string) { + o.DesiredBillingCloudAccountId = &v +} + +func (o KafkaPromoteRequest) MarshalJSON() ([]byte, error) { + toSerialize := map[string]interface{}{} + if true { + toSerialize["desired_kafka_billing_model"] = o.DesiredKafkaBillingModel + } + if o.DesiredMarketplace != nil { + toSerialize["desired_marketplace"] = o.DesiredMarketplace + } + if o.DesiredBillingCloudAccountId != nil { + toSerialize["desired_billing_cloud_account_id"] = o.DesiredBillingCloudAccountId + } + return json.Marshal(toSerialize) +} + +type NullableKafkaPromoteRequest struct { + value *KafkaPromoteRequest + isSet bool +} + +func (v NullableKafkaPromoteRequest) Get() *KafkaPromoteRequest { + return v.value +} + +func (v *NullableKafkaPromoteRequest) Set(val *KafkaPromoteRequest) { + v.value = val + v.isSet = true +} + +func (v NullableKafkaPromoteRequest) IsSet() bool { + return v.isSet +} + +func (v *NullableKafkaPromoteRequest) Unset() { + v.value = nil + v.isSet = false +} + +func NewNullableKafkaPromoteRequest(val *KafkaPromoteRequest) *NullableKafkaPromoteRequest { + return &NullableKafkaPromoteRequest{value: val, isSet: true} +} + +func (v NullableKafkaPromoteRequest) MarshalJSON() ([]byte, error) { + return json.Marshal(v.value) +} + +func (v *NullableKafkaPromoteRequest) UnmarshalJSON(src []byte) error { + v.isSet = true + return json.Unmarshal(src, &v.value) +} + + diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go index 733da9092..821c50adc 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -62,6 +62,12 @@ type KafkaRequest struct { BillingCloudAccountId *string `json:"billing_cloud_account_id,omitempty"` Marketplace *string `json:"marketplace,omitempty"` BillingModel *string `json:"billing_model,omitempty"` + // Status of the Kafka request promotion. Possible values: ['promoting', 'failed']. If unset it means no promotion is in progress. + PromotionStatus *string `json:"promotion_status,omitempty"` + // The ID of the data plane where Kafka is deployed on. This information is only returned for kafka whose billing model is enterprise + ClusterId NullableString `json:"cluster_id,omitempty"` + // Details of the Kafka request promotion. It can be set when a Kafka request promotion is in progress or has failed + PromotionDetails *string `json:"promotion_details,omitempty"` } // NewKafkaRequest instantiates a new KafkaRequest object @@ -1080,6 +1086,112 @@ func (o *KafkaRequest) SetBillingModel(v string) { o.BillingModel = &v } +// GetPromotionStatus returns the PromotionStatus field value if set, zero value otherwise. +func (o *KafkaRequest) GetPromotionStatus() string { + if o == nil || o.PromotionStatus == nil { + var ret string + return ret + } + return *o.PromotionStatus +} + +// GetPromotionStatusOk returns a tuple with the PromotionStatus field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *KafkaRequest) GetPromotionStatusOk() (*string, bool) { + if o == nil || o.PromotionStatus == nil { + return nil, false + } + return o.PromotionStatus, true +} + +// HasPromotionStatus returns a boolean if a field has been set. +func (o *KafkaRequest) HasPromotionStatus() bool { + if o != nil && o.PromotionStatus != nil { + return true + } + + return false +} + +// SetPromotionStatus gets a reference to the given string and assigns it to the PromotionStatus field. +func (o *KafkaRequest) SetPromotionStatus(v string) { + o.PromotionStatus = &v +} + +// GetClusterId returns the ClusterId field value if set, zero value otherwise (both if not set or set to explicit null). +func (o *KafkaRequest) GetClusterId() string { + if o == nil || o.ClusterId.Get() == nil { + var ret string + return ret + } + return *o.ClusterId.Get() +} + +// GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise +// and a boolean to check if the value has been set. +// NOTE: If the value is an explicit nil, `nil, true` will be returned +func (o *KafkaRequest) GetClusterIdOk() (*string, bool) { + if o == nil { + return nil, false + } + return o.ClusterId.Get(), o.ClusterId.IsSet() +} + +// HasClusterId returns a boolean if a field has been set. +func (o *KafkaRequest) HasClusterId() bool { + if o != nil && o.ClusterId.IsSet() { + return true + } + + return false +} + +// SetClusterId gets a reference to the given NullableString and assigns it to the ClusterId field. +func (o *KafkaRequest) SetClusterId(v string) { + o.ClusterId.Set(&v) +} +// SetClusterIdNil sets the value for ClusterId to be an explicit nil +func (o *KafkaRequest) SetClusterIdNil() { + o.ClusterId.Set(nil) +} + +// UnsetClusterId ensures that no value is present for ClusterId, not even an explicit nil +func (o *KafkaRequest) UnsetClusterId() { + o.ClusterId.Unset() +} + +// GetPromotionDetails returns the PromotionDetails field value if set, zero value otherwise. +func (o *KafkaRequest) GetPromotionDetails() string { + if o == nil || o.PromotionDetails == nil { + var ret string + return ret + } + return *o.PromotionDetails +} + +// GetPromotionDetailsOk returns a tuple with the PromotionDetails field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *KafkaRequest) GetPromotionDetailsOk() (*string, bool) { + if o == nil || o.PromotionDetails == nil { + return nil, false + } + return o.PromotionDetails, true +} + +// HasPromotionDetails returns a boolean if a field has been set. +func (o *KafkaRequest) HasPromotionDetails() bool { + if o != nil && o.PromotionDetails != nil { + return true + } + + return false +} + +// SetPromotionDetails gets a reference to the given string and assigns it to the PromotionDetails field. +func (o *KafkaRequest) SetPromotionDetails(v string) { + o.PromotionDetails = &v +} + func (o KafkaRequest) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if true { @@ -1178,6 +1290,15 @@ func (o KafkaRequest) MarshalJSON() ([]byte, error) { if o.BillingModel != nil { toSerialize["billing_model"] = o.BillingModel } + if o.PromotionStatus != nil { + toSerialize["promotion_status"] = o.PromotionStatus + } + if o.ClusterId.IsSet() { + toSerialize["cluster_id"] = o.ClusterId.Get() + } + if o.PromotionDetails != nil { + toSerialize["promotion_details"] = o.PromotionDetails + } return json.Marshal(toSerialize) } diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go index f31aced44..1d4777145 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -59,6 +59,12 @@ type KafkaRequestAllOf struct { BillingCloudAccountId *string `json:"billing_cloud_account_id,omitempty"` Marketplace *string `json:"marketplace,omitempty"` BillingModel *string `json:"billing_model,omitempty"` + // Status of the Kafka request promotion. Possible values: ['promoting', 'failed']. If unset it means no promotion is in progress. + PromotionStatus *string `json:"promotion_status,omitempty"` + // The ID of the data plane where Kafka is deployed on. This information is only returned for kafka whose billing model is enterprise + ClusterId NullableString `json:"cluster_id,omitempty"` + // Details of the Kafka request promotion. It can be set when a Kafka request promotion is in progress or has failed + PromotionDetails *string `json:"promotion_details,omitempty"` } // NewKafkaRequestAllOf instantiates a new KafkaRequestAllOf object @@ -1002,6 +1008,112 @@ func (o *KafkaRequestAllOf) SetBillingModel(v string) { o.BillingModel = &v } +// GetPromotionStatus returns the PromotionStatus field value if set, zero value otherwise. +func (o *KafkaRequestAllOf) GetPromotionStatus() string { + if o == nil || o.PromotionStatus == nil { + var ret string + return ret + } + return *o.PromotionStatus +} + +// GetPromotionStatusOk returns a tuple with the PromotionStatus field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *KafkaRequestAllOf) GetPromotionStatusOk() (*string, bool) { + if o == nil || o.PromotionStatus == nil { + return nil, false + } + return o.PromotionStatus, true +} + +// HasPromotionStatus returns a boolean if a field has been set. +func (o *KafkaRequestAllOf) HasPromotionStatus() bool { + if o != nil && o.PromotionStatus != nil { + return true + } + + return false +} + +// SetPromotionStatus gets a reference to the given string and assigns it to the PromotionStatus field. +func (o *KafkaRequestAllOf) SetPromotionStatus(v string) { + o.PromotionStatus = &v +} + +// GetClusterId returns the ClusterId field value if set, zero value otherwise (both if not set or set to explicit null). +func (o *KafkaRequestAllOf) GetClusterId() string { + if o == nil || o.ClusterId.Get() == nil { + var ret string + return ret + } + return *o.ClusterId.Get() +} + +// GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise +// and a boolean to check if the value has been set. +// NOTE: If the value is an explicit nil, `nil, true` will be returned +func (o *KafkaRequestAllOf) GetClusterIdOk() (*string, bool) { + if o == nil { + return nil, false + } + return o.ClusterId.Get(), o.ClusterId.IsSet() +} + +// HasClusterId returns a boolean if a field has been set. +func (o *KafkaRequestAllOf) HasClusterId() bool { + if o != nil && o.ClusterId.IsSet() { + return true + } + + return false +} + +// SetClusterId gets a reference to the given NullableString and assigns it to the ClusterId field. +func (o *KafkaRequestAllOf) SetClusterId(v string) { + o.ClusterId.Set(&v) +} +// SetClusterIdNil sets the value for ClusterId to be an explicit nil +func (o *KafkaRequestAllOf) SetClusterIdNil() { + o.ClusterId.Set(nil) +} + +// UnsetClusterId ensures that no value is present for ClusterId, not even an explicit nil +func (o *KafkaRequestAllOf) UnsetClusterId() { + o.ClusterId.Unset() +} + +// GetPromotionDetails returns the PromotionDetails field value if set, zero value otherwise. +func (o *KafkaRequestAllOf) GetPromotionDetails() string { + if o == nil || o.PromotionDetails == nil { + var ret string + return ret + } + return *o.PromotionDetails +} + +// GetPromotionDetailsOk returns a tuple with the PromotionDetails field value if set, nil otherwise +// and a boolean to check if the value has been set. +func (o *KafkaRequestAllOf) GetPromotionDetailsOk() (*string, bool) { + if o == nil || o.PromotionDetails == nil { + return nil, false + } + return o.PromotionDetails, true +} + +// HasPromotionDetails returns a boolean if a field has been set. +func (o *KafkaRequestAllOf) HasPromotionDetails() bool { + if o != nil && o.PromotionDetails != nil { + return true + } + + return false +} + +// SetPromotionDetails gets a reference to the given string and assigns it to the PromotionDetails field. +func (o *KafkaRequestAllOf) SetPromotionDetails(v string) { + o.PromotionDetails = &v +} + func (o KafkaRequestAllOf) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if o.Status != nil { @@ -1091,6 +1203,15 @@ func (o KafkaRequestAllOf) MarshalJSON() ([]byte, error) { if o.BillingModel != nil { toSerialize["billing_model"] = o.BillingModel } + if o.PromotionStatus != nil { + toSerialize["promotion_status"] = o.PromotionStatus + } + if o.ClusterId.IsSet() { + toSerialize["cluster_id"] = o.ClusterId.Get() + } + if o.PromotionDetails != nil { + toSerialize["promotion_details"] = o.PromotionDetails + } return json.Marshal(toSerialize) } diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go index 7b911149d..a2f2f7354 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go index d713a3544..91a65ea0f 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -17,15 +17,16 @@ import ( // KafkaRequestListAllOf struct for KafkaRequestListAllOf type KafkaRequestListAllOf struct { - Items *[]KafkaRequest `json:"items,omitempty"` + Items []KafkaRequest `json:"items"` } // NewKafkaRequestListAllOf instantiates a new KafkaRequestListAllOf object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewKafkaRequestListAllOf() *KafkaRequestListAllOf { +func NewKafkaRequestListAllOf(items []KafkaRequest) *KafkaRequestListAllOf { this := KafkaRequestListAllOf{} + this.Items = items return &this } @@ -37,41 +38,33 @@ func NewKafkaRequestListAllOfWithDefaults() *KafkaRequestListAllOf { return &this } -// GetItems returns the Items field value if set, zero value otherwise. +// GetItems returns the Items field value func (o *KafkaRequestListAllOf) GetItems() []KafkaRequest { - if o == nil || o.Items == nil { + if o == nil { var ret []KafkaRequest return ret } - return *o.Items + + return o.Items } -// GetItemsOk returns a tuple with the Items field value if set, nil otherwise +// GetItemsOk returns a tuple with the Items field value // and a boolean to check if the value has been set. func (o *KafkaRequestListAllOf) GetItemsOk() (*[]KafkaRequest, bool) { - if o == nil || o.Items == nil { + if o == nil { return nil, false } - return o.Items, true -} - -// HasItems returns a boolean if a field has been set. -func (o *KafkaRequestListAllOf) HasItems() bool { - if o != nil && o.Items != nil { - return true - } - - return false + return &o.Items, true } -// SetItems gets a reference to the given []KafkaRequest and assigns it to the Items field. +// SetItems sets field value func (o *KafkaRequestListAllOf) SetItems(v []KafkaRequest) { - o.Items = &v + o.Items = v } func (o KafkaRequestListAllOf) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} - if o.Items != nil { + if true { toSerialize["items"] = o.Items } return json.Marshal(toSerialize) diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go index 63140d5ec..04250534a 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_request_payload.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -33,6 +33,8 @@ type KafkaRequestPayload struct { Marketplace NullableString `json:"marketplace,omitempty"` // billing model to use BillingModel NullableString `json:"billing_model,omitempty"` + // enterprise OSD cluster ID to be used for kafka creation + ClusterId NullableString `json:"cluster_id,omitempty"` } // NewKafkaRequestPayload instantiates a new KafkaRequestPayload object @@ -341,6 +343,48 @@ func (o *KafkaRequestPayload) UnsetBillingModel() { o.BillingModel.Unset() } +// GetClusterId returns the ClusterId field value if set, zero value otherwise (both if not set or set to explicit null). +func (o *KafkaRequestPayload) GetClusterId() string { + if o == nil || o.ClusterId.Get() == nil { + var ret string + return ret + } + return *o.ClusterId.Get() +} + +// GetClusterIdOk returns a tuple with the ClusterId field value if set, nil otherwise +// and a boolean to check if the value has been set. +// NOTE: If the value is an explicit nil, `nil, true` will be returned +func (o *KafkaRequestPayload) GetClusterIdOk() (*string, bool) { + if o == nil { + return nil, false + } + return o.ClusterId.Get(), o.ClusterId.IsSet() +} + +// HasClusterId returns a boolean if a field has been set. +func (o *KafkaRequestPayload) HasClusterId() bool { + if o != nil && o.ClusterId.IsSet() { + return true + } + + return false +} + +// SetClusterId gets a reference to the given NullableString and assigns it to the ClusterId field. +func (o *KafkaRequestPayload) SetClusterId(v string) { + o.ClusterId.Set(&v) +} +// SetClusterIdNil sets the value for ClusterId to be an explicit nil +func (o *KafkaRequestPayload) SetClusterIdNil() { + o.ClusterId.Set(nil) +} + +// UnsetClusterId ensures that no value is present for ClusterId, not even an explicit nil +func (o *KafkaRequestPayload) UnsetClusterId() { + o.ClusterId.Unset() +} + func (o KafkaRequestPayload) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if o.CloudProvider != nil { @@ -367,6 +411,9 @@ func (o KafkaRequestPayload) MarshalJSON() ([]byte, error) { if o.BillingModel.IsSet() { toSerialize["billing_model"] = o.BillingModel.Get() } + if o.ClusterId.IsSet() { + toSerialize["cluster_id"] = o.ClusterId.Get() + } return json.Marshal(toSerialize) } diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go index 547b17631..7ab0cbcc7 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_kafka_update_request.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go index 0980b2786..385945d4b 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -21,20 +21,18 @@ type List struct { Page int32 `json:"page"` Size int32 `json:"size"` Total int32 `json:"total"` - Items []ObjectReference `json:"items"` } // NewList instantiates a new List object // This constructor will assign default values to properties that have it defined, // and makes sure properties required by API are set, but the set of arguments // will change when the set of required properties is changed -func NewList(kind string, page int32, size int32, total int32, items []ObjectReference) *List { +func NewList(kind string, page int32, size int32, total int32) *List { this := List{} this.Kind = kind this.Page = page this.Size = size this.Total = total - this.Items = items return &this } @@ -142,30 +140,6 @@ func (o *List) SetTotal(v int32) { o.Total = v } -// GetItems returns the Items field value -func (o *List) GetItems() []ObjectReference { - if o == nil { - var ret []ObjectReference - return ret - } - - return o.Items -} - -// GetItemsOk returns a tuple with the Items field value -// and a boolean to check if the value has been set. -func (o *List) GetItemsOk() (*[]ObjectReference, bool) { - if o == nil { - return nil, false - } - return &o.Items, true -} - -// SetItems sets field value -func (o *List) SetItems(v []ObjectReference) { - o.Items = v -} - func (o List) MarshalJSON() ([]byte, error) { toSerialize := map[string]interface{}{} if true { @@ -180,9 +154,6 @@ func (o List) MarshalJSON() ([]byte, error) { if true { toSerialize["total"] = o.Total } - if true { - toSerialize["items"] = o.Items - } return json.Marshal(toSerialize) } diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go index 5a080c2b2..971a35e95 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go index 06976d807..d3c4dbc7d 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_instant_query_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go index 9175ed7ec..594aa2149 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go index c90ae08d0..c9812b8c2 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_metrics_range_query_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go index d96e9350e..02494e6c3 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_object_reference.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go index 431551c91..6198be62a 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_range_query.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go index 05645b0f1..f13297a00 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_region_capacity_list_item.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go index ce3a4b428..0792dab3c 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go index 402577dc0..dfb12751b 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go index 13bfb1145..4b335f2b2 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go index 0a70f21c5..f64943f07 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go index b0105b1d4..b3fff12e2 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go index c05fbe523..70faf2270 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_list_item_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go index 4abef1bbd..79cd4069f 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_service_account_request.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go index 5046e9176..d484226cb 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go index 9a6d727dc..8aa3a1923 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_sso_provider_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go index e449a6114..db2e99fd7 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_billing_model.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ @@ -21,7 +21,7 @@ type SupportedKafkaBillingModel struct { Id string `json:"id"` // AMS resource to be used. Accepted values: ['rhosak'] AmsResource string `json:"ams_resource"` - // AMS product to be used. Accepted values: ['RHOSAK', 'RHOSAKTrial', 'RHOSAKEval'] + // AMS product to be used. Accepted values: ['RHOSAK', 'RHOSAKTrial', 'RHOSAKEval', 'RHOSAKCC'] AmsProduct string `json:"ams_product"` // List of AMS available billing models: Accepted values: ['marketplace', 'marketplace-rhm', 'marketplace-aws'] AmsBillingModels []string `json:"ams_billing_models"` diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go index e48aa387d..037ecd543 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_type.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go index f766a9248..169ab61c3 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go index 201899b8f..440eaa684 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_instance_types_list_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go index fed113704..9ff711bd9 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go index 1262ccc61..c8dc0ae2f 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_supported_kafka_size_bytes_value_item.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go index b427ad8fa..8a4516e09 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_values.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go index 4d06459af..55f8cfdda 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go index 73e3cac7e..c893ab641 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/model_version_metadata_all_of.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/response.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/response.go index 7b7b77903..06c631433 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/response.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/response.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go index 329949fb6..0582f1275 100644 --- a/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go +++ b/vendor/github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client/utils.go @@ -3,7 +3,7 @@ * * Kafka Management API is a REST API to manage Kafka instances * - * API version: 1.14.0 + * API version: 1.15.0 * Contact: rhosak-support@redhat.com */ diff --git a/vendor/modules.txt b/vendor/modules.txt index 76510f5c7..78f207fe0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -321,7 +321,7 @@ github.com/redhat-developer/app-services-sdk-go/connectormgmt/apiv1/error ## explicit; go 1.15 github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1 github.com/redhat-developer/app-services-sdk-go/kafkainstance/apiv1/client -# github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.17.0 +# github.com/redhat-developer/app-services-sdk-go/kafkamgmt v0.19.0 ## explicit; go 1.15 github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1 github.com/redhat-developer/app-services-sdk-go/kafkamgmt/apiv1/client