Add flag to conjurctl server to skip migrations

CHANGELOG.md

@@ -15,6 +15,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Telemetry support
   [cyberark/conjur#2854](https://github.com/cyberark/conjur/pull/2854)
 
+### Added
+- New flag to `conjurctl server` command called `--no-migrate` which allows for skipping
+  the database migration step when starting the server.
+  [cyberark/conjur#2895](https://github.com/cyberark/conjur/pull/2895)
+
 ### Fixed
 - Support Authn-IAM regional requests when host value is missing from signed headers.
   [cyberark/conjur#2827](https://github.com/cyberark/conjur/pull/2827)

bin/conjur-cli.rb

@@ -42,6 +42,10 @@
   c.default_value(ENV['PORT'] || '80')
   c.flag [ :p, :port ]
 
+  c.desc 'Skip running database migrations on start'
+  c.default_value false
+  c.switch :'no-migrate'
+
   c.desc 'Server bind address'
   c.default_value(ENV['BIND_ADDRESS'] || '0.0.0.0')
   c.arg_name :ip
@@ -55,7 +59,8 @@
       password_from_stdin: options["password-from-stdin"],
       file_name: options[:file],
       bind_address: options[:'bind-address'],
-      port: options[:port]
+      port: options[:port],
+      no_migrate: options[:'no-migrate']
     )
   end
 end

bin/conjur-cli/commands/server.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 require 'command_class'
+require 'sequel'
 
 # Required to use $CHILD_STATUS
 require 'English'
 
 require_relative 'db/migrate'
+require_relative 'connect_database'
 
 module Commands
   Server ||= CommandClass.new(
     dependencies: {
-      migrate_database: DB::Migrate.new
+      migrate_database: DB::Migrate.new,
+      connect_database: ConnectDatabase.new
     },
 
     inputs: %i[
@@ -19,14 +22,17 @@ module Commands
       file_name
       bind_address
       port
+      no_migrate
     ]
   ) do
     def call
       # Ensure the database is available
       # and the schema is up-to-date
       @migrate_database.call(
         preview: false
-      )
+      ) unless @no_migrate
+
+      @connect_database.call if @no_migrate
 
       # Create and bootstrap the initial
       # Conjur account and policy

spec/conjurctl/commands/server_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+require 'commands/server'
+
+describe Commands::Server do
+
+  let(:account) { "demo" }
+  let(:password_from_stdin) { false }
+  let(:file_name) { nil }
+  let(:bind_address) { "0.0.0.0" }
+  let(:port) { 80 }
+  let(:no_migrate) { false }
+
+  let(:migrate_database) {
+    double('DB::Migrate').tap do |migrate|
+      allow(migrate).to receive(:call).with(preview: false)
+    end
+  }
+  let(:connect_database) {
+    double('ConnectDatabase').tap do |connect|
+      allow(connect).to receive(:call)
+    end
+  }
+
+  before do
+    # Squash process forking for these tests as we have not implemented a full test
+    # suite and it causes issues
+    allow(Process).to receive(:fork).and_return(nil)
+    allow(Process).to receive(:waitall).and_return(nil)
+  end
+
+  def delete_account(name)
+    system("conjurctl account delete #{name}")
+  end
+
+  after(:each) do
+    delete_account("demo")
+  end
+
+
+  subject do
+    Commands::Server.new(
+      migrate_database: migrate_database,
+      connect_database: connect_database
+    ).call(
+      account: account,
+      password_from_stdin: password_from_stdin,
+      file_name: file_name,
+      bind_address: bind_address,
+      port: port,
+      no_migrate: no_migrate
+    )
+  end
+
+  it "performs migrations" do
+    expect(migrate_database).to receive(:call)
+
+    subject
+  end
+
+  context "With the no_migrate variable set to true" do
+    let(:no_migrate) { true }
+
+    it "doesn't perform migrations" do
+      expect(migrate_database).not_to receive(:call)
+
+      subject
+    end
+
+    it "connects to the database" do
+      expect(connect_database).to receive(:call)
+
+      subject
+    end
+  end
+end