Refactor => Change Allowed Methods property to View Only and send into ContextInfo

Author: EduJGURJC

deploy/docker-compose-main.yml

@@ -66,7 +66,7 @@ services:
             - ET_ENABLE_CLOUD_MODE=false
             - ET_EPM_K8S_MASTER=localhost
             - ET_EPM_K8S_TOKEN=none
-            - ET_ETM_ALLOWED_METHODS=*
+            - ET_ETM_VIEW_ONLY=false
         entrypoint: /run.sh
         expose:
             - 8091

docker/docker-compose-main.yml

@@ -63,7 +63,7 @@ services:
             - ET_ENABLE_CLOUD_MODE=false
             - ET_EPM_K8S_MASTER=localhost
             - ET_EPM_K8S_TOKEN=none
-            - ET_ETM_ALLOWED_METHODS=*
+            - ET_ETM_VIEW_ONLY=false
         entrypoint: /run.sh
         expose:
             - 8091

elastest-torm-gui/src/app/elastest-etm/etm-monitoring-view/etm-chart-group/etm-chart-group.component.ts

@@ -657,7 +657,6 @@ export class EtmChartGroupComponent implements OnInit, AfterViewInit, AfterViewC
 
   removeAndUnsubscribe(metric: ESRabComplexMetricsModel): void {
     if (metric) {
-      console.log(metric);
       this.removeAndUnsubscribeByNameAndList(metric.name, metric.isCombinedPair ? this.combinedPairChartsList : this.chartsList);
     }
   }

elastest-torm/src/main/java/io/elastest/etm/config/WebRequestFilter.java

@@ -23,15 +23,15 @@
 public class WebRequestFilter implements Filter {
     final Logger logger = getLogger(lookup().lookupClass());
 
-    @Value("${et.etm.allowed.methods}")
-    public String allowedMethods;
+    @Value("${et.etm.view.only}")
+    public Boolean etEtmViewOnly;
 
     List<String> allowedMethodsList = Arrays.asList("*");
 
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
-        if (allowedMethods != null && !"".equals(allowedMethods)) {
-            allowedMethodsList = Arrays.asList(allowedMethods.split(","));
+        if (etEtmViewOnly != null && etEtmViewOnly) {
+            allowedMethodsList = Arrays.asList("GET");
         }
         logger.info("Allowed Methods: {}", Arrays.asList(allowedMethodsList));
     }

elastest-torm/src/main/java/io/elastest/etm/model/ContextInfo.java

@@ -91,6 +91,9 @@ public class ContextInfo {
     @JsonProperty("isKubernetes")
     private boolean isKubernetes;
 
+    @JsonProperty("etmViewOnly")
+    private boolean etmViewOnly;
+
     public ContextInfo() {
     }
 
@@ -322,6 +325,14 @@ public void setIsKubernetes(boolean isKubernetes) {
         this.isKubernetes = isKubernetes;
     }
 
+    public boolean isEtmViewOnly() {
+        return etmViewOnly;
+    }
+
+    public void setEtmViewOnly(boolean etmViewOnly) {
+        this.etmViewOnly = etmViewOnly;
+    }
+
     @Override
     public String toString() {
         return "ContextInfo [elasticSearchUrl=" + elasticSearchUrl
@@ -347,7 +358,8 @@ public String toString() {
                 + ", eusSSInstance=" + eusSSInstance + ", testLinkStarted="
                 + testLinkStarted + ", empGrafanaUrl=" + empGrafanaUrl
                 + ", edmCommandUrl=" + edmCommandUrl + ", etmApiUrl="
-                + etmApiUrl + ", isKubernetes=" + isKubernetes + "]";
+                + etmApiUrl + ", isKubernetes=" + isKubernetes
+                + ", etmViewOnly=" + etmViewOnly + "]";
     }
 
 }

elastest-torm/src/main/java/io/elastest/etm/service/EtmContextAuxService.java

@@ -100,6 +100,9 @@ public class EtmContextAuxService {
     @Value("${et.edm.command.context-path}")
     private String etEdmCommandContextPath;
 
+    @Value("${et.etm.view.only}")
+    public Boolean etEtmViewOnly;
+
     private UtilsService utilsService;
     private ContextInfo contextInfo;
     private PlatformService platformService;
@@ -203,6 +206,9 @@ private ContextInfo createContextInfo() {
         contextInfo
                 .setEtmApiUrl("http://" + proxyIp + ":" + proxyPort + "/api/");
         contextInfo.setIsKubernetes(utilsService.isKubernetes());
+
+        contextInfo
+                .setEtmViewOnly(etEtmViewOnly != null ? etEtmViewOnly : false);
         return contextInfo;
     }
 

elastest-torm/src/main/resources/application.properties

@@ -8,7 +8,7 @@ et.user=none
 et.pass=none
 et.enable.cloud.mode=false
 
-et.etm.allowed.methods=*
+et.etm.view.only=false
 
 docker.port=2376