legion-data 0.2.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd32f907af81657448d1fdbebc681b795d536754cec212ccaa154239c13ca48f
-  data.tar.gz: 527fd840b7ae7bdf09f65a5b60af7491bea793427719404448f4c05967fc8266
+  metadata.gz: 7edc1b56e433f1136ad04bb1ddb6c989493a516bc46ca928fe81439428616fd1
+  data.tar.gz: 2d67b54b7de9c5aa798e941cd700381df89ef87fda8fcbd272aacb017a6af1da
 SHA512:
-  metadata.gz: b41d14cbf4d9e3c62a84a2361ecb2b6143cdc508866bee245bec6c46bf263c8b421ef944ea353f360ac1d704d8777b570cf2ea279be466ceef17f939f9902ad5
-  data.tar.gz: e0acb9226a6c7987b008be0d7e5e9eef22ebb58194ae9613a73846a85d464a071ddc82b17cf5bf3267d467ea1cf42d180047565b85d0565516fb121dbd1f45d1
+  metadata.gz: 224c4962335f385131dc6e50fe9ffe952edb4e52a0c6f3b7cdc30164cc6b668de1a9ab37778c097a0e9c790430ef62ba26af70ff2e88352a4cadf32abf35b3f9
+  data.tar.gz: da68881cbdcaa3b021e523064f0a9d784702d69cc98c713ed7f76b24ca994eef2295d77e6e6425f093bd68e0e9cac1139a40ff7d18cf4839b4ab1dfac6cde8f1

data/.circleci/config.yml

@@ -1,21 +1,24 @@
-version: 2 # use CircleCI 2.0
+version: 2.1
+orbs:
+  ruby: circleci/ruby@0.2.1
+  sonarcloud: sonarsource/sonarcloud@1.0.1
+
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.4-node
+      - image: circleci/ruby:2.7-node
     steps:
       - checkout
-      - run: gem install rubocop
-      - run: bundle install
+      - ruby/load-cache
+      - ruby/install-deps
       - run:
           name: Run Rubocop
-          command: rubocop
-      - store_test_results:
-          path: test_results
-  "ruby-2.3":
+          command: bundle exec rubocop
+      - ruby/save-cache
+  "ruby-two-five":
     docker:
-      - image: circleci/ruby:2.3
-      - image: mysql:5.7
+      - image: circleci/ruby:2.5
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -23,20 +26,20 @@ jobs:
           MYSQL_PASSWORD: 'legion'
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
       - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-
-  "ruby-2.4":
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.4-node
-      - image: mysql:5.7
+      - image: circleci/ruby:2.6
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -44,19 +47,38 @@ jobs:
           MYSQL_PASSWORD: 'legion'
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
       - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "ruby-2.5":
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-seven":
+    docker:
+      - image: circleci/ruby:2.7
+      - image: circleci/mysql:5.7
+        environment:
+          MYSQL_DATABASE: 'legion'
+          MYSQL_ROOT_PASSWORD: 'legion'
+          MYSQL_USER: 'legion'
+          MYSQL_PASSWORD: 'legion'
+    steps:
+      - checkout
+      - ruby/load-cache
+      - ruby/install-deps
+      - run:
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - ruby/save-cache
+  "jruby-nine-two":
     docker:
-      - image: circleci/ruby:2.5-node
-      - image: mysql:5.7
+      - image: circleci/jruby:9.2-jre
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -67,16 +89,18 @@ jobs:
       - run:
           name: Bundle Install
           command: bundle install
+      - run:
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
       - run:
           name: Run RSpec
           command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
           when: always
-      - store_test_results:
-          path: test-results
-  "ruby-2.6":
+      - sonarcloud/scan
+  "jruby-nine-two-e":
     docker:
-      - image: circleci/ruby:2.6-node
-      - image: mysql:5.7
+      - image: circleci/jruby:9.2.11-jre
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -87,16 +111,17 @@ jobs:
       - run:
           name: Bundle Install
           command: bundle install
+      - run:
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
       - run:
           name: Run RSpec
           command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
           when: always
-      - store_test_results:
-          path: test-results
-  "jruby-9.2":
+  "sonarcloud":
     docker:
