Merge pull request #68 from com-pas/develop

New release

.github/workflows/build-project.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
@@ -38,7 +38,7 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
 
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.0.0
         with:
           distribution: 'zulu'
           java-version: '11'

.github/workflows/release-project.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v1
@@ -42,7 +42,7 @@ jobs:
         # Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
         run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.0.0
         with:
           distribution: 'zulu'
           java-version: '11'

.github/workflows/reuse.yml

@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: REUSE Compliance Check
         uses: fsfe/reuse-action@v1

.github/workflows/sonarcloud-analysis.yml

@@ -26,12 +26,12 @@ jobs:
     if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up JDK 1.11
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3.0.0
         with:
           distribution: 'zulu'
           java-version: '11'

README.md

@@ -16,7 +16,7 @@ SPDX-License-Identifier: Apache-2.0
 You can run your application in dev mode that enables live coding using:
 
 ```shell script
-./mvnw package io.quarkus:quarkus-maven-plugin:2.4.1.Final:dev
+./mvnw package io.quarkus:quarkus-maven-plugin::dev
 ```
 
 > **_NOTE:_**  Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/q/dev/.
@@ -29,8 +29,8 @@ The application can be packaged using:
 ./mvnw package
 ```
 
-It produces the `quarkus-run.jar` file in the `app/target/quarkus-app/` directory. Be aware that it’s not an _über-jar_ as
-the dependencies are copied into the `app/target/quarkus-app/lib/` directory.
+It produces the `quarkus-run.jar` file in the `app/target/quarkus-app/` directory. Be aware that it’s not an _über-jar_
+as the dependencies are copied into the `app/target/quarkus-app/lib/` directory.
 
 If you want to build an _über-jar_, execute the following command:
 
@@ -56,5 +56,28 @@ Or, if you don't have GraalVM installed, you can run the native executable build
 
 You can then execute your native executable with: `./app/target/code-with-quarkus-local-SNAPSHOT-runner`
 
-If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.html.
+If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.html
+.
 
+## Environment variables
+
+Below environment variable(s) can be used to configure which claims are used to fill user information, for instance Who
+in History Record.
+
+| Environment variable   | Java Property                 | Description                                   | Example |
+|------------------------|-------------------------------|-----------------------------------------------|---------|
+| USERINFO_WHO_CLAIMNAME | compas.userinfo.who.claimname | The Name of the user used in the Who History. | name    |
+
+## Security
+
+To use most of the endpoints the users needs to be authenticated using JWT in the authorization header. There are 4
+environment variables that can be set in the container to configure the validation/processing of the JWT.
+
+| Environment variable | Java Property                    | Description                                        | Example                                                                |
+|----------------------|----------------------------------|----------------------------------------------------|------------------------------------------------------------------------|
+| JWT_VERIFY_KEY       | smallrye.jwt.verify.key.location | Location of certificates to verify the JWT.        | http://localhost:8089/auth/realms/compas/protocol/openid-connect/certs |
+| JWT_VERIFY_ISSUER    | mp.jwt.verify.issuer             | The issuer of the JWT.                             | http://localhost:8089/auth/realms/compas                               |
+| JWT_VERIFY_CLIENT_ID | mp.jwt.verify.audiences          | The Client ID that should be in the "aud" claim.   | scl-auto-alignment                                                     |
+| JWT_GROUPS_PATH      | smallrye.jwt.path.groups         | The JSON Path where to find the roles of the user. | resource_access/scl-auto-alignment/roles                               |
+
+There are no roles defined in this service, only need to be authenticated.

pom.xml

@@ -20,16 +20,16 @@ SPDX-License-Identifier: Apache-2.0
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <compiler-plugin.version>3.9.0</compiler-plugin.version>
+        <compiler-plugin.version>3.10.1</compiler-plugin.version>
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
         <sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
 
-        <compas.core.version>0.7.0</compas.core.version>
+        <compas.core.version>0.8.0</compas.core.version>
 
-        <quarkus.platform.version>2.7.0.Final</quarkus.platform.version>
-        <slf4j.version>1.7.35</slf4j.version>
-        <powsybl.sld.version>2.7.0</powsybl.sld.version>
-        <gson.version>2.8.9</gson.version>
+        <quarkus.platform.version>2.7.5.Final</quarkus.platform.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <powsybl.sld.version>2.9.0</powsybl.sld.version>
+        <gson.version>2.9.0</gson.version>
         <openpojo.version>0.9.1</openpojo.version>
     </properties>
 
@@ -230,7 +230,7 @@ SPDX-License-Identifier: Apache-2.0
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>3.3.1</version>
+                            <version>3.3.2</version>
                             <executions>
                                 <execution>
                                     <id>attach-javadocs</id>

service/src/main/java/org/lfenergy/compas/scl/auto/alignment/builder/SubstationGraphBuilder.java

@@ -82,7 +82,8 @@ private void createPowerTransformer(GenericPowerTransformer powerTransformer) {
                             getFeeder3WTLegNode(tws.get(2)),
                             getVoltageLevelBuilder(tws.get(0)).getGraph().getVoltageLevelInfos(),
                             getVoltageLevelBuilder(tws.get(1)).getGraph().getVoltageLevelInfos(),
-                            getVoltageLevelBuilder(tws.get(2)).getGraph().getVoltageLevelInfos()));
+                            getVoltageLevelBuilder(tws.get(2)).getGraph().getVoltageLevelInfos(),
+                            false));
         }
     }