From ece00a89af430ab1a88360b10153dea82fb88953 Mon Sep 17 00:00:00 2001 From: Ruairi Fennell Date: Thu, 7 Nov 2019 13:52:14 +0000 Subject: [PATCH] Fix inspec_version, remove redundant rakefile calls Signed-off-by: Ruairi Fennell --- Rakefile | 5 ++--- inspec.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Rakefile b/Rakefile index b46e4872f..f6a395b55 100644 --- a/Rakefile +++ b/Rakefile @@ -18,7 +18,7 @@ REQUIRED_ENVS = %w{AZURE_CLIENT_ID AZURE_CLIENT_SECRET AZURE_TENANT_ID AZURE_SUB task default: :test desc 'Testing tasks' -task test: %w{test:unit azure:login test:integration} +task test: %w{lint test:unit test:integration} desc 'Linting tasks' task lint: [:rubocop, :'syntax:ruby', :'syntax:inspec'] @@ -101,13 +101,12 @@ end namespace :test do Rake::TestTask.new(:unit) do |t| - puts '-> Running Unit Tests' t.libs << 'test/unit' t.libs << 'libraries' t.test_files = FileList['test/unit/**/*_test.rb'] end - task :integration, [:controls] => [:lint, :unit, 'attributes:write', :setup_env] do |_t, args| + task :integration, [:controls] => ['attributes:write', :setup_env] do |_t, args| cmd = %W( bin/inspec exec test/integration/verify --input-file terraform/#{ENV['ATTRIBUTES_FILE']} --reporter progress diff --git a/inspec.yml b/inspec.yml index 719885f9a..cda07911d 100644 --- a/inspec.yml +++ b/inspec.yml @@ -6,6 +6,6 @@ copyright_email: support@chef.io license: Apache-2.0 summary: This resource pack provides compliance resources for Azure. version: 1.9.1 -inspec_version: 1.9.1 +inspec_version: '>= 4.0.0' supports: - platform: azure