altaire-siren 0.1.0 → 0.1.2

data/lib/siren/schemabuilder.rb

@@ -0,0 +1,56 @@
+
+module Siren
+module JSONSchema
+class SchemaBuilder
+
+  def initialize (&block)
+    # @context = { type: "object", additionalProperties: false, properties: {} }
+    singleton_class.class_exec(&block)
+    schema = build()
+    puts JSON.parse(schema.to_json).to_yaml
+  end
+
+  def number (min: nil, max: nil, excl: nil, mul: nil)
+    { type: "number", minimum: min, maximum: max, exclusiveMaximum: excl, multipleOf: mul }.compact
+  end
+
+  def integer (min: nil, max: nil, excl: nil, mul: nil)
+    { type: "integer", minimum: min, maximum: max, exclusiveMaximum: excl, multipleOf: mul }.compact
+  end
+
+  def bool ()
+    { type: "boolean" }
+  end
+
+  alias boolean bool
+
+  def null ()
+    { type: "null" }
+  end
+
+  def string (pattern = nil, min: nil, max: nil)
+    pattern = Regexp.escape(pattern) if pattern.is_a?(String)
+    pattern = Regexp.new(pattern.map{|p|Regexp.escape(p)}.join("|")) if pattern.is_a?(Array)
+    pattern = pattern.inspect[1..-2] if pattern.is_a?(Regexp)
+    { type: "string", minLength: min, maxLength: max, pattern: pattern }.compact
+  end
+
+  def array (itemType, min: nil, max: nil, uniq: nil, extra: nil)
+    { type: "array", items: itemType, minItems: min, maxItems: max, uniqueItems: uniq, additionalItems: extra}.compact
+  end
+
+  def hash (propType)
+    { type: "object", additionalProperties: propType }.compact
+  end
+
+  def object (props, extra: false, required: nil)
+    { type: "object", additionalProperties: extra, required: required, properties: props }.compact
+  end
+
+  def any (*options)
+    { anyOf: options }
+  end
+
+end
+end
+end

data/lib/siren/song.rb

@@ -12,7 +12,7 @@ module Siren
 
     def initialize (data)
       @name = data["metadata"]["name"]
-      @ns = data["metadata"]["namespace"]
+      @ns = data["metadata"]["namespace"] || @name
       @spec = data["spec"]
       process()
     end
@@ -20,13 +20,18 @@ module Siren
     def get (what, key)
       return [] unless what.has_key?(key)
       val = what[key]
-      return val if val.is_a?(Array)
+      if val.is_a?(Array)
+        if val.count{|v|v.is_a?(Hash) && !(v.has_key?(:name) || v.has_key?("name") || v.has_key?(:fullName) || v.has_key?("fullName"))} > 1
+          raise "`#{key}`: only one can be anonymous"
+        end
+        return val
+      end
       return [val]
     end
 
     def process ()
       @env = {}
-      @env.merge! process_env(@spec["env"])
+      @env.merge! process_env(@spec["env"] || {})
       @services = get(@spec, "service").map do |svc|
         svc
       end
@@ -44,23 +49,6 @@ module Siren
       return hash
     end
 
-    def to_yaml
-      data = {
-        "apiVersion" => "altaire.com/v1alpha1",
-        "kind" => "Song",
-        "metadata" => { "name" => @name, "namespace" => @ns }.compact,
-        "spec" => {
-          "services" => @services,
-          "env" => @env,
-        }
-      }
-      JSON.parse(data.to_json).to_yaml
-    end
-
-    def makename (*parts)
-      parts.compact.join("-")
-    end
-
     def env_to_k8s (hash)
       res = []
       hash.each do |name, value|
@@ -69,12 +57,28 @@ module Siren
       res
     end
 
+    def annotations
+      {
+        "siren.altaire.xyz/song": @name,
+      }
+    end
+
+    def makename (base, obj, name = "name", fullName = "fullName", suffix = nil)
+
+      return obj[fullName] if obj[fullName]
+      [base, name ? obj[name] : nil, suffix].compact.join("-")
+    end
+
     def to_deployment (svc)
