update

Author: artyomb

lib/dry-stack/stack.rb

@@ -84,6 +84,7 @@ def logging(opts) = (@service[:logging] ||= {}).merge!  opts
     def user(user) = @service[:user] = user #  "${UID}:${GID}", "www-data:www-data"
     def network(name, opts = {}) = (@service[:networks][name] ||={}).merge! opts
     def ingress(ing) = ((@service[:ingress] ||=[]) << ing).flatten!
+    def oauth_provider(address) = (@service[:oauth_provider] = address)
   end
 
   class ConfigurationFunction
@@ -234,6 +235,13 @@ def to_compose(opts = @options)
               rule << "#{ing[:rule]}" if ing[:rule]
 
               middlewares = []
+              if ing[:oauth_provider] || service[:oauth_provider]
+                pname = "#{service_name}-#{index}_oauth_provider"
+                value = ing[:oauth_provider] || service[:oauth_provider]
+                value = "http://#{value}" unless value =~ /^http/
+                middlewares << pname
+                service[:deploy][:labels] << "traefik.http.middlewares.#{pname}.forwardauth.address=#{value}"
+              end
 
               if ing[:basic_auth]
                 ba_user, ba_password, salt = ing[:basic_auth].split ':'
@@ -257,6 +265,7 @@ def to_compose(opts = @options)
           end
         end
         service.delete :ingress
+        service.delete :oauth_provider
 
         service[:environment] = @environment[name].merge(service[:environment])  if @environment[name]
         service[:environment].merge! STACK_NAME: @name.to_s, STACK_SERVICE_NAME: name.to_s

lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.45'
+    VERSION = '0.1.46'
   end
 end

spec/data/stack18-compose.yml

@@ -19,6 +19,24 @@ services:
       ingress_routing:
     init: true
     image: reports:0.1
+  front2:
+    environment:
+      STACK_NAME: stack
+      STACK_SERVICE_NAME: front2
+    deploy:
+      labels:
+      - traefik.enable=true
+      - traefik.http.routers.stack_front2-0.service=stack_front2-0
+      - traefik.http.services.stack_front2-0.loadbalancer.server.port=7000
+      - traefik.http.routers.stack_front2-0.tls=true
+      - traefik.http.routers.stack_front2-0.tls.certresolver=le
+      - traefik.http.routers.stack_front2-0.tls.domains[0].main=my.com
+      - traefik.http.routers.stack_front2-0.rule=PathPrefix(`/test`)
+    networks:
+      default:
+      ingress_routing:
+    init: true
+    image: reports:0.1
 networks:
   ingress_routing:
     external: true

spec/data/stack18.drs

@@ -1,3 +1,5 @@
 Options traefik_tls: true, tls_domain: 'my.com', ingress: true
 
-Service :front, image: 'reports:0.1', ports: 7000, ingress: { host: '*' }
+Service :front, image: 'reports:0.1', ports: 7000, ingress: { host: '*' }
+
+Service :front2, image: 'reports:0.1', ports: 7000, ingress: { path: '/test' }

spec/data/stack19.drs

@@ -0,0 +1,13 @@
+
+# "traefik.http.middlewares.auth-0.forwardauth.address=http://oauth_provider:7000/auth"
+# "traefik.http.routers.%{service-name}-0.middlewares=auth-0"
+
+Service :odata1, ingress: { path: '/odata', oauth_provider: 'stack_name_oauth_provider:7000/auth' }
+Service :odata2, ingress: { path: '/odata', oauth_provider: 'stack_name_oauth_provider_override' }
+Service :odata3, ingress: { path: '/odata' }
+
+BeforeService [:odata2, :odata3] do
+  oauth_provider 'stack_name_oauth_provider_global'
+end
+
+Service :odata4, ingress: { path: '/odata' }, oauth_provider: 'stack_name_oauth_provider:7000/auth'

spec/simple_stack_spec.rb

@@ -27,11 +27,11 @@
           compose = YAML.load_file stack_file.gsub('.drs', sufix), aliases: true rescue ''
           # puts stack_compose_shell
 
-          # unless stack_compose_shell == compose.to_yaml
-          #   yaml = YAML.load stack_compose_shell, aliases: true
-          #   File.write stack_file.gsub('.drs', sufix), yaml.to_yaml
-          #   compose = YAML.load_file stack_file.gsub('.drs', sufix), aliases: true
-          # end
+          unless stack_compose_shell == compose.to_yaml
+            yaml = YAML.load stack_compose_shell, aliases: true
+            File.write stack_file.gsub('.drs', sufix), yaml.to_yaml
+            compose = YAML.load_file stack_file.gsub('.drs', sufix), aliases: true
+          end
           expect(stack_compose_shell).to eq(compose.to_yaml)
         end
       end