Fix: local deployment issues #72

nitin-vavdiya · 2024-05-13T07:01:31Z

Description

Changes:

Spring docker-compose support added
Spring openAPI support added for swagger
Spring boot version updated
prettier plugin and prettier java version updated
fix: application.yaml was not loaded when we started the application using IDE
fix: flyway migration was not running when we started the application using IDE
Local installation guide update for docker-compose support
Duplicate dependency for JPA is removed

fix: #71

Pre-review checks

Please ensure to do as many of the following checks as possible, before asking for a committer review:

DEPENDENCIES are up-to-date. Dash license tool. Committers can open IP issues for restricted libs.
Copyright and license header are present on all affected files

…docker

- Added password auth flow in open api config and removed other unnecessary flows

Fix: local set-up issues

carslen · 2024-05-13T07:15:23Z

@nitin-vavdiya Currently the Eclipse Contributor Agreement (ECA) check fails because @ravi-ghadiya has not signed the ECA.

Latest dependency changes added to DEPENDENCY_BACKEND

...eclipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/appinfo/InfoConfiguration.java

...ipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/config/openapi/OpenApiConfig.java

compose.yaml

...ctusx/demandcapacitymgmt/demandcapacitymgmtbackend/security/AppSecurityConfigProperties.java

dev/create_keycloak_db.sh

Managed Licence and Copyright header

carslen

As this PR has > 1000 lines of changed code, Eclipse Foundation IP-Check ticket opened: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14720

@ClosedSourcerer please review code and approve PR if changes are valid.

kishoreinvits · 2024-05-15T12:26:23Z

@nitin-vavdiya, Great job. Thank you for doing this.

It will be super helpful to update document Local Development Install so that any future developers can get started using your work.

With more variables added, helm chart also needs an update. I think it exceeds scope of this PR. So added new issue #73 for that.

kishoreinvits · 2024-05-15T12:16:01Z

dev/create_keycloak_db.sh

+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    CREATE DATABASE auth;


Consider creating if not exists, so that its idempotent.

Fixed with b3a7dbc

kishoreinvits · 2024-05-15T12:18:13Z

demand-capacity-mgmt-backend/src/main/resources/application.yml

@@ -36,17 +47,28 @@ spring:

  flyway:
    enabled: true
-    url: jdbc:postgresql://${DCM_DATASOURCE_HOST:localhost:5432}/${DCM_DATASOURCE_NAME:dcm}
+    url: jdbc:postgresql://${DCM_DATASOURCE_HOST:localhost:15432}/${DCM_DATASOURCE_NAME:dcm}


Why did you have to change port. Even docker-compose you added is not using these ports. Local development install is also recommending these standard ports. Recommend switching back to standard ports.

Fixed with b3a7dbc

kishoreinvits · 2024-05-15T12:22:46Z

demand-capacity-mgmt-backend/pom.xml

@@ -54,7 +54,7 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-webflux</artifactId>
-            <version>3.1.5</version>
+            <version>3.2.5</version>
        </dependency>

        <dependency>


As you are touching this file, can you please remove duplicate dependency in line 82 though you did not add it

<dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-jpa</artifactId> </dependency>

Fixed with b3a7dbc

demand-capacity-mgmt-backend/src/main/resources/application.yml

kishoreinvits · 2024-05-15T13:59:27Z

...ipse/tractusx/demandcapacitymgmt/demandcapacitymgmtbackend/config/openapi/OpenApiConfig.java

