fix(pipelineTemplates): throw exception when not supported (spinnaker#294)

Author: emjburns

front50-web/src/main/groovy/com/netflix/spinnaker/front50/controllers/IntentController.java

@@ -17,59 +17,57 @@
 package com.netflix.spinnaker.front50.controllers;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.netflix.spinnaker.front50.exception.BadRequestException;
 import com.netflix.spinnaker.front50.exception.NotFoundException;
 import com.netflix.spinnaker.front50.exceptions.DuplicateEntityException;
-import com.netflix.spinnaker.front50.exceptions.InvalidRequestException;
 import com.netflix.spinnaker.front50.model.intent.Intent;
 import com.netflix.spinnaker.front50.model.intent.IntentDAO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 @RestController
-@ConditionalOnBean(IntentDAO.class)
 @RequestMapping("intents")
 public class IntentController {
 
-  @Autowired
-  IntentDAO intentDAO;
+  @Autowired(required = false)
+  IntentDAO intentDAO = null;
 
   @Autowired
   ObjectMapper objectMapper;
 
   @RequestMapping(value = "", method = RequestMethod.GET)
   List<Intent> list(@RequestParam(required = false, value = "status") List<String> status) {
-    return (List<Intent>) intentDAO.getIntentsByStatus(status);
+    return (List<Intent>) getIntentDAO().getIntentsByStatus(status);
   }
 
   @RequestMapping(value = "{id}", method = RequestMethod.GET)
   Intent get(@PathVariable String id) {
-    return intentDAO.findById(id.toLowerCase());
+    return getIntentDAO().findById(id.toLowerCase());
   }
 
   @RequestMapping(value = "", method = RequestMethod.POST)
   Intent upsert(@RequestBody Intent intent) {
     intent.setLastModified(System.currentTimeMillis());
 
     if (intentExists(intent.getId())){
-      intentDAO.update(intent.getId(), intent);
+      getIntentDAO().update(intent.getId(), intent);
     } else {
-      intentDAO.create(intent.getId(), intent);
+      getIntentDAO().create(intent.getId(), intent);
     }
 
-    return intentDAO.findById(intent.getId());
+    return getIntentDAO().findById(intent.getId());
   }
 
   @RequestMapping(value = "{id}", method = RequestMethod.DELETE)
   void delete(@PathVariable String id) {
-    intentDAO.delete(id.toLowerCase());
+    getIntentDAO().delete(id.toLowerCase());
   }
 
   private void checkForDuplicateIntents(String id) {
     try {
-      intentDAO.findById(id.toLowerCase());
+      getIntentDAO().findById(id.toLowerCase());
     } catch (NotFoundException e) {
       return;
     }
@@ -78,10 +76,17 @@ private void checkForDuplicateIntents(String id) {
 
   private boolean intentExists(String id) {
     try {
-      intentDAO.findById(id.toLowerCase());
+      getIntentDAO().findById(id.toLowerCase());
     } catch (NotFoundException e) {
       return false;
     }
     return true;
   }
+
+  private IntentDAO getIntentDAO() {
+    if (intentDAO == null) {
+      throw new BadRequestException("Intents are not supported with your current storage backend");
+    }
+    return intentDAO;
+  }
 }

front50-web/src/main/groovy/com/netflix/spinnaker/front50/controllers/PipelineTemplateController.java

@@ -27,7 +27,6 @@
 import com.netflix.spinnaker.front50.model.pipeline.PipelineTemplateDAO;
 import com.netflix.spinnaker.front50.model.pipeline.TemplateConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,12 +41,11 @@
 import java.util.stream.Collectors;
 
 @RestController
-@ConditionalOnBean(PipelineTemplateDAO.class)
 @RequestMapping("pipelineTemplates")
 public class PipelineTemplateController {
 
-  @Autowired
-  PipelineTemplateDAO pipelineTemplateDAO;
+  @Autowired(required = false)
+  PipelineTemplateDAO pipelineTemplateDAO = null;
 
   @Autowired
   PipelineDAO pipelineDAO;
@@ -59,29 +57,29 @@ public class PipelineTemplateController {
 
   @RequestMapping(value = "", method = RequestMethod.GET)
   List<PipelineTemplate> list(@RequestParam(required = false, value = "scopes") List<String> scopes) {
-    return (List<PipelineTemplate>) pipelineTemplateDAO.getPipelineTemplatesByScope(scopes);
+    return (List<PipelineTemplate>) getPipelineTemplateDAO().getPipelineTemplatesByScope(scopes);
   }
 
   @RequestMapping(value = "", method = RequestMethod.POST)
   void save(@RequestBody PipelineTemplate pipelineTemplate) {
     checkForDuplicatePipelineTemplate(pipelineTemplate.getId());
-    pipelineTemplateDAO.create(pipelineTemplate.getId(), pipelineTemplate);
+    getPipelineTemplateDAO().create(pipelineTemplate.getId(), pipelineTemplate);
   }
 
   @RequestMapping(value = "{id}", method = RequestMethod.GET)
   PipelineTemplate get(@PathVariable String id) {
-    return pipelineTemplateDAO.findById(id);
+    return getPipelineTemplateDAO().findById(id);
   }
 
   @RequestMapping(value = "{id}", method = RequestMethod.PUT)
   PipelineTemplate update(@PathVariable String id, @RequestBody PipelineTemplate pipelineTemplate) {
-    PipelineTemplate existingPipelineTemplate = pipelineTemplateDAO.findById(id);
+    PipelineTemplate existingPipelineTemplate = getPipelineTemplateDAO().findById(id);
     if (!pipelineTemplate.getId().equals(existingPipelineTemplate.getId())) {
       throw new InvalidRequestException("The provided id " + id + " doesn't match the pipeline template id " + pipelineTemplate.getId());
     }
 
     pipelineTemplate.setLastModified(System.currentTimeMillis());
-    pipelineTemplateDAO.update(id, pipelineTemplate);
+    getPipelineTemplateDAO().update(id, pipelineTemplate);
 
     return pipelineTemplate;
   }
@@ -90,7 +88,7 @@ PipelineTemplate update(@PathVariable String id, @RequestBody PipelineTemplate p
   void delete(@PathVariable String id) {
     checkForDependentConfigs(id, true);
     checkForDependentTemplates(id);
-    pipelineTemplateDAO.delete(id);
+    getPipelineTemplateDAO().delete(id);
   }
 
   @RequestMapping(value = "{id}/dependentPipelines", method = RequestMethod.GET)
@@ -164,7 +162,7 @@ void checkForDependentConfigs(String templateId, boolean recursive) {
   List<String> getDependentTemplates(String templateId, Optional<Collection<PipelineTemplate>> templates) {
     List<String> dependentTemplateIds = new ArrayList<>();
 
-    final Collection<PipelineTemplate> pipelineTemplates = templates.orElse(pipelineTemplateDAO.all());
+    final Collection<PipelineTemplate> pipelineTemplates = templates.orElse(getPipelineTemplateDAO().all());
     pipelineTemplates.forEach(template -> {
         if (template.getSource() != null
           && template.getSource().equalsIgnoreCase("spinnaker://" + templateId)) {
@@ -186,10 +184,17 @@ void checkForDependentTemplates(String templateId) {
 
   private void checkForDuplicatePipelineTemplate(String id) {
     try {
-      pipelineTemplateDAO.findById(id);
+      getPipelineTemplateDAO().findById(id);
     } catch (NotFoundException e) {
       return;
     }
     throw new DuplicateEntityException("A pipeline template with the id " + id + " already exists");
   }
+
+  private PipelineTemplateDAO getPipelineTemplateDAO() {
+    if (pipelineTemplateDAO == null) {
+      throw new BadRequestException("Pipeline Templates are not supported with your current storage backend");
+    }
+    return pipelineTemplateDAO;
+  }
 }