-      - image: circleci/jruby:9.2
-      - image: mysql:5.7
+      - image: circleci/ruby:2.7
+      - image: circleci/mysql:5.7
         environment:
           MYSQL_DATABASE: 'legion'
           MYSQL_ROOT_PASSWORD: 'legion'
@@ -104,45 +129,43 @@ jobs:
           MYSQL_PASSWORD: 'legion'
     steps:
       - checkout
+      - ruby/load-cache
       - run:
-          name: Bundle Install
-          command: bundle install
+          name: update bundler
+          command: gem update bundler
+      - ruby/install-deps
       - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
+          name: update max connections
+          command: 'sudo apt-get install default-mysql-client && mysql -h 127.0.0.1 -u root --password=legion --execute="set global max_connections = 100000;"'
+      - ruby/run-tests
+      - run:
+          name: Run Rubocop
+          command: bundle exec rubocop --format=json --out=rubocop-result.json
+      - sonarcloud/scan
+      - ruby/save-cache
 
 workflows:
   version: 2
-  cop_rake_deploy:
+  rubocop-rspec:
     jobs:
       - rubocop
-      - ruby-2.3:
-          requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.4:
+      - ruby-two-five:
           requires:
             - rubocop
-      - ruby-2.5:
+      - ruby-two-six:
+          requires:
+            - ruby-two-five
+      - ruby-two-seven:
+          requires:
+            - ruby-two-five
+      - sonarcloud:
+          requires:
+            - ruby-two-seven
+            - ruby-two-six
+      - jruby-nine-two:
           requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.6:
+            - ruby-two-seven
+            - ruby-two-six
+      - jruby-nine-two-e:
           requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-#      - jruby-9.2:
-#          requires:
-#            - ruby-2.3
-#            - ruby-2.4
-#            - ruby-2.5
-#            - ruby-2.6
+            - jruby-nine-two

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
   - rubocop-md
   - rubocop-performance
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
   Exclude:
     - 'lib/legion/data/migrations/*.rb'
@@ -11,6 +11,8 @@ Metrics/MethodLength:
   Max: 30
 Metrics/ClassLength:
   Max: 1500
+Metrics/AbcSize:
+  Max: 34
 Metrics/BlockLength:
   Max: 50
   Exclude:
@@ -25,6 +27,7 @@ Layout/HashAlignment:
 Style/Documentation:
   Enabled: false
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Legion::Data Changelog
+## v1.1.2
+* Updating connection details to support JDBC
+* Changing default max connections to 10
+* Fixing issue with Legion::Cache always throwing an error
+
 ## v0.2.0
 * Redesigning schema
 