-      name = makename(@name, svc["name"])
+      name = makename(@name, svc)
       @stack.things << {
         apiVersion: "apps/v1",
         kind: "Deployment",
-        metadata: { name: name, "namespace" => @ns }.compact,
+        metadata: {
+          annotations: annotations,
+          name: name,
+          namespace: @ns,
+        }.compact,
         spec: {
           selector: {
             matchLabels: {
@@ -83,13 +87,13 @@ module Siren
           },
           template: {
             metadata: {
+              annotations: annotations,
               labels: {
                 service: name
               }
             },
             spec: {
               containers: [
-                name: name,
                 image: svc["image"],
                 env: env_to_k8s(env.merge(svc["env"] || {})),
               ],
@@ -101,35 +105,47 @@ module Siren
     end
 
     def to_service (svc)
-      name = makename(@name, svc["name"])
-      @stack.things << {
-        apiVersion: "v1",
-        kind: "Service",
-        metadata: { name: name, "namespace" => @ns }.compact,
-        spec: {
-          selector: {
-            service: name
-          },
-          ports: get(svc, "publish").map do |publish|
-            {
-              targetPort: publish["port"],
-              port: publish["externalPort"] || 80,
-            }
-          end
-        },
-      }
+      svcname = makename(@name, svc)
+      get(svc, "publish").group_by{|x|x["loadBalancer"]}.each do |loadbalancer, publish|
+        name = makename(svcname, publish[0], "loadBalancer")
+        @stack.things << {
+          apiVersion: "v1",
+          kind: "Service",
+          metadata: {
+            annotations: annotations,
+            name: name,
+            namespace: @ns,
+          }.compact,
+          spec: {
+            selector: {
+              service: svcname,
+            },
+            ports: publish.map do |publish|
+              {
+                targetPort: publish["port"] || 80,
+                port: publish["externalPort"] || publish["port"] || 80,
+              }
+            end,
+            type: loadbalancer ? "LoadBalancer" : nil
+          }.compact,
+        }
+      end
     end
 
     def to_certificate (svc)
-      name = makename(@name, svc["name"])
+      name = makename(@name, svc)
       get(svc, "publish").map do |publish|
         get(publish, "domain").map do |domain|
           @stack.things << {
             apiVersion: "cert-manager.io/v1alpha2",
             kind: "Certificate",
-            metadata: { name: name, "namespace" => @ns }.compact,
+            metadata: {
+              annotations: annotations,
+              name: name,
+              namespace: @ns,
+            }.compact,
             spec: {
-              secretName: makename(name, domain, "tls"),
+              secretName: [name, get(publish, "domain").length > 1 ? domain : nil, "tls"].compact.join("-"),
               duration: "2160h",
               renewBefore: "360h",
               commonName: domain,
@@ -142,16 +158,20 @@ module Siren
     end
 
     def to_domain (svc)
-      name = makename(@name, svc["name"])
+      name = makename(@name, svc)
       get(svc, "publish").map do |publish|
         get(publish, "domain").map do |domain|
           @stack.things << {
             apiVersion: "altaire.com/v1alpha1",
             kind: "Domain",
-            metadata: { name: makename(name, domain), "namespace" => @ns }.compact,
+            metadata: {
+              annotations: annotations,
+              name: [name, get(publish, "domain").length > 1 ? domain : nil].compact.join("-"),
+              namespace: @ns,
+            }.compact,
             spec: {
               domain: domain,
-              service: "traefik",
+              service: publish["loadBalancer"] ? makename(name, publish["loadBalancer"]) : "traefik",
             }
           }
         end
@@ -159,15 +179,20 @@ module Siren
     end
 
     def to_ingress_route (svc)
-      name = makename(@name, svc["name"])
+      name = makename(@name, svc)
       get(svc, "publish").map do |publish|
+        next if publish["loadBalancer"]
         get(publish, "domain").map do |domain|
           @stack.things << {
             apiVersion: "traefik.containo.us/v1alpha1",
             kind: "IngressRoute",
-            metadata: { name: makename(name, domain), "namespace" => @ns }.compact,
+            metadata: {
+              annotations: annotations,
+              name: [name, get(publish, "domain").length > 1 ? domain : nil].compact.join("-"),
+              namespace: @ns,
+            }.compact,
             spec: {
-              tls: { secretName: makename(name, domain, "tls") },
+              tls: { secretName: [name, get(publish, "domain").length > 1 ? domain : nil, "tls"].compact.join("-") },
               routes: [
                 {
                   match: "Host(`#{domain}`)",
@@ -192,7 +217,10 @@ module Siren
       @stack.things << {
         apiVersion: "v1",
         kind: "Namespace",
-        metadata: { name: @ns },
+        metadata: {
+          annotations: annotations,
+          name: @ns,
+        }.compact,
       }
     end
 

data/lib/siren/stack.rb

@@ -14,9 +14,13 @@ module Siren
       @things = []
     end
 
+    def << (thing)
+      @things << thing
+    end
+
     def to_yaml ()
-      @things.map do |thing|
-        JSON.parse(thing.to_json).to_yaml
+      @things.uniq.map do |thing|
+        JSON.parse(thing.deep_compact.to_json).to_yaml
       end.join
     end
 

data/lib/siren/version.rb

@@ -1,3 +1,3 @@
 module Siren
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/schemas/docker-compose.yaml

@@ -0,0 +1,78 @@
+---
+type: object
+additionalProperties: false
+properties:
+  version:
+    type: string
+  services:
+    type: object
+    additionalProperties:
+      type: object
+      additionalProperties: false
+      properties:
+        image:
+          type: string
+        build:
+          type: string
+        ports:
+          type: array
+          items:
+            type: string
+        volumes:
+          type: array
+          items:
+            type: string
+        environment:
+          anyOf:
+          - type: array
+            items:
+              type: string
+          - type: object
+            additionalProperties:
+              type: string
+        deploy:
+          type: object
+          additionalProperties: false
+          properties:
+            replicas:
+              type: integer
+        command:
+          anyOf:
+          - type: string
+          - type: array
+            items:
+              type: string
+  x-domains:
+    type: array
+    items:
+      type: object
+      additionalProperties: false
+      properties:
+        name:
+          type: string
+        path:
+          type: string
+        service:
+          type: string
+        port:
+          type: string
+        auth:
+          type: string
+  x-ports:
+    type: array
+    items:
+      type: object
+      additionalProperties: false
+      properties:
+        service:
+          type: string
+        inside:
+          type: string
+        outside:
+          type: string
+        protocol:
+          type: string
+  x-env:
+    type: object
+    additionalProperties:
+      type: string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: altaire-siren
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jose
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: json-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,64 +139,26 @@ files:
 - altaire-siren.gemspec
 - bin/console
 - bin/setup
+- build-schema.rb
 - docs/docs/commands/crypto.md
 - docs/docs/commands/song.md
 - docs/docs/index.md
 - docs/mkdocs.yml
 - docs/serve.sh
-- docs/site/404.html
-- docs/site/assets/fonts/font-awesome.css
-- docs/site/assets/fonts/material-icons.css
-- docs/site/assets/fonts/specimen/FontAwesome.ttf
-- docs/site/assets/fonts/specimen/FontAwesome.woff
-- docs/site/assets/fonts/specimen/FontAwesome.woff2
-- docs/site/assets/fonts/specimen/MaterialIcons-Regular.ttf
-- docs/site/assets/fonts/specimen/MaterialIcons-Regular.woff
-- docs/site/assets/fonts/specimen/MaterialIcons-Regular.woff2
-- docs/site/assets/images/favicon.png
-- docs/site/assets/images/icons/bitbucket.1b09e088.svg
-- docs/site/assets/images/icons/github.f0b8504a.svg
-- docs/site/assets/images/icons/gitlab.6dd19c00.svg
-- docs/site/assets/javascripts/application.c648116f.js
-- docs/site/assets/javascripts/lunr/lunr.da.js
-- docs/site/assets/javascripts/lunr/lunr.de.js
-- docs/site/assets/javascripts/lunr/lunr.du.js
-- docs/site/assets/javascripts/lunr/lunr.es.js
-- docs/site/assets/javascripts/lunr/lunr.fi.js
-- docs/site/assets/javascripts/lunr/lunr.fr.js
-- docs/site/assets/javascripts/lunr/lunr.hu.js
-- docs/site/assets/javascripts/lunr/lunr.it.js
-- docs/site/assets/javascripts/lunr/lunr.ja.js
-- docs/site/assets/javascripts/lunr/lunr.jp.js
-- docs/site/assets/javascripts/lunr/lunr.multi.js
-- docs/site/assets/javascripts/lunr/lunr.nl.js
-- docs/site/assets/javascripts/lunr/lunr.no.js
-- docs/site/assets/javascripts/lunr/lunr.pt.js
-- docs/site/assets/javascripts/lunr/lunr.ro.js
-- docs/site/assets/javascripts/lunr/lunr.ru.js
-- docs/site/assets/javascripts/lunr/lunr.stemmer.support.js
-- docs/site/assets/javascripts/lunr/lunr.sv.js
-- docs/site/assets/javascripts/lunr/lunr.th.js
-- docs/site/assets/javascripts/lunr/lunr.tr.js
-- docs/site/assets/javascripts/lunr/tinyseg.js
-- docs/site/assets/javascripts/lunr/wordcut.js
-- docs/site/assets/javascripts/modernizr.74668098.js
-- docs/site/assets/stylesheets/application-palette.a8b3c06d.css
-- docs/site/assets/stylesheets/application.30686662.css
-- docs/site/commands/crypto/index.html
-- docs/site/commands/song/index.html
-- docs/site/index.html
-- docs/site/search/search_index.json
-- docs/site/sitemap.xml
-- docs/site/sitemap.xml.gz
 - exe/siren
+- fantasia-export.rb
 - lib/siren.rb
 - lib/siren/cli.rb
+- lib/siren/compose.rb
+- lib/siren/compose/service.rb
+- lib/siren/compose/types.rb
 - lib/siren/crypto.rb
+- lib/siren/schemabuilder.rb
 - lib/siren/song.rb
 - lib/siren/stack.rb
 - lib/siren/version.rb
 - public.jwk
+- schemas/docker-compose.yaml
 homepage: http://docs.altaire.xyz/siren
 licenses:
 - MIT