+
+@Configuration
+@AllArgsConstructor
+public class OpenApiConfig {


When I tried to run app, project fails to initialize this class. Please check if you also see this or update recommended local set up.

I am using openJDK 17

No we tested with JDK 17 only

Can you briefly update document Local Development Install. I will try again.

There was one annotation missing on the spring boot main class

README is also updated

Fixed with b3a7dbc

ClosedSourcerer · 2024-05-15T17:49:58Z

As this PR has > 1000 lines of changed code, Eclipse Foundation IP-Check ticket opened: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14720

@ClosedSourcerer please review code and approve PR if changes are valid.

From my POV the changes seem sensible and improve DCMFOSS.
I asked @kishoreinvits to have a look at it as well.
He is one of the technical coaches for the DCM FOSS stream at the Tractus-X Community Days.

As soon as his concerns are taken care off this would be good to merge, in my humble opinion.

Code changes as per upstream PR review

kishoreinvits · 2024-05-16T08:50:34Z

docs/Local Development Install.md

-  ![Postgres connection](images/dev/5.png "Docker postgres connection")
+  On startup, the application also creates a Keycloak container based on the configurations in the Compose file. Initial configurations, including the creation of realms, clients, and users, are performed using the `dcm_realm.json` file.  
+
+  ![Docker desktop running containers](images/dev/11.png)


Prefer not to add docker desktop reference. See #68 . But in this case, it is only representation.

kishoreinvits

@ClosedSourcerer - Looks good to me. Especially adding missing annotation.

carslen · 2024-05-16T09:12:03Z

Waiting to finish EF IP-Check with due date 22.05.2024. After IP-Check succeded I'll approve and merge PR.

carslen · 2024-05-16T11:03:15Z

@stephanbcbauer why has this PR been merged, ignoring the changes requested? In a way this is a no-go and disrespects the work I've spend into this PR.

EF IP-Check for this PR is still open. I've stated clearly that I'll merge this PR as soon as the IP-Check has been successfully completed.

ravi-ghadiya and others added 8 commits May 10, 2024 12:19

fix application startup issues

dbc47ef

Managed support for spring boot docker compose for postgres and keycloak

8aeb248

fix: spring boot version changes, apache lang deps. port changes for …

933344f

…docker

Springdoc openapi swagger integration

814aef2

Refactor of application yml properties

1b647d7

- Refactor config properties hierarchy

28ac685

- Added password auth flow in open api config and removed other unnecessary flows

Merge pull request #1 from smartSenseSolutions/fix/stable-application

581e438

Fix: local set-up issues

Latest dependency changes added to DEPENDENCY_BACKEND

08ffe43

Merge pull request #2 from smartSenseSolutions/fix/stable-application

626a77c

Latest dependency changes added to DEPENDENCY_BACKEND

carslen suggested changes May 13, 2024

View reviewed changes

ravi-ghadiya and others added 2 commits May 13, 2024 13:15

Managed Licence and Copyright header

086ce99

Merge pull request #3 from smartSenseSolutions/fix/stable-application

5dae4a2

Managed Licence and Copyright header

nitin-vavdiya requested a review from carslen May 13, 2024 08:12

carslen approved these changes May 15, 2024

View reviewed changes

carslen suggested changes May 15, 2024

View reviewed changes

kishoreinvits suggested changes May 15, 2024

View reviewed changes

kishoreinvits reviewed May 15, 2024

View reviewed changes

demand-capacity-mgmt-backend/src/main/resources/application.yml Show resolved Hide resolved

kishoreinvits reviewed May 15, 2024

View reviewed changes

demand-capacity-mgmt-backend/src/main/resources/application.yml Show resolved Hide resolved

kishoreinvits reviewed May 15, 2024

View reviewed changes

nitin-vavdiya and others added 4 commits May 16, 2024 07:57

fix: code reviews

6bcab7a

Managed ConfigurationPropertiesScan annotation on main class

e043716

Updated readme. Updated Running containers section content.

43b1df6

Merge pull request #4 from smartSenseSolutions/fix/stable-application

b3a7dbc

Code changes as per upstream PR review

nitin-vavdiya requested a review from kishoreinvits May 16, 2024 08:09

kishoreinvits reviewed May 16, 2024

View reviewed changes

kishoreinvits approved these changes May 16, 2024

View reviewed changes

stephanbcbauer merged commit 7019114 into eclipse-tractusx:main May 16, 2024
3 checks passed

This was referenced May 20, 2024

refactor: simplify and align java package names #76

Closed

2nd Eclipse Tractus-X Community Days Contribution #79

Closed

carslen mentioned this pull request May 22, 2024

Fix: local deployment issues #80

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: local deployment issues #72

Fix: local deployment issues #72

nitin-vavdiya commented May 13, 2024 •

edited

Loading

carslen commented May 13, 2024

carslen left a comment

kishoreinvits commented May 15, 2024 •

edited

Loading

kishoreinvits May 15, 2024

nitin-vavdiya May 16, 2024

kishoreinvits May 15, 2024 •

edited

Loading

nitin-vavdiya May 16, 2024

kishoreinvits May 15, 2024

nitin-vavdiya May 16, 2024

kishoreinvits May 15, 2024

nitin-vavdiya May 16, 2024

kishoreinvits May 16, 2024

nitin-vavdiya May 16, 2024 •

edited

Loading

ClosedSourcerer commented May 15, 2024

kishoreinvits May 16, 2024

kishoreinvits left a comment

carslen commented May 16, 2024

carslen commented May 16, 2024

Fix: local deployment issues #72

Fix: local deployment issues #72

Conversation

nitin-vavdiya commented May 13, 2024 • edited Loading

Description

Pre-review checks

carslen commented May 13, 2024

carslen left a comment

Choose a reason for hiding this comment

kishoreinvits commented May 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kishoreinvits May 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nitin-vavdiya May 16, 2024 • edited Loading

Choose a reason for hiding this comment

ClosedSourcerer commented May 15, 2024

Choose a reason for hiding this comment

kishoreinvits left a comment

Choose a reason for hiding this comment

carslen commented May 16, 2024

carslen commented May 16, 2024

nitin-vavdiya commented May 13, 2024 •

edited

Loading

kishoreinvits commented May 15, 2024 •

edited

Loading

kishoreinvits May 15, 2024 •

edited

Loading

nitin-vavdiya May 16, 2024 •

edited

Loading