add and configure profiles

.gitlab-ci.yml

@@ -10,7 +10,7 @@ build:
   only:
     - master
   script:
-    - mvn package
+    - mvn package -P prod
   artifacts:
     paths:
       - target/*.jar
@@ -25,7 +25,7 @@ test:
   only:
     - master
   script:
-    - mvn test
+    - mvn test -P prod
   tags:
     - kubernetes
     - smart-harvester

pom.xml

@@ -40,7 +40,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
@@ -138,4 +138,29 @@
 		</plugins>
 	</build>
 
+	<profiles>
+		<profile>
+			<id>dev</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<activatedProperties>dev</activatedProperties>
+			</properties>
+		</profile>
+		<profile>
+			<id>prod</id>
+			<properties>
+				<activatedProperties>prod</activatedProperties>
+			</properties>
+		</profile>
+		<profile>
+			<id>stagging</id>
+			<properties>
+				<activatedProperties>stagging</activatedProperties>
+			</properties>
+		</profile>
+		
+	</profiles>
+
 </project>

src/main/resources/application-dev.properties

+
+
+# 3. MongoDB configuration.
+#spring.data.mongodb.uri=mongodb://admin:adminadmin@mongo2.f2ds.svc.cluster.local:27017/fdp?authSource=admin
+spring.data.mongodb.host=146.59.2.87
+spring.data.mongodb.port=27017
+spring.data.mongodb.database=fdp
+spring.data.mongodb.authentication-database=admin
+spring.data.mongodb.username=admin
+spring.data.mongodb.password=adminadmin
+
+
+
+spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
+
+spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
+spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
+spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
+spring.security.oauth2.client.registration.oidc.redirect-uri=http://localhost:4200/callback
+
+

src/main/resources/application-prod.properties

+#2. Application configuration.
+server.port=8080
+
+# 3. MongoDB configuration.
+spring.data.mongodb.uri=mongodb://admin:adminadmin@mongo2.f2ds.svc.cluster.local:27017/fdp?authSource=admin
+#spring.data.mongodb.host=146.59.2.87
+#spring.data.mongodb.port=27017
+#spring.data.mongodb.database=fdp
+#spring.data.mongodb.authentication-database=admin
+#spring.data.mongodb.username=admin
+#spring.data.mongodb.password=adminadmin
+
+
+
+spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
+
+spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
+spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
+spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
+spring.security.oauth2.client.registration.oidc.redirect-uri=https://f2ds.eosc-pillar.eu/callback
+
+
+

src/main/resources/application-stagging.properties

+server.port=8080
+
+# 3. MongoDB configuration.
+spring.data.mongodb.uri=mongodb://admin:adminadmin@mongo2.f2ds.svc.cluster.local:27017/fdp?authSource=admin
+#spring.data.mongodb.host=146.59.2.87
+#spring.data.mongodb.port=27017
+#spring.data.mongodb.database=fdp
+#spring.data.mongodb.authentication-database=admin
+#spring.data.mongodb.username=admin
+#spring.data.mongodb.password=adminadmin
+
+
+
+spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
+
+spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
+spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
+spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
+spring.security.oauth2.client.registration.oidc.redirect-uri=https://f2ds-dev.eosc-pillar.eu/callback
\ No newline at end of file

src/main/resources/application.properties

 # SMART HARVESTER Application Properties
-
+spring.profiles.active=@activatedProperties@
 # 1. For pretty print
-spring.jackson.serialization.indent_output=true
+spring.jackson.serialization.indent-output=true
 
 #2. Application configuration.
 server.port=8080
 
-# 3. MongoDB configuration.
-#spring.data.mongodb.uri=mongodb://admin:adminadmin@51.178.69.150:27017/fdp?authSource=admin
-spring.data.mongodb.host=146.59.2.87
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=fdp
-spring.data.mongodb.authentication-database=admin
-spring.data.mongodb.username=admin
-spring.data.mongodb.password=adminadmin
 
 # 4. Logging configuration.
 logging.level.com.assignment.springboot.mongo=DEBUG
@@ -39,14 +31,6 @@ springdoc.model-and-view-allowed=false
 server.error.whitelabel.enabled=false
 server.error.path=/error
 
-#9. F2DS Settings Filename
-f2dp.settings.filename=/f2pconf/settings.json
-
-spring.security.oauth2.client.provider.oidc.issuer-uri=https://iam-pillar.cloud.cnaf.infn.it/
 
-spring.security.oauth2.client.registration.oidc.client-id=a03a6ac2-acfe-4916-9d0f-db874ea94e75
-spring.security.oauth2.client.registration.oidc.client-secret=cLONCJ8MccdHwobCEMSl_sYDJGKpmBxH16SyiRIBx8XeoDa2ZLwzTvF_aVoEeOt3h2sNbZqltRqhfHKeI3g7Dw
-spring.security.oauth2.client.registration.oidc.scope=address,phone,openid,email,profile
-spring.security.oauth2.client.registration.oidc.redirect-uri=https://f2ds.eosc-pillar.eu/callback