legion-data 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1201c65f7728a2af01e9b77ea56b2bf5b1f357c246f12cf84e59790d917a314c
-  data.tar.gz: e7a17e1c023b5514a31952fad0898e4048dc89938888ffcb76632403a1aa3a94
+  metadata.gz: dd32f907af81657448d1fdbebc681b795d536754cec212ccaa154239c13ca48f
+  data.tar.gz: 527fd840b7ae7bdf09f65a5b60af7491bea793427719404448f4c05967fc8266
 SHA512:
-  metadata.gz: '08530a83befaf49097ffcb3caff420f92d4d2fe942e88dce7b847a854d4241ab5d8370cef6168995e725db5fe26ff7773bb6763b7391992974b39bf444563638'
-  data.tar.gz: cfa8d6055185cbea52085d845058538148f497096e13ff3370cd13086b00a062e4dc9861663f749c58781bc23bb37ea87e588b049a20b884dd1f881025d16a50
+  metadata.gz: b41d14cbf4d9e3c62a84a2361ecb2b6143cdc508866bee245bec6c46bf263c8b421ef944ea353f360ac1d704d8777b570cf2ea279be466ceef17f939f9902ad5
+  data.tar.gz: e0acb9226a6c7987b008be0d7e5e9eef22ebb58194ae9613a73846a85d464a071ddc82b17cf5bf3267d467ea1cf42d180047565b85d0565516fb121dbd1f45d1

data/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Legion::Data Changelog
+## v0.2.0
+* Redesigning schema
 
 ## v0.1.1
 * Updated `rubocop.yml` with updated syntax

data/legion-data.gemspec

@@ -37,8 +37,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'rubocop-sequel'
 
-  spec.add_dependency 'legion-logging', '~>0.1'
-  spec.add_dependency 'legion-settings', '~>0.1'
+  spec.add_dependency 'legion-logging'
+  spec.add_dependency 'legion-settings'
 
   if RUBY_ENGINE == 'jruby'
     spec.add_dependency 'jdbc-mysql'

data/lib/legion/data.rb

@@ -1,43 +1,63 @@
 require 'legion/data/version'
+require_relative 'data/settings'
 require 'sequel'
-require 'legion/data/connection'
-require 'legion/data/migration'
-require 'legion/data/model'
+
+require_relative 'data/connection'
+require_relative 'data/model'
+require_relative 'data/migration'
 
 module Legion
   module Data
-    def build(options = {})
-      @connected = false
-      options.merge!(default_options) { |_key, v1, _v2| v1 }
-      @connection = connect(options[:connection]) if options[:connection][:auto_connect]
-      return unless options[:connection][:auto_connect]
-
-      migrate(@connection, options[:migration])
-      model(options[:model]) if options[:model][:auto_load]
-    end
-
-    def connect(_options = {})
-      Legion::Data::Connection.new
-    end
-
-    def migrate(connection, options = {})
-      return false if options.key?(:auto_migrate) && options[:auto_migrate]
-
-      Legion::Data::Migration.new(connection.database.connection)
-    end
-
-    def model(_options = {})
-      Legion::Data::Models.new
-    end
-
-    def default_options
-      { migration:  { auto_migrate: true },
-        model:      { auto_load: true },
-        connection: { auto_connect: true } }
-    end
-
-    def merge_options(options, default = default_options)
-      options.merge!(default) { |_key, v1, _v2| v1 }
+    class << self
+      def setup
+        connection_setup
+        migrate
+        load_models
+        # setup_cache
+      end
+
+      def connection_setup
+        return if Legion::Settings[:data][:connected]
+
+        Legion::Data::Connection.setup
+      end
+
+      def migrate
+        Legion::Data::Migration.migrate
+      end
+
+      def load_models
+        Legion::Data::Models.load
+      end
+
+      def connection
+        Legion::Data::Connection.sequel
+      end
+
+      def setup_cache # rubocop:disable Metrics/AbcSize
+        return if Legion::Settings[:data][:cache][:enable]
+
+        unless Legion::Settings[:cache][:connected]
+          Legion::Logging.warn 'Legion::Data has caching enabled but Legion::Cache is not started'
+        end
+        return unless Legion::Settings[:cache][:connected]
+
+        # Legion::Data::Model::Relationship.plugin :caching, Legion::Cache, ttl: 10
+        Legion::Data::Model::Chain.plugin :caching, Legion::Cache, ttl: 60
+        Legion::Data::Model::Datacenter.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Extension.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Function.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Namespace.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Node.plugin :caching, Legion::Cache, ttl: 10
+        Legion::Data::Model::TaskLog.plugin :caching, Legion::Cache, ttl: 12
+        Legion::Data::Model::Task.plugin :caching, Legion::Cache, ttl: 10
+        Legion::Data::Model::User.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Group.plugin :caching, Legion::Cache, ttl: 120
+      end
+
+      def shutdown
+        Legion::Data::Connection.shutdown
+      end
     end
   end
 end

