norad_cli 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e7fb80586e9097ae6596d925a944317aa24ca56
-  data.tar.gz: 4fb2895a21437b787d29549588c1c03d10365196
+  metadata.gz: 6845add9cfabc34338bc67744b6d3b4509f3a0bd
+  data.tar.gz: 870a0347fd4929e075c877eaec20034d3471317e
 SHA512:
-  metadata.gz: b43b85e81eb87e5d867c16c0e65c5569c4acf2891ae0656914ecd92589fb2a6d459ed30753c33e6d01130d01fcbe142c976a9e54237bb17374f5500249b83dff
-  data.tar.gz: f16410a27950b486298e70bd5f93b00c44accb6fbcc22c589e1188b037ef15fc14e29494bac79658d2a319afd5be792a4f3f2db8e8f03c754de1f6d2ad2dd198
+  metadata.gz: 31bfb046789af2d16a86f912db431b5b10e4e9ec1b7fead6fd6be4db6841c04748d3c9cc5e7ee68d9ece1d606167cfaa9127864c5b44b6d59811450f9ffe4a30
+  data.tar.gz: 05d22bb8f7ff35bf7abd624003c2d023f9778370d791a6558b92296c48458a20a318a0a3d05609be97cb4a74d7dcde205c5a43b44c78d7c13ef499c1f066885c

data/.rubocop.yml

@@ -44,3 +44,6 @@ Style/RegexpLiteral:
 Style/Next:
   Exclude:
     - 'lib/norad_cli/support/manifest_spec.rb'
+Style/IfUnlessModifier:
+    Exclude:
+    - 'lib/norad_cli/cli/sectest.rb'

data/lib/norad_cli/cli/sectest.rb

@@ -22,7 +22,9 @@ class Sectest < Thor
     # Grab the current directory
     repo_dir = Dir.pwd
 
-    puts options[:configurable]
+    # Check for the root_dir
+    root_dir?
+
     # Set options for templates
     options[:name] = sectest_name
     options[:spec_class_name] = sectest_name.split('-').map { |t| t =~ /\d+/ ? t : t.capitalize! }.join
@@ -52,6 +54,9 @@ class Sectest < Thor
   option :registry, aliases: '-r', default: 'norad-registry.cisco.com:5000', desc: 'The Docker registry for Docker images'
   option :version, aliases: '-v', default: 'latest', desc: 'The version of the sectest container to build'
   def build
+    # Check for the root_dir
+    root_dir?
+
     # Error check to ensure this is a plugin directory
     Dir.glob('sectests/*').select do |f|
       if File.directory? f
@@ -66,6 +71,9 @@ class Sectest < Thor
   option :registry, aliases: '-r', default: 'norad-registry.cisco.com:5000', desc: 'The Docker registry for Docker images'
   option :version, aliases: '-v', default: 'latest', desc: 'The version of the sectest container to build'
   define_method 'build:image' do |name|
+    # Check for the root_dir
+    root_dir?
+
     imgs_to_build = {}
     imgs_to_build["sectests/#{name}"] = "#{options[:registry]}/#{name}:#{options[:version]}"
 
@@ -97,6 +105,9 @@ class Sectest < Thor
   option :registry, aliases: '-r', default: 'norad-registry.cisco.com:5000', desc: 'The Docker registry for Docker images'
   option :version, aliases: '-v', default: 'latest', desc: 'The version of the sectest container to build'
   define_method 'build:specs' do |name|
+    # Check for the root_dir
+    root_dir?
+
     imgs_to_build = {}
     imgs_to_build["#{File.expand_path(File.dirname(__FILE__))}/../templates/spec/support/Dockerfile.testserver"] = 'docker-images-test-results-server:latest'
     imgs_to_build["#{File.expand_path(File.dirname(__FILE__))}/../templates/spec/support/Dockerfile.ubuntu_ssh"] = 'docker-images-test-ubuntu-ssh-server:latest'
@@ -126,6 +137,9 @@ class Sectest < Thor
   option :registry, aliases: '-r', default: 'norad-registry.cisco.com:5000', desc: 'The Docker registry for Docker images'
   option :version, aliases: '-v', default: 'latest', desc: 'The version of the sectest container to build'
   define_method 'build:all' do |name|
+    # Check for the root_dir
+    root_dir?
+
     # Build the sectest image
     send('build:image', name)
 
@@ -133,34 +147,18 @@ class Sectest < Thor
     send('build:specs', name)
   end
 
-  # Define arguments and options
-  desc 'execute SECTESTNAME ARGUMENTS', 'Executes the specified security test SECTESTNAME w/ ARGUMENTS'
-  option :registry, aliases: '-r', default: 'norad-registry.cisco.com:5000', desc: 'The Docker registry for Docker images'
-  option :version, aliases: '-v', default: 'latest', desc: 'The version of the tools docker container to build'
-  def execute(name, arguments)
-    # Ensure container exists
-    if !Docker::Image.exist?("#{options[:registry]}/#{name}:#{options[:version]}")
-      say("Requested image #{options[:registry]}/#{name}:#{options[:version]} does not exist!", :red)
-      exit(1)
-    end
-
-    # Setup and run the container
-    env = ['NORAD_ROOT=', %(ASSESSMENT_PATHS=[{"id":"1", "assessment": "1"}]), 'NORAD_SECRET=1234']
-    container = Docker::Container.create(Image: "#{options[:registry]}/#{name}:#{options[:version]}",
-                                         Env: env,
-                                         Cmd: arguments)
-
-    # Start the container, watch stdout
-    container.tap(&:start).attach { |stream, chunk| puts "#{stream}: #{chunk}" }
-  end
-
   desc 'spec:image SECTESTNAME', 'Run the rspec tests for SECTESTNAME'
-  option :verbose, aliases: '-v', type: :boolean, default: false, desc: 'Turn on verbose logging'
-  option :scan_assessment, aliases: '-s', type: :boolean, default: true, desc: 'Fix me'
+  option :verbose, aliases: '-v', type: :boolean, desc: 'Turn on verbose logging'
   define_method 'spec:image' do |name|
+    # Check for the root_dir
+    root_dir?
+
     # Set environment variables
-    ENV['ENABLE_LOGS'] = options[:verbose] ? 'true' : 'false'
-    ENV['SCAN_ASSESSMENT'] = options[:scan_assessment] ? 'true' : 'false'
+    if options[:verbose]
+      ENV['ENABLE_LOGS'] = 'true'
+    end
+
+    ENV['SCAN_ASSESSMENT'] = 'true'
     ENV['TEST_RESULTS_SERVER_IMAGE'] = 'docker-images-test-results-server'
     ENV['UBUNTU_SSH_SERVER_IMAGE'] = 'docker-images-test-ubuntu-ssh-server'
 
@@ -172,6 +170,9 @@ class Sectest < Thor
   option :verbose, aliases: '-v', type: :boolean, default: false, desc: 'Turn on verbose logging'
   option :scan_assessment, aliases: '-s', type: :boolean, default: true, desc: 'Fix me'
   def spec
+    # Check for the root_dir
+    root_dir?
+
     # Error check to ensure this is a plugin directory
     Dir.glob('sectests/*').select do |f|
       if File.directory? f
@@ -185,7 +186,8 @@ class Sectest < Thor
   option :seedfile, aliases: '-s', type: :string, default: './containers.rb', desc: 'The name of the seed file to generate'
   option :docsite, aliases: '-d', type: :string, default: 'https://norad.gitlab.io/docs/', desc: 'Set the documentation site'
   def seed
-    # Error check to ensure this is a plugin directory
+    # Check for the root_dir
+    root_dir?
 
     # Generate the seed file
     SeedGenerator.process_manifests(options[:seedfile], options[:docsite])
@@ -193,6 +195,9 @@ class Sectest < Thor
 
   desc 'validate:image SECTESTNAME', 'Validate SECTESTNAME manifest.yml and readme.md'
   define_method 'validate:image' do |name|
+    # Check for the root_dir
+    root_dir?
+
     # Validate the readme file
     ENV['sectest_name'] = name
     RSpec::Core::Runner.run(["#{File.dirname(File.expand_path(__FILE__))}/../support/readme_spec.rb"], $stderr, $stdout)
@@ -203,6 +208,9 @@ class Sectest < Thor
 
   desc 'validate', 'Validate all manifest.yml and readme.md'
   def validate
+    # Check for the root_dir
+    root_dir?
+
     # Error check to ensure this is a plugin directory
     Dir.glob('sectests/*').select do |f|
       if File.directory? f
@@ -226,5 +234,15 @@ class Sectest < Thor
       from_image = from_line[0][%r{\AFROM\s+(.*?\/)?(.*?)(:.*?)?\Z}i, 2] || raise('bad from')
       [from_image, from_line_arr[1]]
     end
+
+    # Ensure commands are run from the root dir
+    def root_dir?
+      %w(base spec sectests).each do |dirrepo_name|
+        if !File.exist?(dirrepo_name)
+          say("Commands must be run from the root directory\nExiting....", :red)
+          exit(1)
+        end
+      end
+    end
   end
 end

data/lib/norad_cli/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module NoradCli
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norad_cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Blake Hitchcock