data/Gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: .
+  specs:
+    legion-data (1.1.2)
+      legion-logging
+      legion-settings
+      mysql2
+      sequel
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.1)
+    codecov (0.2.8)
+      json
+      simplecov
+    diff-lcs (1.4.4)
+    docile (1.3.2)
+    json (2.3.1)
+    json (2.3.1-java)
+    json_pure (2.3.1)
+    legion-json (1.1.2)
+      json_pure
+      multi_json
+    legion-logging (1.1.0)
+      rainbow (~> 3)
+    legion-settings (1.1.1)
+      legion-json
+      legion-logging
+    multi_json (1.15.0)
+    mysql2 (0.5.3)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (0.89.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.1.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    rubocop-md (0.4.0)
+      rubocop (~> 0.60)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
+    rubocop-rspec (1.43.2)
+      rubocop (~> 0.87)
+    rubocop-sequel (0.0.6)
+      rubocop (~> 0.55, >= 0.55)
+    ruby-progressbar (1.10.1)
+    sequel (5.35.0)
+    simplecov (0.19.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    unicode-display_width (1.7.0)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  bundler
+  codecov
+  legion-data!
+  rake
+  rspec
+  rspec_junit_formatter
+  rubocop
+  rubocop-md
+  rubocop-performance
+  rubocop-rspec
+  rubocop-sequel
+
+BUNDLED WITH
+   2.1.4

data/legion-data.gemspec

@@ -11,6 +11,7 @@ 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.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
 
   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'

data/lib/legion/data.rb

@@ -1,10 +1,10 @@
 require 'legion/data/version'
-require_relative 'data/settings'
+require 'legion/data/settings'
 require 'sequel'
 
-require_relative 'data/connection'
-require_relative 'data/model'
-require_relative 'data/migration'
+require 'legion/data/connection'
+require 'legion/data/model'
+require 'legion/data/migration'
 
 module Legion
   module Data
@@ -13,7 +13,7 @@ module Legion
         connection_setup
         migrate
         load_models
-        # setup_cache
+        setup_cache
       end
 
       def connection_setup
@@ -34,20 +34,17 @@ module Legion
         Legion::Data::Connection.sequel
       end
 
-      def setup_cache # rubocop:disable Metrics/AbcSize
-        return if Legion::Settings[:data][:cache][:enable]
+      def setup_cache
+        return if Legion::Settings[:data][:cache][:enabled]
 
-        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]
+        return unless defined?(::Legion::Cache)
 
-        # Legion::Data::Model::Relationship.plugin :caching, Legion::Cache, ttl: 10
+        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::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

data/lib/legion/data/connection.rb

@@ -4,33 +4,35 @@ module Legion
   module Data
     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
+        attr_accessor :sequel
+
+        def adapter
+          @adapter ||= RUBY_ENGINE == 'jruby' ? :jdbc : :mysql2
         end
 
         def setup
-          @sequel = ::Sequel.connect(adapter: adapter, **creds_builder)
+          @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 unless Legion::Settings[:data][:connection][:log]
+          return if Legion::Settings[:data][:connection].nil? || Legion::Settings[:data][:connection][:log].nil?
 
-          @sequel.logger = Legion::Logging::Logger.new(level: 'debug')
+          @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
+          @sequel&.disconnect
+          Legion::Settings[:data][:connected] = false
         end
 
-        def creds_builder # rubocop:disable Metrics/AbcSize
+        def creds_builder
           final_creds = {}
           final_creds.merge! default_creds
-          final_creds.merge! Legion::Settings[:data][:creds]
+          final_creds.merge! Legion::Settings[:data][:creds] if Legion::Settings[:data][:creds].is_a? Hash
           return final_creds if Legion::Settings[:vault].nil?
 
           if Legion::Settings[:vault][:connected] && ::Vault.sys.mounts.key?(:database)
@@ -53,10 +55,6 @@ module Legion
             preconnect:      'concurrently'
           }
         end
-
-        def adapter
-          'mysql2'
-        end
       end
     end
   end

data/lib/legion/data/migration.rb

@@ -4,9 +4,9 @@ module Legion
   module Data
     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
+        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

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

@@ -12,6 +12,6 @@ Sequel.migration do
   end
 
   down do
-    drop :users
+    drop_table :users
   end
 end

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

@@ -11,6 +11,6 @@ Sequel.migration do
   end
 
   down do
-    drop :groups
+    drop_table :groups
   end
 end

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

@@ -20,6 +20,6 @@ Sequel.migration do
   end
 
   down do
-    drop :chains
+    drop_table :chains
   end
 end

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

@@ -19,6 +19,6 @@ Sequel.migration do
   end
 
   down do
-    drop :environments
+    drop_table :environments
   end
 end

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

@@ -19,6 +19,6 @@ Sequel.migration do
   end
 
   down do
-    drop :datacenters
+    drop_table :datacenters
   end
 end

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

@@ -21,6 +21,6 @@ Sequel.migration do
   end
 
   down do
-    drop :nodes
+    drop_table :nodes
   end
 end

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

@@ -13,6 +13,6 @@ Sequel.migration do
   end
 
   down do
-    drop :settings
+    drop_table :settings
   end
 end

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

@@ -20,6 +20,6 @@ Sequel.migration do
   end
 
   down do
-    drop :extensions
+    drop_table :extensions
   end
 end

data/lib/legion/data/migrations/010_add_runners.rb

@@ -16,6 +16,6 @@ Sequel.migration do
   end
 
   down do
-    drop :runners
+    drop_table :runners
   end
 end

data/lib/legion/data/migrations/011_add_functions.rb

@@ -24,6 +24,6 @@ Sequel.migration do
   end
 
   down do
-    drop :functions
+    drop_table :functions
   end
 end

data/lib/legion/data/migrations/012_add_tasks.rb

@@ -2,7 +2,8 @@ Sequel.migration do
   up do
     run "CREATE TABLE `tasks` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `relationship_id` int(11) unsigned NOT NULL,