data/lib/legion/data/connection.rb

@@ -2,28 +2,61 @@ require 'sequel'
 
 module Legion
   module Data
-    class Connection
-      attr_accessor :database
-      def initialize(options = {})
-        options.merge!(default_options) { |_key, v1, _v2| v1 }
-        return unless options[:auto_connect]
-
-        jruby(options) if RUBY_ENGINE == 'jruby'
-        mri(options) unless RUBY_ENGINE == 'jruby'
-      end
+    module Connection
+      class << self
+        attr_reader :sequel
+        if RUBY_ENGINE == 'jruby'
+          require_relative 'connections/jdbc'
+          include Legion::Data::Connections::JDBC
+        else
+          require_relative 'connections/mysql2'
+          include Legion::Data::Connections::MySQL2
+        end
 
-      def default_options
-        { auto_connect: true }
-      end
+        def setup
+          @sequel = ::Sequel.connect(adapter: adapter, **creds_builder)
+          Legion::Settings[:data][:connected] = true
+          return unless Legion::Settings[:data][:connection][:log]
 
-      def jruby(_options = {})
-        require 'legion/data/connections/jdbc'
-        @database = Legion::Data::Connections::JDBC.new
-      end
+          @sequel.logger = Legion::Logging::Logger.new(level: 'debug')
+          @sequel.sql_log_level = Legion::Settings[:data][:connection][:sql_log_level]
+          @sequel.log_warn_duration = Legion::Settings[:data][:connection][:log_warn_duration]
+        end
+
+        def shutdown
+          @sequel.disconnect
+        end
+
+        def creds_builder # rubocop:disable Metrics/AbcSize
+          final_creds = {}
+          final_creds.merge! default_creds
+          final_creds.merge! Legion::Settings[:data][:creds]
+          return final_creds if Legion::Settings[:vault].nil?
+
+          if Legion::Settings[:vault][:connected] && ::Vault.sys.mounts.key?(:database)
+            temp_vault_creds = Legion::Crypt.read('database/creds/legion')
+            final_creds[:user] = temp_vault_creds[:username]
+            final_creds[:password] = temp_vault_creds[:password]
+          end
+
+          final_creds
+        end
+
+        def default_creds
+          {
+            host:            '127.0.0.1',
+            port:            3306,
+            username:        'legion',
+            password:        'legion',
+            database:        'legion',
+            max_connections: 32,
+            preconnect:      'concurrently'
+          }
+        end
 
-      def mri(_options = {})
-        require 'legion/data/connections/mysql2'
-        @database = Legion::Data::Connections::MySQL2.new
+        def adapter
+          'mysql2'
+        end
       end
     end
   end

data/lib/legion/data/connections/base.rb

@@ -2,23 +2,29 @@ module Legion
   module Data
     module Connections
       class Base
+        attr_reader :sequel
         def check_gem(gem = adapter)
           Gem::Specification.find_by_name(gem)
         rescue Gem::MissingSpecError, ArgumentError
           false
         end
 
-        def creds_builder(credentials = {})
+        def creds_builder(credentials = {}) # rubocop:disable Metrics/AbcSize
           creds = {}
+          if Legion::Settings[:vault][:connected] && ::Vault.sys.mounts.key?(:database)
+            creds = Legion::Crypt.read('database/creds/legion')
+            Legion::Logging.info 'Grabbing database creds from vault'
+          end
+
           creds = creds.merge(default_creds) if creds.is_a? Hash
-          creds = creds.merge(Legion::Settings[:data][:mysql]) if Legion::Settings[:data][:mysql].is_a? Hash
+          creds = creds.merge(Legion::Settings[:data][:creds]) if Legion::Settings[:data][:creds].is_a? Hash
           creds = creds.merge(credentials) if credentials.is_a? Hash
           creds
         end
 
         def connect(adapter, creds, _options = {})
           creds[:adapter] = adapter
-          Sequel.connect(creds)
+          @sequel = Sequel.connect(creds)
         end
 
         def settings(options, _connection = @connection)
@@ -39,6 +45,16 @@ module Legion
         def adapter
           'mysql2'
         end
+
+        def default_creds
+          { data: { creds: {
+            host:            '127.0.0.1',
+            user:            'legion',
+            password:        'legion',
+            max_connections: 1000,
+            database:        'legion'
+          } } }
+        end
       end
     end
   end

data/lib/legion/data/connections/mysql2.rb

@@ -1,24 +1,9 @@
-require 'legion/data/connections/mysql_base'
-
 module Legion
   module Data
     module Connections
