feat(fix):[TRI-998] fix kics findings, comment not unresolable ones

eclipse-tractusx · Jan 16, 2023 · 4102bfc · 4102bfc
1 parent 42a766b
commit 4102bfc
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 22 deletions.
diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -48,22 +48,10 @@ jobs:
           # token: ${{ secrets.GITHUB_TOKEN }}
           # enable_comments: true
           # Exclude accepted results from the build
-#          exclude_results: "dda6420c385b33bef69f4db723fee4f469c93e851370c868a15af9bce5b3ec44,\
-#            03df1ef13c69b0ada26fc5bbf35eabca288c5c3c93c0f5d918e41f4951ca8795,\
-#            cd97103ed4e69cbeea5097168f744fdeffade5f6a5bf0b0f0b6bdaaa91b6815e,\
-#            724d6b5be1557dd1a6a2fb0e5c10ec0bcca20092c02fafad544c19a0b6d0e38f,\
-#            b8f92f3e5419d7e0bdefd956549b372fec72affbb25b735cbc59f0e9762f6943,\
-#            9cc9972d007cadc1b17d7ff64eb9aa66648c32997279c5b80c411abbcfbf3c5a,\
-#            663dfa114d46fb8eebf7e98ff0ba3f60f80b8059f8c170c12b07feb909b36f19,\
-#            edc4c9ac9ee139c0d7947410439b66e3c6290cb97a37d97a7519d3d5e56a5a84,\
-#            7f3e9461a3abdb7a281fdc736fb0827e69e9278ccd6b929bd32fc2d84336f68c,\
-#            10e4fff1f26f0a765423e35a7d8952363a6e8961a58e20b3017cd7818745eb36"
-#          # Exclude accepted queries from the build
-#          exclude_queries: "9f88c88d-824d-4d9a-b985-e22977046042,\
-#          00b78adf-b83f-419c-8ed8-c6018441dd3a,\
-#          8c8261c2-19a9-4ef7-ad37-b8bc7bdd4d85,\
-#          8c81d6c0-716b-49ec-afa5-2d62da4e3f3c,\
-#          2d8c175a-6d90-412b-8b0e-e034ea49a1fe"
+          exclude_results: "dda6420c385b33bef69f4db723fee4f469c93e851370c868a15af9bce5b3ec44,\ # docker-compose.yml - local env minio password 
+            03df1ef13c69b0ada26fc5bbf35eabca288c5c3c93c0f5d918e41f4951ca8795" # application-local.yml - local env minio password
+          # Exclude accepted queries from the build
+          #exclude_queries: ""
 
       # Upload findings to GitHub Advanced Security Dashboard
       - name: Upload SARIF file for GitHub Advanced Security Dashboard

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,6 +11,9 @@ services:
     environment:
       MINIO_ROOT_USER: minioadmin
       MINIO_ROOT_PASSWORD: minioadmin
+    pid: "host"
+    cap_drop:
+      - NET_ADMIN
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ]
       interval: 30s

diff --git a/...s/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConnectionProperties.java b/...s/src/test/java/org/eclipse/tractusx/irs/configuration/SmokeTestConnectionProperties.java
@@ -26,5 +26,5 @@
 @Data
 public class SmokeTestConnectionProperties {
     private String baseUri;
-    private String accessToken;
+    private String accessTokenUri;
 }
diff --git a/integration-tests/src/test/java/org/eclipse/tractusx/irs/smoketest/ItemGraphSmokeTest.java b/integration-tests/src/test/java/org/eclipse/tractusx/irs/smoketest/ItemGraphSmokeTest.java
@@ -92,7 +92,7 @@ private static String obtainAccessToken(final String grantType, final String cli
     void setUp() {
         final String accessToken = obtainAccessToken(credentialsProperties.getAuthorizationGrantType(),
                 credentialsProperties.getClientId(), credentialsProperties.getClientSecret(),
-                connectionProperties.getAccessToken());
+                connectionProperties.getAccessTokenUri());
 
         final RequestSpecBuilder builder = new RequestSpecBuilder();
         builder.addHeader("Authorization", "Bearer " + accessToken);

diff --git a/integration-tests/src/test/resources/application-dev.yml b/integration-tests/src/test/resources/application-dev.yml
@@ -15,4 +15,4 @@ spring:
 
 connection:
   base-uri: https://irs.dev.demo.catena-x.net
-  access-token: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
+  access-token-uri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
diff --git a/integration-tests/src/test/resources/application-int.yml b/integration-tests/src/test/resources/application-int.yml
@@ -15,4 +15,4 @@ spring:
 
 connection:
   base-uri: https://irs.int.demo.catena-x.net
-  access-token: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
+  access-token-uri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
diff --git a/integration-tests/src/test/resources/application-local.yml b/integration-tests/src/test/resources/application-local.yml
@@ -15,4 +15,4 @@ spring:
 
 connection:
   base-uri: http://localhost:8080
-  access-token: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
+  access-token-uri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
diff --git a/integration-tests/src/test/resources/application-prd.yml b/integration-tests/src/test/resources/application-prd.yml
@@ -15,4 +15,4 @@ spring:
 
 connection:
   base-uri: https://irs.prd.demo.catena-x.net
-  access-token: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token
+  access-token-uri: https://centralidp.int.demo.catena-x.net/auth/realms/CX-Central/protocol/openid-connect/token