cf-perm-test-helpers 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62093132d462287506bd69bd9fd9a9b4b3ab179b979bb5b74763ada01546fe65
-  data.tar.gz: 514cb428c64d9e5e05a84949abbec1b265cf5a6cd98f6f09bde93136b8af0aab
+  metadata.gz: a6b5cca332b35e11b69d4b989cdd7edea56369d6cd7f851e625bf69941a3aecf
+  data.tar.gz: fb66cd2f69de1894f4cd58145bd39a3eb18645d890529be7fefb74134845d180
 SHA512:
-  metadata.gz: c35fb55913ec901a53f5769feaa719c9b540e6cadc4ff98f1657e2af958833015335e6da20c3ce2e669cb681dc3e8f386f14c67538f05e2cdcd6f489ca29b557
-  data.tar.gz: d292683a0e8102c177dbc448119a7f695892aa70a8409589e013983880596debeca74ae7a1469e7f8db4940dde382d7166b13fb54ff1446bbb5076a7f40b0926
+  metadata.gz: f2afae297bf88523aeb02b39373c3c75195d7a77aa6cb0390730c428ca4fb917ae785317390b84c6ef3060c287aec513ceb13107c3e364d2612bbd30fc93e8b2
+  data.tar.gz: 93beb280def100489f506b2528c4f7a52689f125f40f5500852e5f2f6ca95e6be4b3d0d25a06739bd9aa87606a9c2e5158bc4dd8de57de784a44635ef0ded015

data/lib_test_helpers/perm_test_helpers/server_runner.rb

@@ -7,114 +7,76 @@ require 'subprocess'
 
 module CloudFoundry
   module PermTestHelpers
-    # rubocop:disable Metrics/ClassLength
     class ServerRunner
       attr_reader :hostname, :port, :tls_ca, :tls_ca_path
 
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize, Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def initialize(opts = {})
         cwd = File.dirname(__FILE__)
         cert_path = File.join(cwd, '..', 'fixtures', 'certs')
 
-        @hostname = opts[:hostname] || ENV['PERM_TEST_HOSTNAME'] || 'localhost'
-        @port = opts[:port] || ENV['PERM_TEST_PORT'] || random_port
-        @perm_path = opts[:perm_path] || ENV['PERM_TEST_PATH'] || 'perm'
-        @log_level = opts[:log_level] || ENV['PERM_TEST_LOG_LEVEL'] || 'fatal'
-        @tls_cert = opts[:tls_cert_path] || ENV['PERM_TEST_TLS_CERT_PATH'] || File.join(cert_path, 'tls.crt')
-        @tls_key = opts[:tls_key_path] || ENV['PERM_TEST_TLS_KEY_PATH'] || File.join(cert_path, 'tls.key')
-        @tls_ca_path = opts[:tls_ca_path] || ENV['PERM_TEST_TLS_CA_PATH'] || File.join(cert_path, 'tls_ca.crt')
-        @audit_file_path = opts[:audit_file_path] || ENV['PERM_TEST_AUDIT_FILE_PATH'] || '/dev/null'
+        options = Options.new(opts)
+
+        @hostname = options.attr(:hostname, 'PERM_TEST_HOSTNAME', 'localhost')
+        @port = options.attr(:port, 'PERM_TEST_PORT', random_port)
+        @perm_path = options.attr(:perm_path, 'PERM_TEST_PATH', 'perm')
+        @log_level = options.attr(:log_level, 'PERM_TEST_LOG_LEVEL', 'fatal')
+        @tls_cert = options.attr(:tls_cert_path, 'PERM_TEST_TLS_CERT_PATH', File.join(cert_path, 'tls.crt'))
+        @tls_key = options.attr(:tls_key_path, 'PERM_TEST_TLS_KEY_PATH', File.join(cert_path, 'tls.key'))
+        @tls_ca_path = options.attr(:tls_ca_path, 'PERM_TEST_TLS_CA_PATH', File.join(cert_path, 'tls_ca.crt'))
+        @audit_file_path = options.attr(:audit_file_path, 'PERM_TEST_AUDIT_FILE_PATH', '/dev/null')
         @tls_ca = File.open(tls_ca_path).read
 
