Validate runtimes fix 1.6 (#1330)

kyma-project · Dec 19, 2024 · c3fa9e5 · c3fa9e5
1 parent 122d80a
commit c3fa9e5
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 5 deletions.
diff --git a/components/buildless-serverless/api/v1alpha2/function_types.go b/components/buildless-serverless/api/v1alpha2/function_types.go
@@ -28,6 +28,7 @@ type Runtime string
 const (
 	Python312 Runtime = "python312"
 	NodeJs20  Runtime = "nodejs20"
+	NodeJs22  Runtime = "nodejs22"
 )
 
 // FunctionSpec defines the desired state of Function.

diff --git a/components/buildless-serverless/internal/controller/state/validate_function.go b/components/buildless-serverless/internal/controller/state/validate_function.go
@@ -4,18 +4,21 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
+	"strings"
+
 	serverlessv1alpha2 "github.com/kyma-project/serverless/api/v1alpha2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"strings"
 )
 
 func sFnValidateFunction(_ context.Context, m *stateMachine) (stateFn, *ctrl.Result, error) {
 	v := NewFunctionValidator(&m.state.instance)
 	validationFns := []func() []string{
 		v.validateEnvs,
 		v.validateInlineDeps,
+		v.validateRuntime,
 		//TODO: add more validation functions
 	}
 
@@ -72,6 +75,17 @@ func (v *functionValidator) validateInlineDeps() []string {
 	return []string{}
 }
 
+func (v *functionValidator) validateRuntime() []string {
+	runtime := v.instance.Spec.Runtime
+
+	if err := validateRuntime(runtime); err != nil {
+		return []string{
+			fmt.Sprintf("invalid runtime value: %s", err.Error()),
+		}
+	}
+	return []string{}
+}
+
 func validateDependencies(runtime serverlessv1alpha2.Runtime, dependencies string) error {
 	switch runtime {
 	case serverlessv1alpha2.NodeJs20:
@@ -89,6 +103,17 @@ func validateNodeJSDependencies(dependencies string) error {
 	return nil
 }
 
+func validateRuntime(runtime serverlessv1alpha2.Runtime) error {
+	if len(runtime) == 0 {
+		return nil
+	}
+	supportedruntimes := []serverlessv1alpha2.Runtime{serverlessv1alpha2.NodeJs20, serverlessv1alpha2.NodeJs22, serverlessv1alpha2.Python312}
+	if slices.Contains(supportedruntimes, runtime) {
+		return nil
+	}
+	return fmt.Errorf("cannot find runtime: %s", runtime)
+}
+
 func enrichErrors(errs []string, path string, value string) []string {
 	enrichedErrs := []string{}
 	for _, err := range errs {

diff --git a/components/serverless/internal/controllers/serverless/validation.go b/components/serverless/internal/controllers/serverless/validation.go
@@ -3,6 +3,8 @@ package serverless
 import (
 	"context"
 	"fmt"
+	"strings"
+
 	serverlessv1alpha2 "github.com/kyma-project/serverless/components/serverless/pkg/apis/serverless/v1alpha2"
 	corev1 "k8s.io/api/core/v1"
 	resource "k8s.io/apimachinery/pkg/api/resource"
@@ -12,7 +14,6 @@ import (
 	utilvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"strings"
 )
 
 var _ stateFn = stateFnValidateFunction
@@ -28,6 +29,7 @@ func stateFnValidateFunction(_ context.Context, r *reconciler, s *systemState) (
 
 	spec := s.instance.Spec
 	validationFns := []validationFn{
+		validateRuntime(spec.Runtime),
 		validateFunctionResources,
 		validateBuildResources,
 		validateEnvs(spec.Env, "spec.env"),
@@ -142,6 +144,17 @@ func validateInlineDeps(runtime serverlessv1alpha2.Runtime, inlineSource *server
 	}
 }
 
+func validateRuntime(runtime serverlessv1alpha2.Runtime) validationFn {
+	return func() []string {
+		if err := serverlessv1alpha2.ValidateRuntime(runtime); err != nil {
+			return []string{
+				fmt.Sprintf("invalid runtime value: %s", err.Error()),
+			}
+		}
+		return []string{}
+	}
+}
+
 func validateFunctionLabels(labels map[string]string, path string) validationFn {
 	return func() []string {
 		errs := field.ErrorList{}

diff --git a/components/serverless/internal/controllers/serverless/validation_test.go b/components/serverless/internal/controllers/serverless/validation_test.go
@@ -432,6 +432,15 @@ func TestValidation_Invalid(t *testing.T) {
 			},
 			expectedCondMsg: "source.gitRepository.URL: parse \"[email protected]:kyma-project/kyma.git\": invalid URI for request",
 		},
+		"Invalid runtime": {
+			fn: serverlessv1alpha2.Function{
+				ObjectMeta: metav1.ObjectMeta{GenerateName: "test-fn"},
+				Spec: serverlessv1alpha2.FunctionSpec{
+					Runtime: "foo",
+				},
+			},
+			expectedCondMsg: "invalid runtime value: cannot find runtime: foo",
+		},
 	}
 
 	//WHEN

diff --git a/components/serverless/pkg/apis/serverless/v1alpha2/runtime_validation.go b/components/serverless/pkg/apis/serverless/v1alpha2/runtime_validation.go
@@ -3,6 +3,7 @@ package v1alpha2
 import (
 	"errors"
 	"fmt"
+	"slices"
 	"strings"
 )
 
@@ -13,7 +14,7 @@ func ValidateDependencies(runtime Runtime, dependencies string) error {
 	case Python312:
 		return nil
 	}
-	return fmt.Errorf("cannot find runtime: %s", runtime)
+	return nil
 }
 
 func validateNodeJSDependencies(dependencies string) error {
@@ -22,3 +23,14 @@ func validateNodeJSDependencies(dependencies string) error {
 	}
 	return nil
 }
+
+func ValidateRuntime(runtime Runtime) error {
+	if len(runtime) == 0 {
+		return nil
+	}
+	supportedruntimes := []Runtime{NodeJs20, NodeJs22, Python312}
+	if slices.Contains(supportedruntimes, runtime) {
+		return nil
+	}
+	return fmt.Errorf("cannot find runtime: %s", runtime)
+}
diff --git a/config/serverless/templates/busola-serverless-extension.yaml b/config/serverless/templates/busola-serverless-extension.yaml
@@ -34,6 +34,7 @@ data:
           warning:
             - BUILDING
             - PENDING
+            - WARNING
           critical:
             - FAILED
             - ERROR
@@ -42,7 +43,7 @@ data:
           $count($.status.conditions) = 0) ? 'INITIALIZING' :
           $count($filter($.status.conditions, function($v) { $v.status = 'False' }))
           != 0 ? $count($filter($.status.conditions, function($v) { $v.type =
-          'Running' and $v.status = 'True' })) != 0 ? 'ERROR' : 'FAILED' :
+          'Running' and $v.status = 'True' })) != 0 ? 'WARNING' : 'FAILED' :
           $count($filter($.status.conditions, function($v) { $v.type =
           'ConfigurationReady' and $v.status = 'True' })) != 0 ?
           $count($filter($.status.conditions, function($v) { $v.type = 'BuildReady'
@@ -485,6 +486,7 @@ data:
         warning:
           - BUILDING
           - PENDING
+          - WARNING
         critical:
           - FAILED
           - ERROR
@@ -493,7 +495,7 @@ data:
         $count($.status.conditions) = 0) ? 'INITIALIZING' :
         $count($filter($.status.conditions, function($v) { $v.status = 'False' }))
         != 0 ? $count($filter($.status.conditions, function($v) { $v.type =
-        'Running' and $v.status = 'True' })) != 0 ? 'ERROR' : 'FAILED' :
+        'Running' and $v.status = 'True' })) != 0 ? 'WARNING' : 'FAILED' :
         $count($filter($.status.conditions, function($v) { $v.type =
         'ConfigurationReady' and $v.status = 'True' })) != 0 ?
         $count($filter($.status.conditions, function($v) { $v.type = 'BuildReady'