From e2e71040679fc6f305f9cdbe0d9d38c701934dcd Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Mon, 19 Apr 2021 14:46:45 +0200
Subject: Fix Sonar Crypto issues

Fix this problem by removing the CryptoUtils that could be replaced by AAF cadi call (this was already in place in the code). The OOM sdc controller password will have to be modified as well.

Issue-ID: POLICY-3201
Issue-ID: POLICY-3200
Change-Id: I6dfd9abb691afb3548d4e68c8759351ad02a30da
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../resources/clds/sdc-controller-config-TLS.json  |  4 +-
 .../resources/clds/sdc-controllers-config.json     | 47 ++++++++++++----------
 2 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'src/test/resources/clds')

diff --git a/src/test/resources/clds/sdc-controller-config-TLS.json b/src/test/resources/clds/sdc-controller-config-TLS.json
index 99366b765..4d5f02945 100644
--- a/src/test/resources/clds/sdc-controller-config-TLS.json
+++ b/src/test/resources/clds/sdc-controller-config-TLS.json
@@ -4,11 +4,11 @@
         "consumerId": "consumerId",
         "environmentName": "environmentName",
         "sdcAddress": "hostname:8080",
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
+        "password": "QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
         "pollingInterval":10,
         "pollingTimeout":30,
         "activateServerTLSAuth": true,
-        "keyStorePassword":"bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
+        "keyStorePassword":"QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
         "keyStorePath": "/test",
         "messageBusAddresses":["localhost"]
 }
diff --git a/src/test/resources/clds/sdc-controllers-config.json b/src/test/resources/clds/sdc-controllers-config.json
index ce56fef27..75e5be1b9 100644
--- a/src/test/resources/clds/sdc-controllers-config.json
+++ b/src/test/resources/clds/sdc-controllers-config.json
@@ -1,27 +1,30 @@
 {
-  "sdc-connections":{
-    "sdc-controller1":{
-        "user": "User1",
-        "consumerGroup": "consumerGroup1",
-        "consumerId": "consumerId1",
-        "environmentName": "environmentName1",
-        "sdcAddress": "localhost:${docker.http-cache.port.host}",
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-        "pollingInterval":10,
-        "pollingTimeout":30,
-        "messageBusAddresses":["localhost"]
+  "sdc-connections": {
+    "sdc-controller1": {
+      "user": "User1",
+      "consumerGroup": "consumerGroup1",
+      "consumerId": "consumerId1",
+      "environmentName": "environmentName1",
+      "sdcAddress": "localhost:${docker.http-cache.port.host}",
+      "password": "QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
+      "pollingInterval": 10,
+      "pollingTimeout": 30,
+      "messageBusAddresses": [
+        "localhost"
+      ]
     },
-     "sdc-controller2":{
-        "user": "User2",
-        "consumerGroup": "consumerGroup2",
-        "consumerId": "consumerId2",
-        "environmentName": "environmentName2",
-        "sdcAddress": "localhost:${docker.http-cache.port.host}",
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-        "pollingInterval":10,
-        "pollingTimeout":30,
-        "messageBusAddresses":["localhost"]
-        
+    "sdc-controller2": {
+      "user": "User2",
+      "consumerGroup": "consumerGroup2",
+      "consumerId": "consumerId2",
+      "environmentName": "environmentName2",
+      "sdcAddress": "localhost:${docker.http-cache.port.host}",
+      "password": "QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
+      "pollingInterval": 10,
+      "pollingTimeout": 30,
+      "messageBusAddresses": [
+        "localhost"
+      ]
     }
   }
 }
-- 
cgit 1.2.3-korg