+  `relationship_id` int(11) unsigned DEFAULT NULL,
+  `function_id` int(11) unsigned DEFAULT NULL,
   `status` varchar(255) NOT NULL,
   `parent_id` int(11) unsigned DEFAULT NULL,
   `master_id` int(11) unsigned DEFAULT NULL,
@@ -14,12 +15,14 @@ Sequel.migration do
   KEY `status` (`status`),
   KEY `parent_id` (`parent_id`),
   KEY `master_id` (`master_id`),
+  KEY `relationship_id` (`relationship_id`),
+  KEY `function_id` (`function_id`),
   CONSTRAINT `parent_id` FOREIGN KEY (`parent_id`) REFERENCES `tasks` (`id`) ON DELETE SET NULL ON UPDATE CASCADE,
   CONSTRAINT `master_id` FOREIGN KEY (`master_id`) REFERENCES `tasks` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
   end
 
   down do
-    drop :tasks
+    drop_table :tasks
   end
 end

data/lib/legion/data/migrations/013_add_task_logs.rb

@@ -3,15 +3,21 @@ Sequel.migration do
     run "CREATE TABLE `task_logs` (
   `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
   `task_id` int(11) unsigned NOT NULL,
+  `function_id` int(11) unsigned,
+  `node_id` int(11) unsigned,
   `entry` text NOT NULL,
   `created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `updated` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
-  CONSTRAINT `task_log_task_id` FOREIGN KEY (`task_id`) REFERENCES `tasks` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+  KEY (`created`),
+  KEY (`updated`),
+  CONSTRAINT `task_log_task_id` FOREIGN KEY (`task_id`) REFERENCES `tasks` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `task_log_functions` FOREIGN KEY (`function_id`) REFERENCES `functions` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `task_log_nodes` FOREIGN KEY (`node_id`) REFERENCES `nodes` (`id`) ON DELETE SET NULL ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;"
   end
 
   down do
-    drop :task_logs
+    drop_table :task_logs
   end
 end

data/lib/legion/data/migrations/014_add_relationships.rb

@@ -22,6 +22,6 @@ Sequel.migration do
   end
 
   down do
-    drop :task_logs
+    drop_table :relationships
   end
 end

data/lib/legion/data/migrations/015_add_default_extensions.rb

@@ -0,0 +1,24 @@
+Sequel.migration do
+  up do
+    lex = from(:extensions).insert(namespace: 'Legion::Extensions::Lex', name: 'lex', exchange: 'lex', uri: 'lex')
+    [
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Register', name: 'register', queue: 'register', uri: 'register' },
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Function', name: 'function', queue: 'function', uri: 'function' },
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Runner', name: 'runner', queue: 'runner', uri: 'runner' },
+      { extension_id: lex, namespace: 'Legion::Extensions::Lex::Runners::Extension', name: 'extension', queue: 'extension', uri: 'extension' }
+    ].each do |row|
+      from(:runners).insert row
+    end
+
+    lex = from(:extensions).insert(namespace: 'Legion::Extensions::Node', name: 'node', exchange: 'node', uri: 'node')
+    [
+      { extension_id: lex, namespace: 'Legion::Extensions::Node::Runners::Crypt', name: 'crypt', queue: 'crypt', uri: 'crypt' }
+    ].each do |row|
+      from(:runners).insert row
+    end
+  end
+  down do
+    from(:extensions).where(namespace: 'Legion::Extensions::Lex').delete
+    from(:extensions).where(namespace: 'Legion::Extensions::Node').delete
+  end
+end

data/lib/legion/data/migrations/016_change_task_args.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:tasks) do
+      rename_column :args, :function_args
+    end
+  end
+end

data/lib/legion/data/migrations/017_add_payload_task.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:tasks) do
+      add_column :payload, :text
+    end
+  end
+end

data/lib/legion/data/model.rb

@@ -3,6 +3,7 @@ module Legion
     module Models
       class << self
         attr_reader :loaded_models
+
         def models
           %w[user group extension chain relationship function task runner task_log datacenter environment node setting]
         end
@@ -11,10 +12,11 @@ module Legion
           Legion::Logging.info 'Loading Legion::Data::Models'
           @loaded_models ||= []
           require_sequel_models(models)
+          Legion::Settings[:data][:models][:loaded] = true
         end
 
         def require_sequel_models(files = models)
