Security Logging Fields

[cps.git] / cps-application / src / main / resources / application.yml

diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 39309d8..263ae6b 100644 (file)
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 #  ============LICENSE_START=======================================================\r
 #  Copyright (C) 2021 Pantheon.tech\r
 #  Modifications Copyright (C) 2021 Bell Canada\r
-#  Modifications Copyright (C) 2021 Nordix Foundation\r
+#  Modifications Copyright (C) 2021-2022 Nordix Foundation\r
 #  ================================================================================\r
 #  Licensed under the Apache License, Version 2.0 (the "License");\r
 #  you may not use this file except in compliance with the License.\r
@@ -24,11 +24,14 @@ server:
 rest:\r
     api:\r
         cps-base-path: /cps/api\r
-        ncmp-base-path: /cps-ncmp/api\r
+        ncmp-base-path: /ncmp\r
+        ncmp-inventory-base-path: /ncmpInventory\r
 \r
 spring:\r
     main:\r
         banner-mode: "off"\r
+    application:\r
+        name: "cps-application"\r
     jpa:\r
         ddl-auto: create\r
         open-in-view: false\r
@@ -38,7 +41,7 @@ spring:
                 dialect: org.hibernate.dialect.PostgreSQLDialect\r
 \r
     datasource:\r
-        url: jdbc:postgresql://${DB_HOST}:5432/cpsdb\r
+        url: jdbc:postgresql://${DB_HOST}:${DB_PORT:5432}/cpsdb\r
         username: ${DB_USERNAME}\r
         password: ${DB_PASSWORD}\r
         driverClassName: org.postgresql.Driver\r
@@ -74,22 +77,32 @@ notification:
         topic: ${CPS_CHANGE_EVENT_TOPIC:cps.data-updated-events}\r
         filters:\r
             enabled-dataspaces: ${NOTIFICATION_DATASPACE_FILTER_PATTERNS:""}\r
-    async-executor:\r
-        core-pool-size: 2\r
-        max-pool-size: 10\r
-        queue-capacity: 500\r
-        wait-for-tasks-to-complete-on-shutdown: true\r
-        thread-name-prefix: Async-\r
+    async:\r
+        enabled: false\r
+        executor:\r
+            core-pool-size: 2\r
+            max-pool-size: 10\r
+            queue-capacity: 500\r
+            wait-for-tasks-to-complete-on-shutdown: true\r
+            thread-name-prefix: Async-\r
 \r
 \r
 springdoc:\r
     swagger-ui:\r
-        url: /openapi.yml\r
-        path: /swagger-ui/index.html\r
+        disable-swagger-default-url: true\r
+        urlsPrimaryName: cps-core\r
+        urls:\r
+            - name: cps-core\r
+              url: /api-docs/cps-core/openapi.yaml\r
+            - name: cps-ncmp\r
+              url: /api-docs/cps-ncmp/openapi.yaml\r
+            - name: cps-ncmp-inventory\r
+              url: /api-docs/cps-ncmp/openapi-inventory.yaml\r
+\r
 \r
 security:\r
     # comma-separated uri patterns which do not require authorization\r
-    permit-uri: /manage/**,/swagger-ui/**,/swagger-resources/**,/v3/api-docs\r
+    permit-uri: /manage/**,/swagger-ui.html,/swagger-ui/**,/swagger-resources/**,/api-docs/**\r
     auth:\r
         username: ${CPS_USERNAME}\r
         password: ${CPS_PASSWORD}\r
@@ -111,11 +124,16 @@ management:
                 enabled: true\r
 \r
 logging:\r
+    format: json\r
     level:\r
         org:\r
             springframework: INFO\r
+            onap:\r
+                cps: INFO\r
 \r
 dmi:\r
     auth:\r
         username: ${DMI_USERNAME}\r
         password: ${DMI_PASSWORD}\r
+    api:\r
+        base-path: dmi\r