Merge pull request #2322 from vprashar2929/chore-skip-exp-val

chore: add experimental config validation skip option

Author: Sunil Thaha

.github/workflows/profiling.yaml

@@ -41,8 +41,10 @@ jobs:
           go-version-file: go.mod
           cache: false
 
+      # NOTE: Using a specific SHA of pprof as
+      # the latest version of pprof requires Go 1.24 or later
       - name: Install pprof
-        run: go install github.com/google/pprof@latest
+        run: go install github.com/google/pprof@6e76a2b096b5fa52e4bb3f7f7a357bd6e6b3b7b1
 
       - name: Run Docker Compose services
         shell: bash
@@ -130,8 +132,10 @@ jobs:
           go-version-file: go.mod
           cache: false
 
+      # NOTE: Using a specific SHA of pprof as
+      # the latest version of pprof requires Go 1.24 or later
       - name: Install pprof
-        run: go install github.com/google/pprof@latest
+        run: go install github.com/google/pprof@6e76a2b096b5fa52e4bb3f7f7a357bd6e6b3b7b1
 
       - name: Download profiling artifacts
         uses: actions/download-artifact@v5

config/config.go

@@ -189,8 +189,8 @@ func (m *MetricsLevelValue) IsCumulative() bool {
 type SkipValidation int
 
 const (
-	SkipHostValidation SkipValidation = 1
-	SkipKubeValidation SkipValidation = 2
+	SkipHostValidation         SkipValidation = 1
+	SkipExperimentalValidation SkipValidation = 2
 )
 
 const (
@@ -702,7 +702,7 @@ func (c *Config) Validate(skips ...SkipValidation) error {
 		}
 	}
 	// Experimental Platform validation
-	if experimentalErrs := c.validateExperimentalConfig(); len(experimentalErrs) > 0 {
+	if experimentalErrs := c.validateExperimentalConfig(validationSkipped); len(experimentalErrs) > 0 {
 		errs = append(errs, experimentalErrs...)
 	}
 
@@ -714,19 +714,21 @@ func (c *Config) Validate(skips ...SkipValidation) error {
 }
 
 // validateExperimentalConfig validates experimental configuration settings
-func (c *Config) validateExperimentalConfig() []string {
-	if !c.experimentalFeatureEnabled() {
+func (c *Config) validateExperimentalConfig(validationSkipped map[SkipValidation]bool) []string {
+	if !c.experimentalFeatureEnabled() || validationSkipped[SkipExperimentalValidation] {
 		return nil
 	}
 
 	var errs []string
 
-	if c.IsFeatureEnabled(ExperimentalRedfishFeature) {
-		if c.Experimental.Platform.Redfish.ConfigFile == "" {
-			errs = append(errs, fmt.Sprintf("%s not supplied but %s set to true", ExperimentalPlatformRedfishConfigFlag, ExperimentalPlatformRedfishEnabledFlag))
-		} else {
-			if err := canReadFile(c.Experimental.Platform.Redfish.ConfigFile); err != nil {
-				errs = append(errs, fmt.Sprintf("unreadable Redfish config file: %s: %s", c.Experimental.Platform.Redfish.ConfigFile, err.Error()))
+	{ // Validate experimental settings
+		if c.IsFeatureEnabled(ExperimentalRedfishFeature) {
+			if c.Experimental.Platform.Redfish.ConfigFile == "" {
+				errs = append(errs, fmt.Sprintf("%s not supplied but %s set to true", ExperimentalPlatformRedfishConfigFlag, ExperimentalPlatformRedfishEnabledFlag))
+			} else {
+				if err := canReadFile(c.Experimental.Platform.Redfish.ConfigFile); err != nil {
+					errs = append(errs, fmt.Sprintf("unreadable Redfish config file: %s: %s", c.Experimental.Platform.Redfish.ConfigFile, err.Error()))
+				}
 			}
 		}
 	}

config/config_test.go

@@ -590,6 +590,21 @@ func TestValidateWithSkip(t *testing.T) {
 	// Validate with skipping host validation
 	err := cfg.Validate(SkipHostValidation)
 	assert.NoError(t, err, "Should pass when SkipHostValidation is provided")
+
+	// Create a config with invalid experimental config
+	cfg = DefaultConfig()
+	cfg.Experimental = &Experimental{
+		Platform: Platform{
+			Redfish: Redfish{
+				Enabled:    ptr.To(true),
+				ConfigFile: "/path/invalid",
+			},
+		},
+	}
+
+	// Validate with skipping experimental validation
+	err = cfg.Validate(SkipExperimentalValidation)
+	assert.NoError(t, err, "Should pass when SkipExperimentalValidation is provided")
 }
 
 func TestMonitorConfig(t *testing.T) {
@@ -2355,7 +2370,7 @@ func TestValidateExperimentalConfig(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			errors := tc.config.validateExperimentalConfig()
+			errors := tc.config.validateExperimentalConfig(nil)
 
 			if tc.expectedErrors == nil {
 				assert.Empty(t, errors)