return err if deployment not found

equinor · Sep 4, 2024 · 23a15e4 · 23a15e4
1 parent 0fae6c2
commit 23a15e4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/api/environments/component_handler.go b/api/environments/component_handler.go
@@ -9,6 +9,7 @@ import (
 	environmentModels "github.com/equinor/radix-api/api/environments/models"
 	"github.com/equinor/radix-api/api/kubequery"
 	"github.com/equinor/radix-api/api/utils/labelselector"
+	"github.com/equinor/radix-common/net/http"
 	radixutils "github.com/equinor/radix-common/utils"
 	"github.com/equinor/radix-common/utils/pointers"
 	"github.com/equinor/radix-operator/pkg/apis/defaults"
@@ -112,6 +113,9 @@ func (eh EnvironmentHandler) RestartComponentAuxiliaryResource(ctx context.Conte
 	if err != nil {
 		return err
 	}
+	if radixDeployment == nil {
+		return http.ValidationError(v1.KindRadixDeployment, "no radix deployments found")
+	}
 
 	componentsDto, err := eh.deployHandler.GetComponentsForDeployment(ctx, appName, radixDeployment.Name, envName)
 	if err != nil {

diff --git a/api/environments/environment_handler.go b/api/environments/environment_handler.go
@@ -309,6 +309,9 @@ func (eh EnvironmentHandler) StopEnvironment(ctx context.Context, appName, envNa
 	if err != nil {
 		return err
 	}
+	if radixDeployment == nil {
+		return http.ValidationError(v1.KindRadixDeployment, "no radix deployments found")
+	}
 
 	log.Ctx(ctx).Info().Msgf("Stopping components in environment %s, %s", envName, appName)
 	for _, deployComponent := range radixDeployment.Spec.Components {
@@ -326,6 +329,9 @@ func (eh EnvironmentHandler) ResetManuallyStoppedComponentsInEnvironment(ctx con
 	if err != nil {
 		return err
 	}
+	if radixDeployment == nil {
+		return http.ValidationError(v1.KindRadixDeployment, "no radix deployments found")
+	}
 
 	log.Ctx(ctx).Info().Msgf("Starting components in environment %s, %s", envName, appName)
 	for _, deployComponent := range radixDeployment.Spec.Components {
@@ -344,6 +350,9 @@ func (eh EnvironmentHandler) RestartEnvironment(ctx context.Context, appName, en
 	if err != nil {
 		return err
 	}
+	if radixDeployment == nil {
+		return http.ValidationError(v1.KindRadixDeployment, "no radix deployments found")
+	}
 
 	log.Ctx(ctx).Info().Msgf("Restarting components in environment %s, %s", envName, appName)
 	for _, deployComponent := range radixDeployment.Spec.Components {