-          Dir[File.dirname(__FILE__) + 'models/*.rb'].each { |file| puts file }
+          Dir["#{File.dirname(__FILE__)}models/*.rb"].each { |file| puts file }
           files.each { |file| load_sequel_model(file) }
         end
 
@@ -23,6 +25,7 @@ module Legion
           require_relative "models/#{model}"
           @loaded_models << model
           Legion::Logging.debug("Successfully loaded #{model}")
+          model
         rescue LoadError => e
           Legion::Logging.fatal("Failed to load #{model}")
           raise e unless Legion::Settings[:data][:models][:continue_on_fail]

data/lib/legion/data/models/chain.rb

@@ -5,8 +5,6 @@ module Legion
     module Model
       class Chain < Sequel::Model
         one_to_many :relationship
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/models/datacenter.rb

@@ -5,8 +5,6 @@ module Legion
     module Model
       class Datacenter < Sequel::Model
         one_to_many :node
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/models/environment.rb

@@ -5,8 +5,6 @@ module Legion
     module Model
       class Environment < Sequel::Model
         one_to_many :node
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/models/extension.rb

@@ -5,8 +5,6 @@ module Legion
     module Model
       class Extension < Sequel::Model
         one_to_many :runners
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/models/function.rb

@@ -9,8 +9,6 @@ module Legion
         many_to_one :runner
         one_to_many :trigger_relationships, class: 'Legion::Data::Model::Relationship', key: :trigger_id
         one_to_many :action_relationships, class: 'Legion::Data::Model::Relationship', key: :action_id
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/models/relationship.rb

@@ -10,8 +10,6 @@ module Legion
         one_to_many :task
         many_to_one :trigger, class: Legion::Data::Model::Function
         many_to_one :action, class: Legion::Data::Model::Function
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/models/runner.rb

@@ -9,8 +9,6 @@ module Legion
         one_to_many :task
         one_to_many :functions
         many_to_one :extension
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/models/task.rb

@@ -10,8 +10,6 @@ module Legion
         one_to_many :children, key: :parent_id, class: self
         many_to_one :master, class: self
         one_to_many :slave, key: :master_id, class: self
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
       end
     end
   end

data/lib/legion/data/settings.rb

@@ -3,13 +3,13 @@ module Legion
     module Settings
       def self.default
         {
-          connected:  false,
-          cache:      cache,
-          connection: connection,
-          creds:      creds,
-          migrations: migrations,
-          models:     models
-
+          connected:        false,
+          cache:            cache,
+          connection:       connection,
+          creds:            creds,
+          migrations:       migrations,
+          models:           models,
+          connect_on_start: true
         }
       end
 
@@ -35,7 +35,7 @@ module Legion
           log_connection_info: false,
           log_warn_duration:   1,
           sql_log_level:       'debug',
-          max_connections:     32
+          max_connections:     10
         }
       end
 
@@ -60,3 +60,9 @@ module Legion
     end
   end
 end
+
+begin
+  Legion::Settings.merge_settings('data', Legion::Data::Settings.default) if Legion.const_defined?('Settings')
+rescue StandardError => e
+  Legion::Logging.fatal(e.message) if Legion::Logging.method_defined?(:fatal)
+end

data/lib/legion/data/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Data
-    VERSION = '0.2.0'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

