fix(adm-upgrade-recommend-alerts): extend mockData to include featureGates's and infrastructure's

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

fix(adm-upgrade-recommend-alerts): add test for different featureGate version

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

add comma

Signed-off-by: Nick Bottari <nbottari9@gmail.com>

Author: nbottari9

pkg/cli/admin/upgrade/recommend/alerts.go

@@ -265,19 +265,30 @@ func (o *options) alerts(ctx context.Context) ([]acceptableCondition, error) {
 
 // alertsEvaluatedByCVO makes API calls to determine if we need to do client-side alert checking
 func (o *options) alertsEvaluatedByCVO(ctx context.Context) (bool, error) {
-	featureGates, err := o.Client.ConfigV1().FeatureGates().Get(ctx, "cluster", metav1.GetOptions{})
-	if err != nil {
-		return false, err
-	}
+	var featureGates *configv1.FeatureGate
+	var infrastructure *configv1.Infrastructure
+	var cv *configv1.ClusterVersion
+
+	if o.mockData.cvPath != "" {
+		featureGates = o.mockData.featureGate
+		infrastructure = o.mockData.infrastructure
+		cv = o.mockData.clusterVersion
+	} else {
+		var err error
+		featureGates, err = o.Client.ConfigV1().FeatureGates().Get(ctx, "cluster", metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
 
-	infrastructure, err := o.Client.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
-	if err != nil {
-		return false, err
-	}
+		infrastructure, err = o.Client.ConfigV1().Infrastructures().Get(ctx, "cluster", metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
 
-	cv, err := o.Client.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
-	if err != nil {
-		return false, err
+		cv, err = o.Client.ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
 	}
 
 	// if the AcceptRisks feature gate AND hypershift is not enabled,

pkg/cli/admin/upgrade/recommend/alerts_test.go

@@ -69,6 +69,24 @@ func TestIsAcceptRisksEnabled(t *testing.T) {
 			},
 			expected: false,
 		},
+		{
+			name: "ClusterUpdateAcceptRisks feature gate is enabled for a different cluster version",
+			featureGateConfig: &configv1.FeatureGate{
+				Status: configv1.FeatureGateStatus{
+					FeatureGates: []configv1.FeatureGateDetails{
+						{
+							Version: "4.21.0",
+							Enabled: []configv1.FeatureGateAttributes{
+								{
+									Name: features.FeatureGateClusterUpdateAcceptRisks,
+								},
+							},
+						},
+					},
+				},
+			},
+			expected: false,
+		},
 	} {
 		t.Run(testCase.name, func(t *testing.T) {
 			actual := isAcceptRisksEnabled(testCase.featureGateConfig, "4.22.0")

pkg/cli/admin/upgrade/recommend/mockresources.go

@@ -13,12 +13,16 @@ import (
 
 type mockData struct {
 	// inputs
-	cvPath     string
-	alertsPath string
+	cvPath             string
+	alertsPath         string
+	featureGatePath    string
+	infrastructurePath string
 
 	// outputs
 	clusterVersion *configv1.ClusterVersion
 	alerts         []byte
+	featureGate    *configv1.FeatureGate
+	infrastructure *configv1.Infrastructure
 }
 
 func asResourceList[T any](objects *corev1.List, decoder runtime.Decoder) ([]T, error) {
@@ -78,5 +82,41 @@ func (o *mockData) load() error {
 		}
 	}
 
+	if o.featureGatePath != "" {
+		fgBytes, err := os.ReadFile(o.featureGatePath)
+		if err != nil && !errors.Is(err, os.ErrNotExist) {
+			return err
+		}
+		if fgBytes != nil {
+			fgObj, err := runtime.Decode(decoder, fgBytes)
+			if err != nil {
+				return fmt.Errorf("error while parsing file %s: %w", o.featureGatePath, err)
+			}
+			fg, ok := fgObj.(*configv1.FeatureGate)
+			if !ok {
+				return fmt.Errorf("unexpected object type %T in %s content", fgObj, o.featureGatePath)
+			}
+			o.featureGate = fg
+		}
+	}
+
+	if o.infrastructurePath != "" {
+		infraBytes, err := os.ReadFile(o.infrastructurePath)
+		if err != nil && !errors.Is(err, os.ErrNotExist) {
+			return err
+		}
+		if infraBytes != nil {
+			infraObj, err := runtime.Decode(decoder, infraBytes)
+			if err != nil {
+				return fmt.Errorf("error while parsing file %s: %w", o.infrastructurePath, err)
+			}
+			infra, ok := infraObj.(*configv1.Infrastructure)
+			if !ok {
+				return fmt.Errorf("unexpected object type %T in %s content", infraObj, o.infrastructurePath)
+			}
+			o.infrastructure = infra
+		}
+	}
+
 	return nil
 }

pkg/cli/admin/upgrade/recommend/recommend.go

@@ -111,6 +111,8 @@ func (o *options) Complete(f kcmdutil.Factory, cmd *cobra.Command, args []string
 	} else {
 		cvSuffix := "-cv.yaml"
 		o.mockData.alertsPath = strings.Replace(o.mockData.cvPath, cvSuffix, "-alerts.json", 1)
+		o.mockData.featureGatePath = strings.Replace(o.mockData.cvPath, cvSuffix, "-featuregate.yaml", 1)
+		o.mockData.infrastructurePath = strings.Replace(o.mockData.cvPath, cvSuffix, "-infrastructure.yaml", 1)
 		err := o.mockData.load()
 		if err != nil {
 			return err