dry-stack 0.1.25 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d9f6e94fed9c9ceb71959fd7e943a01933c71f51ef63541daadc54beb3b52d3
-  data.tar.gz: 4b03a946eb20d4f57860d508ab5d8ddc7cd8800caf5b07de24ea71f2284d94e9
+  metadata.gz: 6cc31d2b83307688e1d43bc7b204f641cc03c3b81e5b51edad67b1c59ecf88b9
+  data.tar.gz: '04284bddd3f1e10b39ae1cfc113953c9cc52aa20c00b06fd24e6cf34fe29ab59'
 SHA512:
-  metadata.gz: a109b0ac31ca83a57af54f18fb8816a12c63158af8bdaef8620c2427d01c4db8aff9653317d706517ebad76752c6df078f3cfc1532f226a218b9f3271e30d903
-  data.tar.gz: a10de81ff5832f6e0f346a9966a2b36308d119fe044c9941897125fd4544efe277e39ce104adedcf4ae9f4d1eb11cce4fc43acd4f75eb8ac6abf7a005d490aa0
+  metadata.gz: 1f4e9f33b0dc3a2a192f2f85a3cba5a390b0c0c2197a057be65ed5819f107f6958a2be9f88efbc39ee8a1b357e05f45447912c56fcaefaac023e5259a49183b8
+  data.tar.gz: 8ef6dafd0c4645afea6341a753554dfb3a747727d8e8d866aada49b971be9b54b31bc6f7a30ae553397d24d0e78d77575c0666455d16e05938bc1aa218906ad8

data/lib/dry-stack/stack.rb

@@ -190,6 +190,8 @@ module Dry
               domain = ing[:tls_domain] if ing[:tls_domain]
 
               ing[:passthrough] = false unless ing.key? :passthrough
+              # Without specifying entrypoints any/all are user by traefik to to connectio to the service
+              raise "'entrypoints' required for SNI tcp route" if ing[:entrypoints].to_s.empty?
 
               service[:deploy][:labels] += [
                 "traefik.tcp.routers.#{service_name}-#{index}.tls=true",
@@ -197,6 +199,7 @@ module Dry
                 "traefik.tcp.routers.#{service_name}-#{index}.tls.domains[0].main=#{domain}",
 
                 "traefik.tcp.routers.#{service_name}-#{index}.service=#{service_name}-#{index}",
+                "traefik.tcp.routers.#{service_name}-#{index}.entrypoints=#{ing[:entrypoints]}",
                 "traefik.tcp.services.#{service_name}-#{index}.loadbalancer.server.port=#{ing[:port]}",
 
                 "traefik.tcp.routers.#{service_name}-#{index}.rule=HostSNI(`#{domain}`)",
@@ -267,11 +270,23 @@ module Dry
         service[:deploy][:labels] = service[:deploy][:labels].map{ env_sub[_1] }
         service[:environment].transform_values!{ _1.is_a?(String) ? (env_sub[_1]) : _1 }
 
-        pp_i = @publish_ports[name]&.reject { _1.class == String }
+        pp_h = @publish_ports[name]&.select { _1.class == Hash }
+        pp_i = @publish_ports[name]&.select { _1.class == Integer }
         pp_s = @publish_ports[name]&.select { _1.class == String }
         service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
         service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
 
+        if pp_h&.any?
+          service[:ports] = service[:ports].map { |s|
+            if s.class == String
+              published, target = s.split(':').map(&:to_i)
+              { published:, target:, protocol: 'tcp', mode: 'ingress'}
+            else
+              s
+            end
+          } + pp_h
+        end
+
         service[:logging] ||= @logging[name.to_sym]
 
         service[:volumes]&.map!&.with_index do |volume, index|
@@ -388,7 +403,7 @@ module Dry
     end
 
     def PublishPorts(ports)
-      @publish_ports.merge! ports.to_h { |k, v| [k,[v].flatten] }
+      @publish_ports.merge! ports.to_h { |k, v| [k,@publish_ports[k].to_a + [v].flatten] }
     end
 
     def Service(name, opts = {}, &block)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.25'
+    VERSION = '0.1.27'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.27
 platform: ruby
 authors:
 - Artyom B
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake