wco_models 3.1.0.148 → 3.1.0.150

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d659451d072adbf696dd6a317cb383990bd0d8da8460b984c38f4adc7c867ff
-  data.tar.gz: 80b994dce92435205be381c9fb1b83f8fe889f9e7b455766cf133576a910de7e
+  metadata.gz: e4caf3551289f4e93e12b347077fe099d408423f006c898c6f0a52de21ba83b9
+  data.tar.gz: 6c791312ee20c155590aab0f4979df3f00494cc5b67e3569bdfae0d041547ff1
 SHA512:
-  metadata.gz: c5d4f74a454d00bda9c508502dcde00fcea82ab1ff2b07bf34176780127402e1d0788eec5fa4c9ec0df897d0fb6929edc15f8c0fda7c5cbfec33397efea190fb
-  data.tar.gz: dd976a05848a79c8fdd07820ccec5a0244892309d79cf3b1c6911f42f859d29fe76d7366168600ae1b145919335db004d60c278c17a63ec2df2252737d71e19a
+  metadata.gz: 88fefaaff4c84e73dce70b323bd1700d44c0bf247f0fc302e81b26029a366dfa57a79cd349d0bcce2f46dc7f85457ad900939e61dd0859f48bc09aad8e3f97ce
+  data.tar.gz: 3cbd9b1eff2acc6511c74f383b6f35c8c4f30725ebe0fc79e0db3263ed532e92430975a63f71715a32a8ece1fbd81203684d85b8e7bde877a5277816a660d65f

data/app/models/wco_email/email_filter.rb

@@ -17,6 +17,9 @@ class WcoEmail::EmailFilter
   field :body_regex
   field :body_exact
 
+  field :skip_from_regex
+  field :skip_to_exact
+
   belongs_to :tag, class_name: 'Wco::Tag', inverse_of: :email_filters, optional: true
 
   KIND_AUTORESPOND_TMPL = 'autorespond-template'

data/app/models/wco_email/message_stub.rb

@@ -194,7 +194,22 @@ class WcoEmail::MessageStub
 
       if reason
         puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
-        @message.apply_filter( filter )
+
+        ## skip
+        skip_reason = nil
+        if filter.skip_to_exact.present? && @message.to&.downcase.include?( filter.skip_to_exact.downcase )
+          skip_reason = 'skip_to_exact'
+        end
+        if filter.skip_from_regex.present? && @message.from.downcase.match( filter.skip_from_regex )
+          skip_reason = 'skip_from_regex'
+        end
+
+        if skip_reason
+          puts! "NOT Applying filter #{filter} to conv #{@message.conversation} for matching #{skip_reason}" if DEBUG
+        else
+          @message.apply_filter( filter )
+        end
+
       end
     end
 

data/app/models/wco_hosting/appliance.rb

@@ -16,7 +16,11 @@ class WcoHosting::Appliance
     self[:service_name] = host.gsub(".", "_")
   end
 
+
   belongs_to :environment, class_name: 'WcoHosting::Environment', inverse_of: :appliances, optional: true
+  def environment_name
+    environment&.name
+  end
 
   field :subdomain
   field :domain
@@ -34,13 +38,13 @@ class WcoHosting::Appliance
     tmpl.kind
   end
 
-  belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost'
+  belongs_to :serverhost,  class_name: 'WcoHosting::Serverhost', optional: true
 
   field :port
 
-  STATE_PENDING = 'state-pending'
-  STATE_LIVE    = 'state-live'
-  STATE_TERM    = 'state-term'
+  STATE_PENDING    = 'pending'
+  STATE_LIVE       = 'live'
+  STATE_TERMINATED = 'terminated'
   field :state, default: STATE_PENDING
 
   def to_s

data/app/models/wco_hosting/appliance_tmpl.rb

@@ -18,11 +18,31 @@ class WcoHosting::ApplianceTmpl
   end
   field :descr, type: :string
 
-  field :image
-  validates :image, presence: true
+  field :ecs_task_definition_erb, type: :string
+  # def ecs_task_definition
+  #   ac   = ActionController::Base.new
+  #   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 :volume_zip
-  validates :volume_zip, presence: true
+  field :image
+  # validates :image, presence: true
+
+  field :volume_zip_url
+  field :volume_zip_exe
+  def volume_zip
+    if volume_zip_exe
+      eval( volume_zip_exe )
+    else
+      volume_zip_url
+    end
+  end
 
   ## 2023-12-08 :: These names are impossible to change already.
   KIND_CRM        = 'crm'

data/app/models/wco_hosting/environment.rb

@@ -13,6 +13,9 @@ class WcoHosting::Environment
 
   has_many :appliances, class_name: 'WcoHosting::Appliance', inverse_of: :environments
 
+  ## variable @env in execution environments
+  field :env_json, type: Object, default: '{}'
+
   def to_s
     name
   end

data/app/models/wco_hosting/runner.rb