-      class MySQL2 < Legion::Data::Connections::MySQLBase
-        attr_accessor :connection
-        def initialize(_options = {})
-          Legion::Logging.debug('Connecting to MySQL with MySQL2 Connector')
-          @connection = connect
-
-          Legion::Logging.info("Legion is connected to database #{Legion::Settings[:data][:mysql][:database]}")
-          Legion::Settings[:data][:connected] = true
-        end
-
+      module MySQL2
         def adapter
-          'mysql2'
-        end
-
-        def connect
-          super(adapter, creds_builder)
+          :mysql2
         end
       end
     end

data/lib/legion/data/connections/mysql_base.rb

@@ -3,7 +3,7 @@ require 'legion/data/connections/base'
 module Legion
   module Data
     module Connections
-      class MySQLBase < Legion::Data::Connections::Base
+      module MySQLBase
         def default_creds
           { data: { mysql: {
             host:            '127.0.0.1',

data/lib/legion/data/migration.rb

@@ -2,26 +2,13 @@ require 'sequel/extensions/migration'
 
 module Legion
   module Data
-    class Migration
-      def initialize(connection, options = {})
-        options.merge!(default_options) { |_key, v1, _v2| v1 }
-        migrate(options[:migration_path], connection) if options[:auto_migrate]
-      end
-
-      def default_options
-        { auto_migrate: true, migration_path: __dir__ + '/migrations' }
-      end
-
-      def migrate(path, connection)
-        Legion::Logging.debug("Running Legion::Data.migrate with path: #{path}")
-        Sequel::Migrator.run(connection, path)
-        Legion::Logging.info('Legion::Data finished migrations')
-      rescue Sequel::Migrator::Error => e
-        Legion::Logging.error(e.message)
-        raise e
-      rescue StandardError => e
-        Legion::Logging.error(e.message)
-        raise e unless Legion::Settings[:data][:migrations][:continue_on_fail]
+    module Migration
+      class << self
+        def migrate(connection = Legion::Data.connection, path = __dir__ + '/migrations')
+          Legion::Settings[:data][:migrations][:version] = Sequel::Migrator.run(connection, path)
+          Legion::Logging.info 'Legion::Data::Migration ran successfully to version ' + Legion::Settings[:data][:migrations][:version].to_s # rubocop:disable Layout/LineLength
+          Legion::Settings[:data][:migrations][:ran] = true
+        end
       end
     end
   end

data/lib/legion/data/migrations/002_add_users.rb

@@ -0,0 +1,17 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `users` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `active` tinyint(1) unsigned DEFAULT '1',
+  `name` varchar(128) DEFAULT NULL,
+  `version` tinyint(5) unsigned NOT NULL DEFAULT '1',
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop :users
+  end
+end

data/lib/legion/data/migrations/003_add_groups.rb

@@ -0,0 +1,16 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `groups` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) DEFAULT NULL,
+  `active` tinyint(1) unsigned DEFAULT '1',
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop :groups
+  end
+end

data/lib/legion/data/migrations/004_add_chains.rb

@@ -0,0 +1,25 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `chains` (
+      `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL DEFAULT '',
+  `active` tinyint(1) unsigned DEFAULT '1',
+  `version` int(11) unsigned NOT NULL DEFAULT '1',
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `user_owner` int(11) unsigned DEFAULT NULL,
+  `group_owner` int(11) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  KEY `active` (`active`),
+  KEY `chains_user_owner` (`user_owner`),
+  KEY `chains_group_owner` (`group_owner`),
+  CONSTRAINT `chains_group_owner` FOREIGN KEY (`group_owner`) REFERENCES `groups` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `chains_user_owner` FOREIGN KEY (`user_owner`) REFERENCES `users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop :chains
+  end
+end

data/lib/legion/data/migrations/005_add_envs.rb

@@ -0,0 +1,24 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `environments` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL DEFAULT '',
+  `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `user_owner` int(11) unsigned DEFAULT NULL,
+  `group_owner` int(11) unsigned DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  KEY `active` (`active`),
+  KEY `environments_user_owner` (`user_owner`),
+  KEY `environments_group_owner` (`group_owner`),
+  CONSTRAINT `environments_group_owner` FOREIGN KEY (`group_owner`) REFERENCES `groups` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `environments_user_owner` FOREIGN KEY (`user_owner`) REFERENCES `users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop :environments
+  end
+end

data/lib/legion/data/migrations/006_add_dcs.rb

@@ -0,0 +1,24 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `datacenters` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL DEFAULT '',
+  `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `user_owner` int(11) unsigned DEFAULT NULL,
+  `group_owner` int(11) unsigned DEFAULT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`),
+  KEY `active` (`active`),
+  KEY `datacenters_user_owner` (`user_owner`),
+  KEY `datacenters_group_owner` (`group_owner`),
+  CONSTRAINT `datacenters_group_owner` FOREIGN KEY (`group_owner`) REFERENCES `groups` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `datacenters_user_owner` FOREIGN KEY (`user_owner`) REFERENCES `users` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop :datacenters
+  end
+end