Env var fix

Author: HadesArchitect

docker-compose.yml

@@ -86,15 +86,15 @@ services:
       - "../../cassandra.cert:/usr/src/app/cassandra.cert"     
 
   dse-config: # One-Time Bootstrap Container, configures DSE to have required keyspaces etc.
-    image: killrvideo/killrvideo-dse-config:3.0.0-rc1
+    image: killrvideo/killrvideo-dse-config:3.0.0
     environment:
       KILLRVIDEO_SERVICE_DISCOVERY_DISABLED: 'true' # Backward Compatibility Requirement
     depends_on:
       - dse # Needs DSE to be running
     restart: on-failure # Kompose needs that to create dse-config as a pod, not a deployment. DSE-Config deployment is not needed as we run it only once.
 
   generator:
-    image: killrvideo/killrvideo-generator:3.0.0-rc4
+    image: killrvideo/killrvideo-generator:3.0.0
     depends_on:
       - backend
     environment:

killrvideo-commons/src/main/java/com/killrvideo/discovery/ServiceDiscoveryDaoStatic.java

@@ -44,7 +44,7 @@ public class ServiceDiscoveryDaoStatic implements ServiceDiscoveryDao {
 
     @Value("${killrvideo.discovery.static.cassandra.contactPoints}")
     private String cassandraContactPoints;
-    @Value("#{environment.KILLRVIDEO_DSE_CONTACTPOINTS}")
+    @Value("#{environment.KILLRVIDEO_DSE_CONTACT_POINTS}")
     private Optional<String> cassandraContactPointsEnvVar;
 
     /** {@inheritDoc} */
@@ -65,7 +65,7 @@ public List<String> lookup(String serviceName) {
         	// Better than default spring : simpler
         	if (!cassandraContactPointsEnvVar.isEmpty() && !cassandraContactPointsEnvVar.get().isBlank()) {
         		cassandraContactPoints = cassandraContactPointsEnvVar.get();
-        		LOGGER.info(" + Reading contactPoints from KILLRVIDEO_DSE_CONTACTPOINTS");
+        		LOGGER.info(" + Reading contactPoints from KILLRVIDEO_DSE_CONTACT_POINTS");
         	}
         	Arrays.asList(cassandraContactPoints.split(","))
         	      .stream()

killrvideo-services/Dockerfile

@@ -7,8 +7,8 @@ MAINTAINER Davig Gilardi  <david.gilardi@datastax.com>
 ## Environment Variables
 ########################################################
 
-ARG KILLRVIDEO_DSE_CONTACTPOINTS
-ENV KILLRVIDEO_DSE_CONTACTPOINTS ${KILLRVIDEO_DSE_CONTACTPOINTS}
+ARG KILLRVIDEO_DSE_CONTACT_POINTS
+ENV KILLRVIDEO_DSE_CONTACT_POINTS ${KILLRVIDEO_DSE_CONTACT_POINTS}
 
 ARG KILLRVIDEO_DSE_USERNAME
 ENV KILLRVIDEO_DSE_USERNAME ${KILLRVIDEO_DSE_USERNAME}

killrvideo-services/src/main/resources/application.yaml

@@ -84,7 +84,7 @@ killrvideo:
       kafka: 
         brokers: kafka
         port: 8082
-      # You can override this value by defining env var: §KILLRVIDEO_DSE_CONTACTPOINTS
+      # You can override this value by defining env var: §KILLRVIDEO_DSE_CONTACT_POINTS
       cassandra:
         contactPoints: dse
         port: 9042