data/sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.projectKey=legion-io_legion-data
+sonar.organization=legion-io
+sonar.projectName=Legion::Data
+sonar.sources=.
+sonar.exclusions=vendor/**
+sonar.coverage.exclusions=spec/**
+sonar.ruby.coverage.reportPath=coverage/.resultset.json
+sonar.ruby.file.suffixes=rb,ruby
+sonar.ruby.coverage.framework=RSpec
+sonar.ruby.rubocopConfig=.rubocop.yml
+sonar.ruby.rubocop.reportPath=rubocop-result.json
+sonar.ruby.rubocop.filePath=.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-data
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Esity
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -227,11 +228,6 @@ files:
 - legion-data.gemspec
 - lib/legion/data.rb
 - lib/legion/data/connection.rb
-- lib/legion/data/connections/base.rb
-- lib/legion/data/connections/jdbc.rb
-- lib/legion/data/connections/mysql.rb
-- lib/legion/data/connections/mysql2.rb
-- lib/legion/data/connections/mysql_base.rb
 - lib/legion/data/migration.rb
 - lib/legion/data/migrations/001_add_schema_columns.rb
 - lib/legion/data/migrations/002_add_users.rb
@@ -247,6 +243,9 @@ files:
 - lib/legion/data/migrations/012_add_tasks.rb
 - lib/legion/data/migrations/013_add_task_logs.rb
 - lib/legion/data/migrations/014_add_relationships.rb
+- lib/legion/data/migrations/015_add_default_extensions.rb
+- lib/legion/data/migrations/016_change_task_args.rb
+- lib/legion/data/migrations/017_add_payload_task.rb
 - lib/legion/data/model.rb
 - lib/legion/data/models/chain.rb
 - lib/legion/data/models/datacenter.rb
@@ -254,7 +253,6 @@ files:
 - lib/legion/data/models/extension.rb
 - lib/legion/data/models/function.rb
 - lib/legion/data/models/group.rb
-- lib/legion/data/models/namespace.rb
 - lib/legion/data/models/node.rb
 - lib/legion/data/models/relationship.rb
 - lib/legion/data/models/runner.rb
@@ -264,6 +262,7 @@ files:
 - lib/legion/data/models/user.rb
 - lib/legion/data/settings.rb
 - lib/legion/data/version.rb
+- sonar-project.properties
 homepage: https://bitbucket.org/legion-io/legion-data
 licenses: []
 metadata:
@@ -273,7 +272,7 @@ metadata:
   homepage_uri: https://bitbucket.org/legion-io/legion-data
   source_code_uri: https://bitbucket.org/legion-io/legion-data
   wiki_uri: https://bitbucket.org/legion-io/legion-data/wiki/Home
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -281,15 +280,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Used by Legion to connect to the database
 test_files: []

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

@@ -1,61 +0,0 @@
-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 = {}) # 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][: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 = Sequel.connect(creds)
-        end
-
-        def settings(options, _connection = @connection)
-          raise ArgumentError unless options.is_a? Hash
-        end
-
-        def debug_logging(enabled = true, connection = @connection, _options = {})
-          if enabled
-            connection.logger = Legion::Logging
-            connection.sql_log_level = :debug
-          elsif enabled == false
-            connection.logger = nil
-            connection.sql_log_level = :debug
-          end
-          connection
-        end
-
-        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
-end

data/lib/legion/data/connections/jdbc.rb

@@ -1,21 +0,0 @@
-module Legion
-  module Data
-    module Connections
-      class JDBC
-        attr_accessor :connection
-        def initialize
-          Legion::Logging.debug('Connecting to MySQL with JBDC Connector')
-          connection_string = build_connection_string
-          @connection = Sequel.connect(connection_string, max_connetions: @args[:max_connections])
-          Legion::Logging.info("Legion is connected to database #{args[:database]}")
-        end
-
-        def build_connection_string
-          set = Legion::Settings[:data][:mysql]
-          con_string = "jdbc:mysql://#{set[:host]}/#{set[:database]}?user=#{set[:user]}&password=#{set[:password]}"
-          con_string
-        end
-      end
-    end
-  end
-end

data/lib/legion/data/connections/mysql.rb

@@ -1,26 +0,0 @@
-require 'legion/data/connections/mysql_base'
-
-module Legion
-  module Data
-    module Connections
-      class MySQL < 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
-
-        def adapter
-          'mysql2'
-        end
-
-        def connect
-          super(adapter, creds_builder)
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Legion
-  module Data
-    module Connections
-      module MySQL2
-        def adapter
-          :mysql2
-        end
-      end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-require 'legion/data/connections/base'
-
-module Legion
-  module Data
-    module Connections
-      module MySQLBase
-        def default_creds
-          { data: { mysql: {
-            host:            '127.0.0.1',
-            user:            'legion',
-            password:        'legion',
-            max_connections: 100,
-            database:        'legion'
-          } } }
-        end
-      end
-    end
-  end
-end

data/lib/legion/data/models/namespace.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Legion
-  module Data
-    module Model
-      class Namespace < Sequel::Model
-        one_to_many :function
-        many_to_one :extension
-        many_to_one :user_owner, class: Legion::Data::Model::User
-        many_to_one :group_owner, class: Legion::Data::Model::Group
-      end
-    end
-  end
-end