adding tls support

Author: slorello89

.idea/modules.xml

@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 
@@ -18,18 +19,22 @@ public JedisConnectionFactory jedisConnectionFactory() {
 		int redisPort = Integer.parseInt(redisHostAndPort.split(":")[1]);
 		String redisPassword = System.getenv("REDIS_PASSWORD");
 		String redisUser = System.getenv("REDIS_USER") != null ? System.getenv("REDIS_USER") : "default";
+        boolean useSsl = System.getenv("REDIS_USE_SSL") != null && System.getenv("REDIS_USE_SSL").equalsIgnoreCase("true");
         RedisStandaloneConfiguration config = new RedisStandaloneConfiguration(redisHost, redisPort);
         LOG.info("connecting to redis at {}:{}", redisHost, redisPort);
-
         if(redisPassword != null && !redisPassword.isEmpty()) {
             config.setPassword(redisPassword);
         }
 
         if (redisUser != null && !redisUser.isEmpty()) {
             config.setUsername(redisUser);
         }
-
-        return new JedisConnectionFactory(config);
+        JedisClientConfiguration.JedisClientConfigurationBuilder jedisClientConfigurationBuilder = JedisClientConfiguration.builder();
+        if(useSsl) {
+            LOG.info("Using SSL to connect to Redis");
+            jedisClientConfigurationBuilder.useSsl();
+        }
+        return new JedisConnectionFactory(config, jedisClientConfigurationBuilder.build());
     }
 
     @Bean

autoscaler/redis-cloud-autoscaler/src/main/java/com/redis/autoscaler/RedisConfig.java

@@ -85,7 +85,7 @@ resource "google_compute_firewall" "autoscale_allow_egress" {
 
 
 data "rediscloud_payment_method" "card"{
-    card_type = "Visa"
+    card_type = "Mastercard"
     last_four_numbers = var.last_four_digits
 }
 
@@ -135,6 +135,7 @@ resource "rediscloud_subscription_database" "autoscale-database" {
     throughput_measurement_by = "operations-per-second"
     throughput_measurement_value = 1000
     memory_limit_in_gb = 0.5
+    enable_tls = true
     modules = [
         {
             "name" : "RedisJSON"
@@ -183,7 +184,7 @@ resource "null_resource" "build_app" {
     }
 
     provisioner "file" {
-        source = "./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.4.jar"
+        source = "./autoscaler/redis-cloud-autoscaler/build/libs/redis-cloud-autoscaler-0.0.5.jar"
         destination = "autoscaler.jar"      
     }
 
@@ -213,6 +214,7 @@ resource "null_resource" "build_app" {
             "echo 'Environment=REDIS_CLOUD_API_KEY=${var.redis_cloud_api_key}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=REDIS_CLOUD_ACCOUNT_KEY=${var.redis_cloud_account_key}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=REDIS_CLOUD_SUBSCRIPTION_ID=${rediscloud_subscription.autoscaling_sub.id}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
+            "echo 'Environment=REDIS_USE_SSL=true' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=ALERT_MANAGER_HOST=${google_compute_instance.autoscale-vm-prometheus.network_interface[0].access_config[0].nat_ip}' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'Environment=ALERT_MANAGER_PORT=9093' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",
             "echo 'ExecStart=/usr/bin/java -jar /usr/local/bin/autoscaler.jar' | sudo tee -a /etc/systemd/system/autoscaler.service > /dev/null",

main.tf

@@ -84,7 +84,7 @@ resource "google_compute_firewall" "autoscale_allow_egress" {
 
 
 data "rediscloud_payment_method" "card"{
-    card_type = "Visa"
+    card_type = "Mastercard"
     last_four_numbers = var.last_four_digits
 }
 
@@ -108,7 +108,7 @@ resource "rediscloud_subscription" "autoscaling_sub" {
 
     creation_plan {
         memory_limit_in_gb = 5
-        quantity = 3
+        quantity = 1
         replication = false
         throughput_measurement_by = "operations-per-second"
         throughput_measurement_value = 25000