Merge pull request #587 from boozallen/141-fix-s3-local-suppressed-manual-action

#141 enable default s3-local deploy template value

Author: csun-cpointe

foundation/foundation-mda/src/main/java/com/boozallen/aiops/mda/generator/KubernetesGenerator.java

@@ -122,7 +122,6 @@ public class KubernetesGenerator extends AbstractKubernetesGenerator {
      * | lineageHttpConsumerValuesFile                 | deployment/lineage-http-consumer/v2/lineage.http.consumer.values.yaml.vm                  | apps/${appName}/values.yaml                                                |
      * | s3LocalChartFileV2                            | deployment/localstack/localstack.chart.yaml.vm                                            | apps/${appName}/Chart.yaml                                                 |
      * | s3LocalValuesDevFileV2                        | deployment/localstack/localstack.values.dev.yaml.vm                                       | apps/${appName}/values-dev.yaml                                            |
-     * | s3LocalValuesFileV2                           | deployment/localstack/localstack.values.yaml.vm                                           | apps/${appName}/values.yaml                                                |
      * | metadataValuesDevFile                         | deployment/metadata/metadata.values-dev.yaml.vm                                           | apps/${appName}/values-dev.yaml                                            |
      * | metadataValuesFile                            | deployment/metadata/metadata.values.yaml.vm                                               | apps/${appName}/values.yaml                                                |
      * | metadataHelmChartFileV2                       | deployment/metadata/v2/metadata.chart.yaml.vm                                             | apps/${appName}/Chart.yaml                                                 |

foundation/foundation-mda/src/main/java/com/boozallen/aiops/mda/generator/S3LocalValuesKubernetesGenerator.java

@@ -0,0 +1,51 @@
+package com.boozallen.aiops.mda.generator;
+
+/*-
+ * #%L
+ * AIOps Foundation::AIOps MDA
+ * %%
+ * Copyright (C) 2021 Booz Allen
+ * %%
+ * This software package is licensed under the Booz Allen Public License. All Rights Reserved.
+ * #L%
+ */
+
+import com.boozallen.aiops.mda.generator.common.PipelineEnum;
+import com.boozallen.aiops.mda.generator.common.VelocityProperty;
+import com.boozallen.aiops.mda.metamodel.AissembleModelInstanceRepository;
+import com.boozallen.aiops.mda.metamodel.element.Pipeline;
+import com.boozallen.aiops.mda.metamodel.element.python.MachineLearningPipeline;
+import org.apache.velocity.VelocityContext;
+import org.technologybrewery.fermenter.mda.generator.GenerationContext;
+
+import java.util.Map;
+
+public class S3LocalValuesKubernetesGenerator extends AbstractKubernetesGenerator {
+    /*--~-~-~~
+     * Usages:
+     * | Target               | Template                                         | Generated File               |
+     * |----------------------|--------------------------------------------------|------------------------------|
+     * | s3LocalValuesFileV2  | deployment/localstack/localstack.values.yaml.vm  | apps/${appName}/values.yaml  |
+     */
+
+    @Override
+    public void generate(GenerationContext context) {
+        VelocityContext vc = this.configureWithoutGeneration(context);
+        AissembleModelInstanceRepository metamodelRepository = (AissembleModelInstanceRepository) context.getModelInstanceRepository();
+        Map<String, Pipeline> pipelineMap = metamodelRepository.getPipelinesByContext(metadataContext);
+        for (Pipeline pipeline: pipelineMap.values()) {
+            String pipelineType = pipeline.getType().getName();
+            if (PipelineEnum.DATA_FLOW.equalsIgnoreCase(pipelineType)) {
+                // pyspark/spark pipelines
+                vc.put(VelocityProperty.DATAFLOW_PIPELINES, true);
+            } else if (PipelineEnum.MACHINE_LEARNING.equalsIgnoreCase(pipelineType)) {
+                // training/inference pipelines
+                vc.put(VelocityProperty.MACHINE_LEARNING_PIPELINES, true);
+            }
+        }
+
+
+        generateFile(context, vc);
+    }
+
+}

foundation/foundation-mda/src/main/java/com/boozallen/aiops/mda/generator/common/VelocityProperty.java

@@ -22,6 +22,7 @@ public final class VelocityProperty {
     public static final String SPARK_PIPELINES = "sparkPipelines";
     public static final String PYSPARK_PIPELINES = "pysparkPipelines";
     public static final String DATAFLOW_PIPELINES = "dataFlowPipelines";
+    public static final String MACHINE_LEARNING_PIPELINES = "machineLearningPipelines";
     public static final String TRAINING_PIPELINE = "trainingPipeline";
     public static final String TRAINING_PIPELINES = "trainingPipelines";
     public static final String INFERENCE_PIPELINE = "inferencePipeline";

foundation/foundation-mda/src/main/resources/targets.json

@@ -2929,7 +2929,7 @@
     "name": "s3LocalValuesFileV2",
     "templateName": "templates/deployment/localstack/localstack.values.yaml.vm",
     "outputFile": "apps/${appName}/values.yaml",
-    "generator": "com.boozallen.aiops.mda.generator.KubernetesGenerator",
+    "generator": "com.boozallen.aiops.mda.generator.S3LocalValuesKubernetesGenerator",
     "metadataContext": "targeted",
     "overwritable": false
   },

foundation/foundation-mda/src/main/resources/templates/deployment/localstack/localstack.values.yaml.vm

@@ -5,4 +5,14 @@
 ################################################################################]]##
 
 aissemble-localstack-chart:
-  buckets: []
+  buckets:
+  #if (${dataFlowPipelines})
+    - name: spark-infrastructure
+      keys:
+      - warehouse/
+  #end
+  #if (${machineLearningPipelines})
+    - name: mlflow-models
+      keys:
+      - mlflow-storage/
+  #end

foundation/foundation-mda/src/main/resources/templates/notifications/notification.s3.local.buckets.vm

@@ -1,6 +1,6 @@
 
 In ${rootPath}:
-Remove the empty "[]" from "buckets: []" and include the following content to the list:
+Append the following content to the bucket list:
 
     - name: ${bucketName}
       keys: