Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MOSIP-34747] - set spring.profiles.active composite (#1553) #1567

Closed
wants to merge 2 commits into from

Conversation

swatigoel
Copy link
Contributor

@swatigoel swatigoel commented Sep 5, 2024

spring active profile is set to composite.
To make it work, we need to add composite properties through env variables.
Adding type and uri are mandatory properties.
If we don't specify default_label which is known as branch, it will refer to main branch of repo. In our repositories we have main branch as master. Because of this providing default_label becomes mandatory for us.

Env variables to set for composite profile are as
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_URI=https://github.com/mosip/inji-config
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_TYPE=git
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_0_DEFAULT_LABEL=develop

export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_URI=https://github.com/mosip/mosip-config
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_TYPE=git
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_DEFAULT_LABEL=develop

for native
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_URI=file-path-for-local-properties
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_TYPE=native
export SPRING_CLOUD_CONFIG_SERVER_COMPOSITE_1_DEFAULT_LABEL=develop

-- Update readme with example to support different type of repositories - git, svn, native

Signed-off-by: Swati Goel <[email protected]>
Copy link
Member

@vishwa-vyom vishwa-vyom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this from a feature branch, which was previously reviewed, approving this with a quick check.

* fix: kernel/kernel-idobjectvalidator/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-32236
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-5710356

Signed-off-by: rajapandi.m <[email protected]>

* fix: kernel/kernel-bom/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGJSON-5488379
- https://snyk.io/vuln/SNYK-JAVA-ORGJSON-5962464

Signed-off-by: rajapandi.m <[email protected]>

* fix: kernel/kernel-pdfgenerator-itext/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2320389
- https://snyk.io/vuln/SNYK-JAVA-ORGBOUNCYCASTLE-1052448
- https://snyk.io/vuln/SNYK-JAVA-ORGBOUNCYCASTLE-2841508
- https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-541282
- https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-541284
- https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2391484
- https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2391485
- https://snyk.io/vuln/SNYK-JAVA-COMITEXTPDF-2391486

Signed-off-by: rajapandi.m <[email protected]>

* Revert "fix: kernel/kernel-pdfgenerator-itext/pom.xml to reduce vulnerabilities"

This reverts commit 80a480e.

Signed-off-by: rajapandi.m <[email protected]>

* fix: kernel/kernel-authcodeflowproxy-api/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-6435950
- https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATEVALIDATOR-541187
- https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATEVALIDATOR-6247635
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-467268
- https://snyk.io/vuln/SNYK-JAVA-ORGHIBERNATEVALIDATOR-568163
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-5710356

Signed-off-by: rajapandi.m <[email protected]>

* fix: kernel/kernel-bom/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-7430175
- https://snyk.io/vuln/SNYK-JAVA-COMMONSIO-1277109
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-6457293
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-6483812
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-6444790
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-6597980
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHEHTTPCOMPONENTS-1048058

Signed-off-by: rajapandi.m <[email protected]>

* Update pom.xml

Signed-off-by: rajapandi1234 <[email protected]>
Signed-off-by: rajapandi.m <[email protected]>

* Update pom.xml

Signed-off-by: rajapandi1234 <[email protected]>
Signed-off-by: rajapandi.m <[email protected]>

* Update pom.xml

Signed-off-by: rajapandi1234 <[email protected]>
Signed-off-by: rajapandi.m <[email protected]>

* Update pom.xml

Signed-off-by: rajapandi1234 <[email protected]>

* [DSD-6020] Updated nexus-staging-maven-plugin version in pom.xml

Signed-off-by: techno-467 <[email protected]>

* [MOSIP-35226] Enabled config-server to pull configurations from local git repo. (#1566)

* [MOSIP-35226] Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* [MOSIP-35226] Updated Dockerfile

Signed-off-by: Mohan E <[email protected]>

* Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* Updated Dockerfile

Signed-off-by: Mohan E <[email protected]>

* Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* Updated Dockerfile

Signed-off-by: Mohan E <[email protected]>

* [MOSIP-35226] Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* [MOSIP-35226] Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

* [MOSIP-35226] Updated bootstrap.properties

Signed-off-by: Mohan E <[email protected]>

---------

Signed-off-by: Mohan E <[email protected]>

* [MOSIP-35160] Updated URL from https://github.com/mosip/mosip-infra/blob/master/deployment/v3/utils/copy_cm_func.sh to https://raw.githubusercontent.com/mosip/mosip-infra/master/deployment/v3/utils/copy_cm_func.sh

Signed-off-by: techno-467 <[email protected]>

---------

Signed-off-by: rajapandi.m <[email protected]>
Signed-off-by: rajapandi1234 <[email protected]>
Signed-off-by: techno-467 <[email protected]>
Signed-off-by: Mohan E <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: rajapandi1234 <[email protected]>
Co-authored-by: Chandra Keshav Mishra <[email protected]>
Co-authored-by: techno-467 <[email protected]>
Co-authored-by: Mohan E <[email protected]>
@swatigoel
Copy link
Contributor Author

raising another PR by resolving conflicts

@swatigoel swatigoel closed this Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants