Alex: Allow an app service in kubernetes to depend on an existing rabbitmq service

Author: alexconlin

lib/stackbuilder/stacks/services/app_service.rb

@@ -257,7 +257,8 @@ def generate_app_config(erb_vars, hiera_provider)
 <%= k %>=<%= v[0,15] + @credentials_selector.to_s %>
 <%- elsif k.start_with?('db.') && k.end_with?('password_hiera_key') -%>
 <%= k.gsub(/_hiera_key$/, '') %>=<%= secret("#{v}s", @credentials_selector) %>
-<%# TODO: support non-db _hiera_key. For example for a rabbitmq connection -%>
+<%- elsif k.end_with?('_hiera_key') -%>
+<%= k.gsub(/_hiera_key$/, '') -%>=<%= secret("#{v}") %>
 <%- else -%>
 <%= k %>=<%= v %>
 <%- end -%>

lib/stackbuilder/stacks/services/rabbitmq_cluster.rb

@@ -39,6 +39,14 @@ def to_loadbalancer_config(location, fabric)
     }
   end
 
+  def endpoints(_dependent_service, _fabric)
+    endpoints = []
+    @ports.each do |port|
+      endpoints << { :port => port, :fqdns => children.map(&:prod_fqdn) }
+    end
+    endpoints
+  end
+
   def validate_dependency(dependant, dependency)
     fail "Stack '#{dependant.name}' must specify requirement when using depend_on #{name} "\
           "in environment '#{environment.name}'. Usage: depend_on <environment>, <requirement>" \

lib/stackbuilder/stacks/services/rabbitmq_server.rb

@@ -24,6 +24,21 @@ def to_enc
                                           'rabbit_users'        => [])
     end
 
+    add_dependant_kubernetes_things enc
+
     enc
   end
+
+  private
+
+  def add_dependant_kubernetes_things(enc)
+    dependant_app_services = @virtual_service.virtual_services_that_depend_on_me.select do |machine_set|
+      machine_set.is_a? Stacks::Services::AppService
+    end
+
+    return unless dependant_app_services.any?(&:kubernetes)
+    enc['role::rabbitmq_server']['allow_kubernetes_clusters'] = dependant_app_services.select(&:kubernetes).map do |vs|
+      vs.environment.options[location]
+    end.uniq
+  end
 end

spec/app_service_spec.rb

@@ -23,7 +23,9 @@
                           'e1-x-vip.earth.net.local' => '3.1.4.13',
                           'e1-nonk8sapp-001.space.net.local' => '3.1.4.14',
                           'e1-sharedproxy-001.space.net.local' => '3.1.4.15',
-                          'e1-sharedproxy-002.space.net.local' => '3.1.4.16'
+                          'e1-sharedproxy-002.space.net.local' => '3.1.4.16',
+                          'e1-myrabbit-001.space.net.local' => '3.1.4.17',
+                          'e1-myrabbit-002.space.net.local' => '3.1.4.18'
                          )
   end
   let(:hiera_provider) do
@@ -1420,6 +1422,36 @@ def k8s_resource(set, kind)
                  /mx)
     end
 
+    it 'has config for it\'s rabbitmq dependencies' do
+      factory = eval_stacks do
+        stack "mystack" do
+          app_service "x", :kubernetes => true do
+            self.maintainers = [person('Testers')]
+            self.description = 'Testing'
+
+            self.application = 'MyApplication'
+            self.short_name = 'myappl'
+            self.startup_alert_threshold = '1h'
+            depend_on 'myrabbit', 'e1', 'test'
+          end
+        end
+        stack "my_rabbit" do
+          rabbitmq_cluster "myrabbit"
+        end
+        env "e1", :primary_site => 'space', :short_name => 'spc' do
+          instantiate_stack "mystack"
+          instantiate_stack "my_rabbit"
+        end
+      end
+      set = factory.inventory.find_environment('e1').definitions['mystack'].k8s_machinesets['x']
+      expect(k8s_resource(set, 'ConfigMap')['data']['config.properties']).
+        to match(/test.messaging.enabled=true.*
+                  test.messaging.broker_fqdns=e1-myrabbit-001.space.net.local,e1-myrabbit-002.space.net.local.*
+                  test.messaging.username=MyApplication.*
+                  test.messaging.password=\{SECRET:e1_MyApplication_messaging_password\}.*
+                 /mx)
+    end
+
     it 'fails when the app version cannot be found' do
       factory = eval_stacks do
         stack "mystack" do

spec/rabbitmq_spec.rb

@@ -82,6 +82,29 @@
   end
 end
 
+describe_stack 'when a k8s app is a dependant the cluster appears in the enc' do
+  given do
+    stack 'test' do
+      rabbitmq_cluster 'rabbitmq'
+      app_service 'exampleapp', :kubernetes => true do
+        self.application = 'example'
+        self.maintainers = [person('Testers')]
+        self.description = 'Testing'
+        depend_on 'rabbitmq', 'e1', :magic
+      end
+    end
+
+    env 'e1', :primary_site => 'space' do
+      instantiate_stack 'test'
+    end
+  end
+
+  host('e1-rabbitmq-001.mgmt.space.net.local') do |host|
+    expect(host.to_enc['role::rabbitmq_server']['allow_kubernetes_clusters']).to include(
+      'space')
+  end
+end
+
 describe_stack 'rabbitmq users are created from dependencies' do
   given do
     stack 'test' do