legion-data 0.1.0 → 1.1.4

data/legion-data.gemspec

@@ -10,24 +10,36 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Used by Legion to connect to the database'
   spec.description   = 'The Legion connect gem'
-  spec.homepage      = 'https://bitbucket.org/legion-io/legion-data'
+  spec.homepage = 'https://bitbucket.org/legion-io/legion-data'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.metadata['bug_tracker_uri'] = 'https://bitbucket.org/legion-io/legion-data/issues?status=new&status=open'
+  spec.metadata['changelog_uri'] = 'https://bitbucket.org/legion-io/legion-data/src/CHANGELOG.md'
+  spec.metadata['documentation_uri'] = 'https://bitbucket.org/legion-io/legion-data'
+  spec.metadata['homepage_uri'] = 'https://bitbucket.org/legion-io/legion-data'
+  spec.metadata['source_code_uri'] = 'https://bitbucket.org/legion-io/legion-data'
+  spec.metadata['wiki_uri'] = 'https://bitbucket.org/legion-io/legion-data/wiki/Home'
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
+  spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'codecov', '~> 0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0'
-  spec.add_development_dependency 'rubocop', '~> 0'
+  spec.add_development_dependency 'codecov'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-md'
+  spec.add_development_dependency 'rubocop-performance'
+  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,61 @@
 require 'legion/data/version'
+require 'legion/data/settings'
 require 'sequel'
+
 require 'legion/data/connection'
-require 'legion/data/migration'
 require 'legion/data/model'
+require 'legion/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
+        return if Legion::Settings[:data][:cache][:enabled]
+
+        return unless defined?(::Legion::Cache)
+
+        Legion::Data::Model::Relationship.plugin :caching, Legion::Cache, ttl: 10
+        Legion::Data::Model::Runner.plugin :caching, Legion::Cache, ttl: 60
+        Legion::Data::Model::Chain.plugin :caching, Legion::Cache, ttl: 60
+        Legion::Data::Model::Datacenter.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Function.plugin :caching, Legion::Cache, ttl: 120
+        Legion::Data::Model::Extension.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
+        Legion::Logging.info 'Legion::Data connected to Legion::Cache'
+      end
+
+      def shutdown
+        Legion::Data::Connection.shutdown
+      end
     end
   end
 end

data/lib/legion/data/connection.rb

@@ -2,28 +2,64 @@ 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_accessor :sequel
 
-      def default_options
-        { auto_connect: true }
-      end
+        def adapter
+          @adapter ||= RUBY_ENGINE == 'jruby' ? :jdbc : :mysql2
+        end
 
-      def jruby(_options = {})
-        require 'legion/data/connections/jdbc'
-        @database = Legion::Data::Connections::JDBC.new
-      end
+        def setup
+          @sequel = if adapter == :mysql2
+                      ::Sequel.connect(adapter: adapter, **creds_builder)
+                    else
+                      ::Sequel.connect("jdbc:mysql://#{creds_builder[:host]}:#{creds_builder[:port]}/#{creds_builder[:database]}?user=#{creds_builder[:username]}&password=#{creds_builder[:password]}&serverTimezone=UTC") # rubocop:disable Layout/LineLength
+                    end
+          Legion::Settings[:data][:connected] = true
+          return if Legion::Settings[:data][:connection].nil? || Legion::Settings[:data][:connection][:log].nil?
+
+          @sequel.logger = Legion::Logging
+          @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
+          Legion::Settings[:data][:connected] = false
+        end
+
+        def creds_builder(final_creds = {})
+          final_creds.merge! Legion::Data::Settings.creds
+          final_creds.merge! Legion::Settings[:data][:creds] if Legion::Settings[:data][:creds].is_a? Hash
+
+          if Legion::Settings[:data][:connection][:max_connections].is_a? Integer
+            final_creds[:max_connections] = Legion::Settings[:data][:connection][:max_connections]
+          end
+
+          final_creds[:preconnect] = :concurrently if Legion::Settings[:data][:connection][:preconnect]
+
+          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 mri(_options = {})
-        require 'legion/data/connections/mysql2'
-        @database = Legion::Data::Connections::MySQL2.new
+        def default_creds
+          {
+            host:            '127.0.0.1',
+            port:            3306,
+            username:        'legion',
+            password:        'legion',
+            database:        'legion',
+            max_connections: 4
+          }
+        end
       end
     end
   end

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 => ex
-        Legion::Logging.error(ex.message)
-        raise ex
-      rescue StandardError => ex
-        Legion::Logging.error(ex.message)
-        raise ex unless Legion::Settings[:data][:migrations][:continue_on_fail]
+    module Migration
+      class << self
+        def migrate(connection = Legion::Data.connection, path = "#{__dir__}/migrations", **opts)
+          Legion::Settings[:data][:migrations][:version] = Sequel::Migrator.run(connection, path, **opts)
+          Legion::Logging.info("Legion::Data::Migration ran successfully to version #{Legion::Settings[:data][:migrations][:version]}") # rubocop:disable Layout/LineLength
+          Legion::Settings[:data][:migrations][:ran] = true
+        end
       end
     end
   end

data/lib/legion/data/migrations/001_add_schema_columns.rb

@@ -8,7 +8,7 @@ Sequel.migration do
   end
 
   down do
-    alter_table(:schema) do
+    alter_table(:schema_info) do
       drop_column :catalog
       drop_column :updated_at
       drop_column :created_at

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_table :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_table :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_table :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_table :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_table :datacenters
+  end
+end

data/lib/legion/data/migrations/007_add_nodes.rb

@@ -0,0 +1,26 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `nodes` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(128) NOT NULL DEFAULT '',
+  `datacenter_id` int(11) unsigned DEFAULT NULL,
+  `environment_id` int(11) unsigned DEFAULT NULL,
+  `status` varchar(255) NOT NULL DEFAULT 'unknown',
+  `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `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 `status` (`status`),
+  KEY `node_datacenter_id` (`datacenter_id`),
+  KEY `node_environment_id` (`environment_id`),
+  CONSTRAINT `node_datacenter_id` FOREIGN KEY (`datacenter_id`) REFERENCES `datacenters` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
+  CONSTRAINT `node_environment_id` FOREIGN KEY (`environment_id`) REFERENCES `environments` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop_table :nodes
+  end
+end

data/lib/legion/data/migrations/008_add_settings.rb

@@ -0,0 +1,18 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `settings` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `key` varchar(128) NOT NULL,
+  `value` varchar(256) NOT NULL,
+  `encrypted` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key` (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop_table :settings
+  end
+end

data/lib/legion/data/migrations/009_add_extensions.rb

@@ -0,0 +1,25 @@
+Sequel.migration do
+  up do
+    run "CREATE TABLE `extensions` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `active` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  `name` varchar(128) NOT NULL,
+  `namespace` varchar(128) NOT NULL DEFAULT '',
+  `exchange` varchar(255) DEFAULT NULL,
+  `uri` varchar(256) DEFAULT NULL,
+  `user_owner` int(11) unsigned DEFAULT NULL,
+  `group_owner` int(11) unsigned DEFAULT NULL,
+  `updated` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name_namespace` (`name`,`namespace`),
+  KEY `active` (`active`),
+  KEY `name` (`name`),
+  KEY `namespace` (`namespace`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
+  end
+
+  down do
+    drop_table :extensions
+  end
+end