Merge pull request #293 from FraunhoferISST/feat/update_miw

Feat: updated miw to 0.4.0
eclipse-tractusx · Mar 19, 2024 · 29a20f9 · 29a20f9
2 parents 863d066 + 30adc91
commit 29a20f9
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 63 deletions.
diff --git a/...java/org/eclipse/tractusx/puris/backend/common/ddtr/logic/util/DtrRequestBodyBuilder.java b/...java/org/eclipse/tractusx/puris/backend/common/ddtr/logic/util/DtrRequestBodyBuilder.java
@@ -89,7 +89,7 @@ public JsonNode createMaterialRegistrationRequestBody(MaterialPartnerRelation ma
 
         var itemStockRequestSubmodelObject = createItemStockSubmodelObject();
         submodelDescriptorsArray.add(itemStockRequestSubmodelObject);
-        log.info("Created body for material " + material.getOwnMaterialNumber() + "\n" + body.toPrettyString());
+        log.debug("Created body for material " + material.getOwnMaterialNumber() + "\n" + body.toPrettyString());
         return body;
     }
 
@@ -131,7 +131,7 @@ public JsonNode createProductRegistrationRequestBody(Material material, String p
         var itemStockRequestSubmodelObject = createItemStockSubmodelObject();
         submodelDescriptorsArray.add(itemStockRequestSubmodelObject);
 
-        log.info("Created body for product " + material.getOwnMaterialNumber() + "\n" + body.toPrettyString());
+        log.debug("Created body for product " + material.getOwnMaterialNumber() + "\n" + body.toPrettyString());
         return body;
     }
 

diff --git a/local/docker-compose-infrastructure.yaml b/local/docker-compose-infrastructure.yaml
@@ -20,67 +20,67 @@
 version: "3"
 
 services:
-    miw:
-        image: tractusx/managed-identity-wallet:0.2.0
-        container_name: miw
-        env_file:
-            - ./miw/infrastructure.properties
-        ports:
-            - "127.0.0.1:8000:80"
-            - "127.0.0.1:8090:8090"
-        networks:
-            - miw-net
+  miw:
+    image: tractusx/managed-identity-wallet:0.4.0
+    container_name: miw
+    env_file:
+      - ./miw/infrastructure.properties
+    ports:
+      - "127.0.0.1:8000:80"
+      - "127.0.0.1:8090:8090"
+    networks:
+      - miw-net
 
-    postgres:
-        image: postgres:15.4-alpine
-        container_name: postgres-miw
-        environment:
-            POSTGRES_DB: edc
-            POSTGRES_USER: ${PG_USER}
-            POSTGRES_PASSWORD: ${PG_PW}
-        volumes:
-            # use docker-compose down --volumes to kill db volume
-            # only then, changes to the script are executed!
-            - ./postgres/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
-        ports:
-            - "127.0.0.1:5432:5432"
-        networks:
-            - miw-net
+  postgres:
+    image: postgres:15.4-alpine
+    container_name: postgres-miw
+    environment:
+      POSTGRES_DB: edc
+      POSTGRES_USER: ${PG_USER}
+      POSTGRES_PASSWORD: ${PG_PW}
+    volumes:
+      # use docker-compose down --volumes to kill db volume
+      # only then, changes to the script are executed!
+      - ./postgres/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
+    ports:
+      - "127.0.0.1:5432:5432"
+    networks:
+      - miw-net
 
-    keycloak:
-        image: quay.io/keycloak/keycloak:21.1
-        env_file:
-            - ./miw/infrastructure.properties
-        environment:
-            DB_SCHEMA: public
-        command:
-            - start-dev
-            - --import-realm
-        volumes:
-            - ./miw/keycloak-setup.json:/opt/keycloak/data/import/miw_test_realm.json
-        ports:
-            - "127.0.0.1:8080:8080"
-        depends_on:
-            - postgres
-        networks:
-            - miw-net
-    vault:
-        build: ./vault
-        container_name: vault
-        ports:
-            - "127.0.0.1:8200:8200"
-        environment:
-            # token id may not contain prefix
-            VAULT_DEV_ROOT_TOKEN_ID: ${VAULT_DEV_ROOT_TOKEN_ID}
-            VAULT_ADDR: http://vault:8200
-            VAULT_PUT_SECRETS_DIR: ${VAULT_SECRETS_DIR}
-            # ATTENTION: Non productive environment
-            SKIP_SETCAP: true
-            SKIP_CHOWN: true
-        volumes:
-            - ./vault/secrets:${VAULT_SECRETS_DIR}
-        networks:
-            - miw-net
+  keycloak:
+    image: quay.io/keycloak/keycloak:21.1
+    env_file:
+      - ./miw/infrastructure.properties
+    environment:
+      DB_SCHEMA: public
+    command:
+      - start-dev
+      - --import-realm
+    volumes:
+      - ./miw/keycloak-setup.json:/opt/keycloak/data/import/miw_test_realm.json
+    ports:
+      - "127.0.0.1:8080:8080"
+    depends_on:
+      - postgres
+    networks:
+      - miw-net
+  vault:
+    build: ./vault
+    container_name: vault
+    ports:
+      - "127.0.0.1:8200:8200"
+    environment:
+      # token id may not contain prefix
+      VAULT_DEV_ROOT_TOKEN_ID: ${VAULT_DEV_ROOT_TOKEN_ID}
+      VAULT_ADDR: http://vault:8200
+      VAULT_PUT_SECRETS_DIR: ${VAULT_SECRETS_DIR}
+      # ATTENTION: Non productive environment
+      SKIP_SETCAP: true
+      SKIP_CHOWN: true
+    volumes:
+      - ./vault/secrets:${VAULT_SECRETS_DIR}
+    networks:
+      - miw-net
 networks:
-    miw-net:
-        name: miw-net
+  miw-net:
+    name: miw-net