wco_models 3.1.0.150 → 3.1.0.152

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4caf3551289f4e93e12b347077fe099d408423f006c898c6f0a52de21ba83b9
-  data.tar.gz: 6c791312ee20c155590aab0f4979df3f00494cc5b67e3569bdfae0d041547ff1
+  metadata.gz: f5d5b1cf16d12082c6fcd8ffd3d9ae8fef4292c97037c1a8de4a20c0f02a19e1
+  data.tar.gz: 7638d870fac8f5f138ed527a950088b8565afd03a80a56b78768f24e9248b682
 SHA512:
-  metadata.gz: 88fefaaff4c84e73dce70b323bd1700d44c0bf247f0fc302e81b26029a366dfa57a79cd349d0bcce2f46dc7f85457ad900939e61dd0859f48bc09aad8e3f97ce
-  data.tar.gz: 3cbd9b1eff2acc6511c74f383b6f35c8c4f30725ebe0fc79e0db3263ed532e92430975a63f71715a32a8ece1fbd81203684d85b8e7bde877a5277816a660d65f
+  metadata.gz: c4216429fb7f42bc863364edd7dc164305436b3c5ac832565cfccaaf88faf8b2aca62f4351c99b27958ca8f64b892c4f91de51c63c140b057d019037f3148831
+  data.tar.gz: b3db0b20fcb09447fac2d5dadee3d0f966b06a8715ba95291578ecad10e56f41fb95283b987d702ad63a3b120a690c84fa838f86928b299af7341b02a753fed2

data/app/models/wco/log.rb

@@ -6,8 +6,8 @@ class Wco::Log
   include Mongoid::Paranoia
   store_in collection: 'wco_logs'
 
-  field :label,   type: :string
-  field :message, type: :string
+  field :label,   type: :string ## can be the stream: 'stdout' or 'stderr'
+  field :message, type: :string ## can be json
 
   belongs_to :obj, polymorphic: true, optional: true
 

data/app/models/wco/utils.rb

@@ -17,6 +17,15 @@ module Wco::Utils
     out.with_indifferent_access
   end
 
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+  module ClassMethods
+    def list
+      [[nil,nil]] + all.map { |a| [ a, a.id ] }
+    end
+  end
+
   private
 
   def set_slug

data/app/models/wco_hosting/appliance.rb

@@ -3,18 +3,25 @@ class WcoHosting::Appliance
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paranoia
+  include Wco::Utils
   store_in collection: 'wco_appliances'
 
   has_many :logs, as: :obj, class_name: 'Wco::Log'
+  has_many :files,          class_name: 'WcoHosting::File'
+
+  field :rc_json, type: Object, default: '{}'
+  def rc
+    OpenStruct.new JSON.parse rc_json
+  end
 
   belongs_to :leadset,      class_name: 'Wco::Leadset', inverse_of: :appliances
   belongs_to :subscription, class_name: 'Wco::Subscription' # , inverse_of: :appliance
 
-  field :service_name
-  before_validation :set_service_name, on: :create, unless: ->{ service_name }
-  def set_service_name
-    self[:service_name] = host.gsub(".", "_")
-  end
+  # field :service_name
+  # before_validation :set_service_name, on: :create, unless: ->{ service_name }
+  # def set_service_name
+  #   self[:service_name] = host.gsub(".", "_")
+  # end
 
 
   belongs_to :environment, class_name: 'WcoHosting::Environment', inverse_of: :appliances, optional: true
@@ -23,9 +30,9 @@ class WcoHosting::Appliance
   end
 
   field :subdomain
-  field :domain
+  belongs_to :domain, class_name: 'WcoHosting::Domain'
   def host
-    "#{subdomain}.#{domain}"
+    "#{subdomain}.#{domain.name}"
   end
 
   field :n_retries, type: :integer, default: 3
@@ -34,9 +41,7 @@ class WcoHosting::Appliance
   def tmpl
     appliance_tmpl
   end
-  def kind
-    tmpl.kind
-  end
+  delegate :kind, to: :appliance_tmpl
 
   belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost', optional: true
 
@@ -48,7 +53,7 @@ class WcoHosting::Appliance
   field :state, default: STATE_PENDING
 
   def to_s
-    service_name
+    appliance_tmpl # kind
   end
 end
 

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -4,6 +4,7 @@ class WcoHosting::ApplianceTmpl
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paranoia
+  include Wco::Utils
   store_in collection: 'wco_appliance_tmpls'
 
   field :kind, type: :string
@@ -24,12 +25,13 @@ class WcoHosting::ApplianceTmpl
   #   ac.instance_variable_set( :@tmpl, self )
   #   rendered_str = ac.render_to_string("wco_hosting/scripts/nginx_site.conf")
   #   Wco::Log.puts! rendered_str, 'add_nginx_site rendered_str', obj: @obj
