Merge pull request #36 from KillrVideo/dse_env_var_fix

Conventional Contact Points Env Variable

Author: clun

.travis.yml

@@ -24,3 +24,9 @@ env:
   # DOCKER_USER & PASS
   - secure: hL9GzKnAuHP130bLzB1nK9eF6bfPD4yFdQ1IdRRp7QDZ+AJ2MUw483w5Uacw6/VNk+KlItO9ySxkAI8gaBcxjxcp+TmFkmD0o4rRQixCoZiqlNeTCMmkx5J6KffNALiFBFPjOvVNXLEYh6lbyIsPJR0/eHGlhCbfpx9Ok9PxzVV4AtNNXVcqCl4hZFWPU8OX7nL0pyQ86MD1WiC/1nfTaE/9zaZ8M/qJhv558KmsSXnFN1eGrwVJLt8XPbZ5aKEvJq3cngwVJ3/hmMQnA6ScgANZFbFrDZo9gDmQLDAbGzQ4mg1wpmvdCGB9HEo14o+ZK3utmnURZDGLHcbgKitIp7fd+FyIktxF3h+hYm7yMV/P67ixLXWxay9F0XXkKF1CPhRU+uEijcWQY/txUItvfHJtDGQbHhChUPmzv2eTQD5QoevFByZ6c3ekQew6hgCPaOsV2FspQQ+XVtdjiiOzmWzeFux2Obc46K85BSyeEp9SjuTJ0772dFBZjWn9UP+M5B8THs4BNPhkSVhceHQBvv65H8DZYEazue0aJYwJhMd1qx5tq/3dXItyDVqxCj0J0LFI4TsFbSf4R+snYOxjc2dkpO1l9aZyLNBTbRn//MTki8o/tdIjAzNYKKWHHBWCYN7OU4Ej4t7XI/SKs3Wf131ebqLlTYU0ppJD7KQUvCU=
   - secure: hxakhOfACkkXcGc5T9cT0+a+ICw6X2ybsOXzJsgdju4QbdP0nD2iBSZCypDzfdzlF/y83yJGcSznegMega37ABomPd8BF04IJTY1ZSvfj8LiUiLLfo/YSsz68r/X1G/AxVmS/7x9x5xaCPMnCHaH2jK5Qiogawzlqgqw/h3EAQlnJyKdjwwmFpATUAuRJidQ/95pn4KYvERg3eZ7/DzqbAO4IRjSuxHRNqDsHXDR4xlBxXAwqt0SE9qfr8rIbuA264vwStltPi4RDfTWWBooxFTGWHpu7rS/N1xEg7+48Il0zckVqmbwMJeAfl8abXhqK5RRrpv77icHeqxi5bev/SL28PnNOhj5gXn6a4/1/JPuhzmKp1omNtlJsjjZhs7YidSOVQ2nEJjDoeQ9/d+Z+g6DosnkDbiS7+ijvIPD9SlRbyUlf7Z3wD8Hf91/fUgkaUoIVkBUFvW8i0fArfcWSIQErvixIGhj41yNOwIAheUFM4Y39NsuilJZZmqZ2Zh0/9AHUiY4fA7C6CajFC06CpjUCpDhb3m0uy1vJcUiG7Y3J6iTrRzaW8eqPnGBQcVTS7/dXPj3WtEP/xOF93sYeZMKE7hk489WAUJNLV9kmasSaVTzbu80kfM5Ml9m675dN3ztUAhaAPT0IqHnycngMBKe2Y7+EDalsDBsffOpO0k=
+
+notifications:
+  slack:
+    rooms:
+      secure: N6FrJ0l0gw2t1wnty/xPDKvLBZlzOAmkIbHjd4ZrtaC4vLU8iZP+YCRvQd7Vwzc97yDhHIZ41eGtjHjBIIeMX/3rfuS+6GA4VJgyNFGsP0f81YYHxiMOEUlVa2O6LBwbF3LokaFi3l7Iau1c5Op9c3LinhTdE0W6KG+2gxEqSKJkBcVJfK9SZGXg3+6qlq065BWx7xWlzoWgMFyipJJLW1BAqEzP5cc6hHozJ5H/8ucMaJbWQF+nOaIYUJdaop4ChSpe6EFyg0XNp+mIjJ2BxZ6hfYrAs69vwBapBepe4zEoR5xdN1dGUAIDqNY9rr4Npp8InFmBmnlL1xG6FeG73C2qfSr3Y2WziOtwececzmuQWI2Do9ioB5k0KtC4UAV42tpADUODrrwxE8S32tqgr0Pojg8FvgsM6O3twvF1UH3LLEyW7zDzuDpYdtvIROWZGerxyWqQIFI7MzragyL+ZiKKUOG1uKsA8DoeECcMHuUsDEsR/mHalmQGGl2ZNGpphAHg/1HtjB32VDCIuZpFHsqFG7BfMY2dg8Mm+ea4j9imOxM+2TFxbPhoIjIJq1o+/YvolrYviWgmQOpeFw0c1xXWSL5aXmBv2nUnlBaXxfzC9FTl0xmovJmKeYhqJ81TMa33gimsMeccZIDmzcMDsW82idsvtHeNDSX1wil5DXA=
+      

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