-        opts[:db] ||= {}
-        @db_driver = opts[:db][:driver] || ENV['PERM_TEST_SQL_DB_DRIVER'] || 'mysql'
-        @db_schema = opts[:db][:schema] || ENV['PERM_TEST_SQL_DB_SCHEMA'] || random_schema
-        @db_host = opts[:db][:host] || ENV['PERM_TEST_SQL_DB_HOST'] || 'localhost'
-        @db_port = opts[:db][:port] || ENV['PERM_TEST_SQL_DB_PORT'] || '3306'
-        @db_socket = opts[:db][:socket] || ENV['PERM_TEST_SQL_DB_SOCKET'] || Mysql::MYSQL_UNIX_PORT
-        @db_username = opts[:db][:username] || ENV['PERM_TEST_SQL_DB_USERNAME'] || 'perm'
-        @db_password = opts[:db][:password] || ENV['PERM_TEST_SQL_DB_PASSWORD'] || ''
-
-        @stdout = opts[:stdout] || ENV['PERM_TEST_STDOUT_PATH'] || STDOUT
-        @stderr = opts[:stderr] || ENV['PERM_TEST_STDERR_PATH'] || STDERR
+        @stdout = options.attr(:stdout, 'PERM_TEST_STDOUT_PATH', STDOUT)
+        @stderr = options.attr(:stderr, 'PERM_TEST_STDERR_PATH', STDERR)
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def start
-        create_db
-        migrate_db
         @process ||= start_perm
       end
 
       def stop
-        drop_db
         @process&.terminate
         @process = nil
       end
 
       private
 
-      attr_writer :port
-      attr_reader :perm_path, :log_level, :process, :tls_cert, :tls_key, :audit_file_path
-      attr_reader :db_connection, :db_driver, :db_schema, :db_host, :db_port, :db_socket, :db_username, :db_password
-      attr_reader :stdout, :stderr
-
-      def create_db
-        @db_connection = Mysql.connect(db_host, db_username, db_password, nil, db_port, db_socket)
-
-        stmt = @db_connection.prepare("create database #{db_schema}")
-        stmt.execute
-      end
+      class Options
+        def initialize(opts)
+          @opts = opts
+        end
 
-      def migrate_db
-        cmd = [
-          perm_path,
-          'migrate',
-          'up',
-          '--log-level', log_level,
-          '--sql-db-driver', db_driver,
-          '--sql-db-schema', db_schema,
-          '--sql-db-host', db_host,
-          '--sql-db-port', db_port,
-          '--sql-db-username', db_username,
-          '--sql-db-password', db_password
-        ]
-
-        Subprocess.check_call(cmd, stdout: stdout, stderr: stderr)
+        def attr(key, env, default)
+          @opts[key] || ENV[env] || default
+        end
       end
 
-      def drop_db
-        stmt = @db_connection.prepare("drop database #{db_schema}")
-        stmt.execute
-      end
+      attr_writer :port
+      attr_reader :perm_path, :log_level, :process, :tls_cert, :tls_key, :audit_file_path
+      attr_reader :stdout, :stderr
 
-      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def start_perm
         retries = 0
         process = nil
 
         begin
-          listen_port = port || random_port
           cmd = [
             perm_path,
             'serve',
             '--listen-hostname', hostname,
-            '--listen-port', listen_port.to_s,
+            '--listen-port', port.to_s,
             '--log-level', log_level,
             '--tls-certificate', tls_cert,
             '--tls-key', tls_key,
-            '--sql-db-driver', db_driver,
-            '--sql-db-schema', db_schema,
-            '--sql-db-host', db_host,
-            '--sql-db-port', db_port,
-            '--sql-db-username', db_username,
-            '--sql-db-password', db_password,
+            '--db-driver', 'in-memory',
             '--audit-file-path', audit_file_path
           ]
 
           process = Subprocess.popen(cmd, stdout: stdout, stderr: stderr)
           wait_for_server(process.pid)
-          @port = listen_port
 
           process
         rescue Errno::ESRCH => e
@@ -130,11 +92,6 @@ module CloudFoundry
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-      def random_schema
-        # Dashes are invalid in DB names
-        "perm-#{SecureRandom.uuid}".tr('-', '_')
-      end
-
       def random_port
         rand(65_000 - 1024) + 1024
       end

data/lib_test_helpers/perm_test_helpers/version.rb

@@ -2,6 +2,6 @@
 
 module CloudFoundry
   module PermTestHelpers
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf-perm-test-helpers
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - CloudFoundry Permissions Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subprocess