-
   #   file = Tempfile.new('prefix')
   #   file.write rendered_str
   #   file.close
   # end
 
+  field :stdout, type: :string, default: ''
+  field :stderr, type: :string, default: ''
 
   field :image
   # validates :image, presence: true
@@ -74,9 +76,7 @@ class WcoHosting::ApplianceTmpl
   has_many :appliances, class_name: 'WcoHosting::Appliance'
   has_many :subscriptions, as: :product, class_name: 'Wco::Subscription'
   has_many :prices, as: :product, class_name: 'Wco::Price'
-
-  # has_and_belongs_to_many :leadsets, class_name: 'Wco::Leadset'
-  # has_many :appliance_tmpl_leadsets, class_name: 'WcoHosting::ApplianceTmplLeadset'
+  has_and_belongs_to_many :task_tmpls, class_name: 'WcoHosting::TaskTmpl'
 
   field :product_id # stripe
 
@@ -90,7 +90,6 @@ class WcoHosting::ApplianceTmpl
     self.product_id = stripe_product.id
   end
 
-
   def to_s
     "#{kind}-#{version}"
   end

data/app/models/wco_hosting/environment.rb

@@ -3,6 +3,7 @@ class WcoHosting::Environment
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Paranoia
+  include Wco::Utils
   store_in collection: 'wco_environments'
 
   belongs_to :leadset,      class_name: 'Wco::Leadset', inverse_of: :environments
@@ -16,6 +17,7 @@ class WcoHosting::Environment
   ## variable @env in execution environments
   field :env_json, type: Object, default: '{}'
 
+
   def to_s
     name
   end

data/app/models/wco_hosting/file.rb

@@ -0,0 +1,16 @@
+
+class WcoHosting::File
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_hosting_files'
+
+  belongs_to :serverhost, class_name: 'WcoHosting::Serverhost'
+  belongs_to :appliance,  class_name: 'WcoHosting::Appliance'
+
+  field :path,         type: :string
+  field :template_erb, type: :string
+  field :pre_exe,      type: :string
+  field :post_exe,     type: :string
+
+end

data/app/models/wco_hosting/runner.rb

@@ -10,6 +10,7 @@ class WcoHosting::Runner
 
   TASK_REDEPLOY_ECS_TASK_DEFINITION = 'redeploy-ecs-task-definition'
   TASK_REDEPLOY_ECS_TASK            = 'redeploy-ecs-task'
+  TASK_SYNC_ECS_TASK                = 'sync-ecs-task'
   TASKS = []
 
   def self.do_exec cmd

data/app/models/wco_hosting/serverhost.rb

@@ -28,6 +28,7 @@ class WcoHosting::Serverhost
   # field :ssh_key
 
   has_many :appliances, class_name: 'WcoHosting::Appliance'
+  has_many :files,      class_name: 'WcoHosting::File'
 
   def create_appliance app
     # puts! app, 'Serverhost#create_appliance'

data/app/models/wco_hosting/task.rb

@@ -5,4 +5,7 @@ class WcoHosting::Task
   include Mongoid::Paranoia
   store_in collection: 'wco_tasks'
 
+  belongs_to :task_tmpl,      class_name: 'WcoHosting::TaskTmpl'
+  belongs_to :appliance_tmpl, class_name: 'WcoHosting::ApplianceTmpl'
+
 end

data/app/models/wco_hosting/task_tmpl.rb

@@ -8,4 +8,13 @@ class WcoHosting::TaskTmpl
   field :slug
   validates :slug, presence: true
 
+  has_many :tasks, class_name: 'WcoHosting::Task'
+  has_and_belongs_to_many :appliance_tmpls, class_name: 'WcoHosting::ApplianceTmpl'
+
+  def to_s
+    slug
+  end
+  def self.list
+    [[nil,nil]] + all.map { |t| [t, t.id] }
+  end
 end

data/app/views/wco/galleries/_form.haml

@@ -8,6 +8,8 @@
     = f.text_field :name
     = f.label :slug
     = f.text_field :slug
+    %label deleted_at
+    = f.text_field :deleted_at
   -# .col-md-2
   -#   .field
   -#     = f.label :premium_tier

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.150
+  version: 3.1.0.152
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2024-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -475,6 +475,7 @@ files:
 - app/models/wco_hosting/appliance_tmpl.rb
 - app/models/wco_hosting/domain.rb
 - app/models/wco_hosting/environment.rb
+- app/models/wco_hosting/file.rb
 - app/models/wco_hosting/runner.rb
 - app/models/wco_hosting/serverhost.rb
 - app/models/wco_hosting/subdomain.rb