@@ -0,0 +1,26 @@
+
+require 'net/scp'
+require 'open3'
+require 'droplet_kit'
+
+class WcoHosting::Runner
+
+  def self.create_ecs_task
+  end
+
+  TASK_REDEPLOY_ECS_TASK_DEFINITION = 'redeploy-ecs-task-definition'
+  TASK_REDEPLOY_ECS_TASK            = 'redeploy-ecs-task'
+  TASKS = []
+
+  def self.do_exec cmd
+    Wco::Log.puts! cmd, '#do_exec', obj: @obj
+
+    stdout, stderr, status = Open3.capture3(cmd)
+    status = status.to_s.split.last.to_i
+    Wco::Log.puts! stdout, 'stdout', obj: @obj
+    Wco::Log.puts! stderr, 'stderr', obj: @obj
+    Wco::Log.puts! status, 'status', obj: @obj
+    return { stdout: stdout, stderr: stderr, status: status }
+  end
+
+end

data/app/models/wco_hosting/task.rb

@@ -0,0 +1,8 @@
+
+class WcoHosting::Task
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_tasks'
+
+end

data/app/models/wco_hosting/task_tmpl.rb

@@ -0,0 +1,11 @@
+
+class WcoHosting::TaskTmpl
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  include Mongoid::Paranoia
+  store_in collection: 'wco_task_tmpls'
+
+  field :slug
+  validates :slug, presence: true
+
+end

data/app/views/wco_hosting/ecs_task_definitions/demmitv.json

@@ -0,0 +1,40 @@
+
+{
+  "family": "demmitv_drupal",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+      {
+          "name": "demmitv_drupal_ecs1",
+          "image": "piousbox/php81:0.0.2",
+          "portMappings": [
+              {
+                  "containerPort": 80,
+                  "hostPort": 80,
+                  "protocol": "tcp"
+              }
+          ],
+          "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+              "awslogs-create-group": "true",
+              "awslogs-group": "drupal-1",
+              "awslogs-region": "us-east-2",
+              "awslogs-stream-prefix": "wco-"
+            }
+          },
+          "essential": true,
+          "entryPoint": [
+            "sh",
+            "-c"
+          ],
+          "command": [
+              "/bin/sh -c \"cd /var/www/html && curl -u abba:simplerpassword https://secrets.wasya.co/demmitv_drupal_ecs1.zip --output demmitv_drupal_ecs1-0.0.0.zip && unzip -o demmitv_drupal_ecs1-0.0.0.zip && cd web && apachectl -D FOREGROUND \" "
+          ]
+      }
+  ],
+  "requiresCompatibilities": [ "FARGATE" ],
+  "cpu": "256",
+  "memory": "512"
+  }

data/app/views/wco_hosting/ecs_task_definitions/drupal.json-template

@@ -0,0 +1,40 @@
+
+{
+  "family": "drupal",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+      {
+          "name": "<%= @app.kind %>_drupal_<%= @app.environment_name %>",
+          "image": "piousbox/php81:0.0.2",
+          "portMappings": [
+              {
+                  "containerPort": 80,
+                  "hostPort": 80,
+                  "protocol": "tcp"
+              }
+          ],
+          "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+              "awslogs-create-group": "true",
+              "awslogs-group": "drupal-1",
+              "awslogs-region": "us-east-2",
+              "awslogs-stream-prefix": "wco-"
+            }
+          },
+          "essential": true,
+          "entryPoint": [
+            "sh",
+            "-c"
+          ],
+          "command": [
+              "/bin/sh -c \"cd /var/www/html && curl -u abba:simplerpassword https://secrets.wasya.co/<%= @app.kind %>_drupal_<%= @app.environment_name %>-<%= @app.version %>.zip && unzip <%= @app.kind %>_drupal_<%= @app.environment_name %>-<%= @app.version %>.zip && composer install && apachectl -D FOREGROUND \" "
+          ]
+      }
+  ],
+  "requiresCompatibilities": [ "FARGATE" ],
+  "cpu": "256",
+  "memory": "512"
+  }

data/app/views/wco_hosting/ecs_task_definitions/example1.json

@@ -0,0 +1,41 @@
+{
+  "family": "example",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+    {
+      "name": "example",
+      "image": "public.ecr.aws/docker/library/httpd:latest",
+      "portMappings": [
+        {
+          "containerPort": 80,
+          "hostPort": 80,
+          "protocol": "tcp"
+        }
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-create-group": "true",
+          "awslogs-group": "awslogs-group-1",
+          "awslogs-region": "us-east-1",
+          "awslogs-stream-prefix": "wco1-"
+        }
+      },
+      "essential": true,
+      "entryPoint": [
+        "sh",
+        "-c"
+      ],
+      "command": [
+        "/bin/sh -c \"echo '<html> <head> <title>Amazon ECS Sample App</title> <style>body {margin-top: 40px; background-color: #333;} </style> </head><body> <div style=color:white;text-align:center> <h1>Amazon ECS Sample App</h1> <h2>Congratulations!</h2> <p>Your application is now running on a container in Amazon ECS.</p> </div></body></html>' >  /usr/local/apache2/htdocs/index.html && httpd-foreground\""
+      ]
+    }
+  ],
+  "requiresCompatibilities": [
+    "FARGATE"
+  ],
+  "cpu": "256",
+  "memory": "512"
+}

