From a5b582a795cdf1e17d1edb5d60999131bb3468e4 Mon Sep 17 00:00:00 2001 From: Eran Ifrach Date: Tue, 19 Mar 2024 15:28:01 +0200 Subject: [PATCH] fix review suggestions --- client/installer/get_supported_features_parameters.go | 2 +- internal/featuresupport/features_networking.go | 4 ++-- restapi/embedded_spec.go | 4 ++-- .../operations/installer/get_supported_features_parameters.go | 2 +- swagger.yaml | 2 +- .../client/installer/get_supported_features_parameters.go | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/installer/get_supported_features_parameters.go b/client/installer/get_supported_features_parameters.go index 567622039af..5b8be5c5cec 100644 --- a/client/installer/get_supported_features_parameters.go +++ b/client/installer/get_supported_features_parameters.go @@ -77,7 +77,7 @@ type GetSupportedFeaturesParams struct { /* HighAvailabilityMode. - Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a full cluster over one node. + Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a cluster over one node. */ HighAvailabilityMode *string diff --git a/internal/featuresupport/features_networking.go b/internal/featuresupport/features_networking.go index cb51891cb24..24a51bcc7c8 100644 --- a/internal/featuresupport/features_networking.go +++ b/internal/featuresupport/features_networking.go @@ -7,7 +7,7 @@ import ( "github.com/openshift/assisted-service/internal/common" "github.com/openshift/assisted-service/internal/network" "github.com/openshift/assisted-service/models" - "k8s.io/utils/strings/slices" + "github.com/thoas/go-funk" ) // VipAutoAllocFeature @@ -30,7 +30,7 @@ func (feature *VipAutoAllocFeature) getSupportLevel(filters SupportLevelFilters) string(models.PlatformTypeExternal), string(models.PlatformTypeNone), } - if filters.PlatformType != nil && slices.Contains( + if filters.PlatformType != nil && funk.Contains( unavailablePlatform, string(*filters.PlatformType)) { return models.SupportLevelUnavailable } diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go index 2e2353ba091..3c9a0befd47 100644 --- a/restapi/embedded_spec.go +++ b/restapi/embedded_spec.go @@ -5852,7 +5852,7 @@ func init() { "None" ], "type": "string", - "description": "Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a full cluster over one node.", + "description": "Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a cluster over one node.", "name": "high_availability_mode", "in": "query" } @@ -16515,7 +16515,7 @@ func init() { "None" ], "type": "string", - "description": "Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a full cluster over one node.", + "description": "Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a cluster over one node.", "name": "high_availability_mode", "in": "query" } diff --git a/restapi/operations/installer/get_supported_features_parameters.go b/restapi/operations/installer/get_supported_features_parameters.go index ebef7ca8b05..6742db619af 100644 --- a/restapi/operations/installer/get_supported_features_parameters.go +++ b/restapi/operations/installer/get_supported_features_parameters.go @@ -48,7 +48,7 @@ type GetSupportedFeaturesParams struct { In: query */ ExternalPlatformName *string - /*Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a full cluster over one node. + /*Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a cluster over one node. In: query */ HighAvailabilityMode *string diff --git a/swagger.yaml b/swagger.yaml index 1d85703ac8c..11185a12b43 100644 --- a/swagger.yaml +++ b/swagger.yaml @@ -3715,7 +3715,7 @@ paths: name: high_availability_mode type: string enum: [ 'Full', 'None' ] - description: Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a full cluster over one node. + description: Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a cluster over one node. responses: "200": description: Success. diff --git a/vendor/github.com/openshift/assisted-service/client/installer/get_supported_features_parameters.go b/vendor/github.com/openshift/assisted-service/client/installer/get_supported_features_parameters.go index 567622039af..5b8be5c5cec 100644 --- a/vendor/github.com/openshift/assisted-service/client/installer/get_supported_features_parameters.go +++ b/vendor/github.com/openshift/assisted-service/client/installer/get_supported_features_parameters.go @@ -77,7 +77,7 @@ type GetSupportedFeaturesParams struct { /* HighAvailabilityMode. - Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a full cluster over one node. + Guaranteed availability of the installed cluster. 'Full' installs a Highly-Available cluster over multiple master nodes whereas 'None' installs a cluster over one node. */ HighAvailabilityMode *string