data/app/views/wco_hosting/ecs_task_definitions/example2.txt-trash

@@ -0,0 +1,54 @@
+{
+    "containerDefinitions": [
+        {
+            "name": "wordpress",
+            "links": [
+                "mysql"
+            ],
+            "image": "wordpress",
+            "essential": true,
+            "portMappings": [
+                {
+                    "containerPort": 80,
+                    "hostPort": 80
+                }
+            ],
+            "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-create-group": "true",
+                    "awslogs-group": "awslogs-wordpress",
+                    "awslogs-region": "us-west-2",
+                    "awslogs-stream-prefix": "awslogs-example"
+                }
+            },
+            "memory": 500,
+            "cpu": 10
+        },
+        {
+            "environment": [
+                {
+                    "name": "MYSQL_ROOT_PASSWORD",
+                    "value": "password"
+                }
+            ],
+            "name": "mysql",
+            "image": "mysql",
+            "cpu": 10,
+            "memory": 500,
+            "essential": true,
+            "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-create-group": "true",
+                    "awslogs-group": "awslogs-mysql",
+                    "awslogs-region": "us-west-2",
+                    "awslogs-stream-prefix": "awslogs-example",
+                    "mode": "non-blocking",
+                    "max-buffer-size": "25m"
+                }
+            }
+        }
+    ],
+    "family": "awslogs-example"
+}

data/app/views/wco_hosting/ecs_task_definitions/hw1.json

@@ -0,0 +1,40 @@
+
+{
+  "family": "helloworld",
+  "networkMode": "awsvpc",
+  "taskRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "executionRoleArn": "arn:aws:iam::831556125887:role/ecs_role_1",
+  "containerDefinitions": [
+      {
+          "name": "helloworld",
+          "image": "piousbox/php82:0.0.2",
+          "portMappings": [
+              {
+                  "containerPort": 80,
+                  "hostPort": 80,
+                  "protocol": "tcp"
+              }
+          ],
+          "logConfiguration": {
+            "logDriver": "awslogs",
+            "options": {
+              "awslogs-create-group": "true",
+              "awslogs-group": "awslogs-group-1",
+              "awslogs-region": "us-east-1",
+              "awslogs-stream-prefix": "wco1-"
+            }
+          },
+          "essential": true,
+          "entryPoint": [
+            "sh",
+            "-c"
+          ],
+          "command": [
+              "/bin/sh -c \"cd /var/www/html && wget https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2024/03/28014630/helloworld-0.0.1.zip && unzip helloworld-0.0.1.zip && apachectl -D FOREGROUND \" "
+          ]
+      }
+  ],
+  "requiresCompatibilities": [ "FARGATE" ],
+  "cpu": "256",
+  "memory": "512"
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.148
+  version: 3.1.0.150
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 2024-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -475,8 +475,11 @@ files:
 - app/models/wco_hosting/appliance_tmpl.rb
 - app/models/wco_hosting/domain.rb
 - app/models/wco_hosting/environment.rb
+- app/models/wco_hosting/runner.rb
 - app/models/wco_hosting/serverhost.rb
 - app/models/wco_hosting/subdomain.rb
+- app/models/wco_hosting/task.rb
+- app/models/wco_hosting/task_tmpl.rb
 - app/views/layouts/wco/application.haml
 - app/views/wco/_alerts_notices.haml
 - app/views/wco/_analytics.erb
@@ -642,9 +645,15 @@ files:
 - app/views/wco_email/email_layouts/_test_tracking_footer.haml
 - app/views/wco_email/email_layouts/_wasyaco_roundborders.html.erb
 - app/views/wco_hosting/docker-compose/dc-any.erb
-- app/views/wco_hosting/docker-compose/dc-helloworld.erb
-- app/views/wco_hosting/docker-compose/dc-react.erb
-- app/views/wco_hosting/docker-compose/dc-wordpress.erb
+- app/views/wco_hosting/docker-compose/trash/dc-helloworld.erb
+- app/views/wco_hosting/docker-compose/trash/dc-react.erb
+- app/views/wco_hosting/docker-compose/trash/dc-wordpress.erb
+- app/views/wco_hosting/ecs_task_definitions/demmitv.json
+- app/views/wco_hosting/ecs_task_definitions/demmitv_drupal_ecs1-0.0.0.zip
+- app/views/wco_hosting/ecs_task_definitions/drupal.json-template
+- app/views/wco_hosting/ecs_task_definitions/example1.json
+- app/views/wco_hosting/ecs_task_definitions/example2.txt-trash
+- app/views/wco_hosting/ecs_task_definitions/hw1.json
 - app/views/wco_hosting/scripts/create_volume.erb
 - app/views/wco_hosting/scripts/nginx_site.conf.erb
 - config/initializers/assets.rb