enable inspec compliance cli support automate #1297

vjeffrey · 2016-11-16T01:53:32Z

b inspec compliance login_automate http://delivery --user admin --dctoken $DC_TOKEN --ent $AUTOMATE_ENT

b inspec compliance login_automate http://delivery --user $AUTOMATE_USER --usertoken $AUTOMATE_TOKEN --ent $AUTOMATE_ENT

b inspec compliance profiles

b inspec compliance upload ~/linux.tar.gz

b inspec compliance logout <-- just destroys config when automate

b inspec compliance version <-- returns msg saying that's not available with automate

b inspec compliance exec admin/linux

vjeffrey · 2016-11-17T03:45:10Z

@alexpop could you test this out please?

chris-rock

Great work @vjeffrey

chris-rock · 2016-11-21T05:26:30Z

lib/bundles/inspec-compliance/cli.rb

@@ -56,6 +57,32 @@ def login(server) # rubocop:disable Metrics/AbcSize
      puts '', msg
    end

+    desc "automate SERVER --user='USER' --dctoken='DATA_COLLECTOR_TOKEN' or --usertoken='AUTOMATE_TOKEN' --ent='ENT'", 'Log in to an Automate SERVER'


should we call it login-automate?

I am not 100% sure on this. What would be a better way to name it? Another option could be to just stick with inspec compliance login and just offer more options there. On the other hand this may become more complex for a user to understand which config is for which server? What are you thinking?

I had started out with just making it an extension of inspec compliance login, but then i couldn't display the desc well with the different options...which is why I went this route. I'm up for a rename to login-automate, i think that makes sense.

chris-rock · 2016-11-21T05:27:12Z

lib/bundles/inspec-compliance/cli.rb

      # iterate over tests and add compliance scheme
-      tests = tests.map { |t| 'compliance://' + t }
-
+      config['automate'][0] ? tests = tests.map { |t| 'automate://' + t } : tests = tests.map { |t| 'compliance://' + t }


I would prefer if we could stick to compliance:// no matter if the profiles are stored in Chef Compliance or Chef Automate

chris-rock · 2016-11-21T05:28:56Z

lib/bundles/inspec-compliance/target.rb

      uri = if target.is_a?(String) && URI(target).scheme == 'compliance'
              URI(target)
+            elsif target.is_a?(String) && URI(target).scheme == 'automate'


I think we do not need the automate scheme

oh ya, you're right - i'll change that

vjeffrey · 2016-11-21T21:58:19Z

conversation with hannah:

inspec compliance

inspec compliance login > automate http://delivery --user=admin --ent=cd

Please specify a token using --dctoken='DATA_COLLECTOR_TOKEN' or usertoken='AUTOMATE_TOKEN'

--dctoken='fnjknefkje'

hannah-radish · 2016-11-21T23:40:20Z

@vjeffrey Does this make sense to you?

vjeffrey · 2016-11-22T15:59:54Z

thanks hannah!!!!!
coloring and prompt will be taken care of in separate issues, referenced above (1310 and 1311)

vjeffrey · 2016-11-22T16:00:15Z

i'll update this change to address comments later today/wednesday morning at latest

hannah-radish · 2016-11-23T00:13:05Z

Updated the color pallet here as well: https://github.com/chef/inspec/pull/1313/files

vjeffrey · 2016-11-23T04:03:19Z

updated to name it login_automate and removed the unnecessary automate scheme logic

chris-rock · 2016-11-29T11:18:33Z

lib/bundles/inspec-compliance/cli.rb

        config = Compliance::Configuration.new
        url = "#{config['server']}/logout"
        Compliance::API.post(url, config['token'], config['insecure'], !config.supported?(:oidc))
      end
-


I think we should clear the token information of the config

Also we should remove the the server information from the config. This was missing even before

chris-rock · 2016-11-29T11:21:04Z

lib/bundles/inspec-compliance/cli.rb

@@ -198,6 +228,29 @@ def logout

    private

+    def login_automate_config(url, user, dctoken, usertoken, ent)
+      config = Compliance::Configuration.new
+      config['server'] = url


we should have a config['server_type'] to indicate the type of server. At the moment that is compliance and automate

chris-rock · 2016-11-29T11:21:32Z

lib/bundles/inspec-compliance/cli.rb

+    def login_automate_config(url, user, dctoken, usertoken, ent)
+      config = Compliance::Configuration.new
+      config['server'] = url
+      config['ent'] = ent


We should store all automate specific config under the section config['automate']

chris-rock · 2016-11-29T11:23:32Z

lib/bundles/inspec-compliance/api.rb

    # return all compliance profiles available for the user
    def self.profiles(config)
-      url = "#{config['server']}/user/compliance"
+      config['automate'][0] ? url = "#{config['server']}/#{config['user']}" : url = "#{config['server']}/user/compliance"


I am not fan of config['automate'][0]. We should ask directly for the information we need: config['automate']['ent']. For this case I propose config['server_type']

chris-rock · 2016-11-29T11:24:36Z

lib/bundles/inspec-compliance/cli.rb

@@ -56,6 +57,33 @@ def login(server) # rubocop:disable Metrics/AbcSize
      puts '', msg
    end

+    desc "login_automate SERVER --user='USER' --ent='ENT' --dctoken or --usertoken='TOKEN'", 'Log in to an Automate SERVER'


I like the login_automate approach

chris-rock · 2016-11-29T11:25:34Z

lib/bundles/inspec-compliance/target.rb

@@ -26,14 +25,21 @@ def self.resolve(target)
      # check if we have a compliance token
      config = Compliance::Configuration.new
      if config['token'].nil?
+        if config['automate'][0]
+          server = 'automate'
+          msg = 'inspec compliance automate https://your_automate_server --user USER --ent ENT --dctoken DCTOKEN or --usertoken USERTOKEN'


This should be inspec compliance login_automate ...

chris-rock · 2016-11-29T11:26:00Z

lib/bundles/inspec-compliance/target.rb

@@ -26,14 +25,21 @@ def self.resolve(target)
      # check if we have a compliance token
      config = Compliance::Configuration.new
      if config['token'].nil?
+        if config['automate'][0]
+          server = 'automate'


Lets use this in config['server_type']

chris-rock · 2016-11-29T11:27:12Z

lib/fetchers/url.rb

@@ -126,7 +126,19 @@ def download_archive_to_temp
      Inspec::Log.debug("Fetching URL: #{@target}")
      http_opts = {}
      http_opts['ssl_verify_mode'.to_sym] = OpenSSL::SSL::VERIFY_NONE if @insecure
-      http_opts['Authorization'] = "Bearer #{@token}" if @token
+      if @config


If we have the server_type, lets do a simple if then clause

Signed-off-by: Victoria Jeffrey <vjeffrey@chef.io>

chris-rock · 2016-11-30T13:15:08Z

lib/bundles/inspec-compliance/api.rb

-            { org: owner, name: name }
-          end
-        end.flatten
+        if config['server_type'] == 'automate'


as discussed with @Vj we talk with @alexpop to find a way to harmonize this part

chris-rock · 2016-11-30T13:16:35Z

lib/bundles/inspec-compliance/http.rb

@@ -9,13 +9,21 @@ module Compliance
  # implements a simple http abstraction on top of Net::HTTP
  class HTTP
    # generic get requires
-    def self.get(url, token, insecure, basic_auth = false)
+    def self.get(url, token, insecure, user, basic_auth = false, automate = nil, server_type) # rubocop:disable Metrics/ParameterLists


As discussed with @vjeffrey we think we can abstract that even further:

def self.get(url, headers, insecure). This would allow us to pass in the required headers from outside:

headers = { 'x-data-collector-token': token } headers = { 'chef-delivery-user': user, 'chef-delivery-token': token, } headers = { 'Authorization', "Bearer #{token}", }

vjeffrey · 2016-11-30T14:33:32Z

@chris-rock pushed up a commit with updated headers stuffs

Signed-off-by: Victoria Jeffrey <vjeffrey@chef.io>

chris-rock · 2016-11-30T17:22:42Z

Awesome. Thank you @vjeffrey

vjeffrey added the in progress label Nov 16, 2016

vjeffrey force-pushed the vj/support-asset-store-compliance-cli branch 7 times, most recently from 284a9ac to e57036a Compare November 17, 2016 03:22

vjeffrey changed the title ~~wip: enable inspec compliance cli support automate~~ enable inspec compliance cli support automate Nov 17, 2016

vjeffrey force-pushed the vj/support-asset-store-compliance-cli branch from e57036a to 9038be7 Compare November 17, 2016 03:43

vjeffrey force-pushed the vj/support-asset-store-compliance-cli branch 4 times, most recently from fa6aeef to dbf37eb Compare November 17, 2016 13:32

chris-rock reviewed Nov 21, 2016

View reviewed changes

This was referenced Nov 22, 2016

Prompt for token in inspec compliance login > automate #1310

Closed

Introduce colors to the inspec compliance cli #1311

Closed

vjeffrey force-pushed the vj/support-asset-store-compliance-cli branch 6 times, most recently from 2d6e29e to 1d5530b Compare November 27, 2016 18:28

vjeffrey force-pushed the vj/support-asset-store-compliance-cli branch 3 times, most recently from 625c206 to bc48d59 Compare November 27, 2016 18:58

chris-rock assigned vjeffrey Nov 28, 2016

chris-rock reviewed Nov 29, 2016

View reviewed changes

chris-rock force-pushed the vj/support-asset-store-compliance-cli branch from bc48d59 to 8c69a97 Compare November 29, 2016 11:29

vjeffrey force-pushed the vj/support-asset-store-compliance-cli branch 2 times, most recently from 777ef1a to 7e0c7c8 Compare November 29, 2016 14:52

chris-rock force-pushed the vj/support-asset-store-compliance-cli branch from 7e0c7c8 to e2d5b0e Compare November 30, 2016 09:20

Victoria Jeffrey added 2 commits November 30, 2016 13:27

Extend inspec compliance cli to support automate backend

bdf5eae

Signed-off-by: Victoria Jeffrey <vjeffrey@chef.io>

address comments

60009b2

Signed-off-by: Victoria Jeffrey <vjeffrey@chef.io>

chris-rock force-pushed the vj/support-asset-store-compliance-cli branch from e2d5b0e to 60009b2 Compare November 30, 2016 12:28

chris-rock reviewed Nov 30, 2016

View reviewed changes

vjeffrey force-pushed the vj/support-asset-store-compliance-cli branch from c6e725e to 6aeba49 Compare November 30, 2016 14:32

chris-rock force-pushed the vj/support-asset-store-compliance-cli branch from 6aeba49 to 544784b Compare November 30, 2016 16:49

refactor headers retrieval into get_headers method

d8b512e

Signed-off-by: Victoria Jeffrey <vjeffrey@chef.io>

chris-rock force-pushed the vj/support-asset-store-compliance-cli branch from 544784b to d8b512e Compare November 30, 2016 17:10

chris-rock merged commit 939e6ca into master Nov 30, 2016

chris-rock deleted the vj/support-asset-store-compliance-cli branch November 30, 2016 17:22

chris-rock removed the in progress label Nov 30, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

enable inspec compliance cli support automate #1297

enable inspec compliance cli support automate #1297

vjeffrey commented Nov 16, 2016 •

edited

Loading

vjeffrey commented Nov 17, 2016 •

edited

Loading

chris-rock left a comment

chris-rock Nov 21, 2016

chris-rock Nov 21, 2016

vjeffrey Nov 21, 2016

chris-rock Nov 21, 2016

chris-rock Nov 21, 2016

vjeffrey Nov 21, 2016

vjeffrey commented Nov 21, 2016 •

edited

Loading

hannah-radish commented Nov 21, 2016

vjeffrey commented Nov 22, 2016

vjeffrey commented Nov 22, 2016

hannah-radish commented Nov 23, 2016

vjeffrey commented Nov 23, 2016

chris-rock Nov 29, 2016

chris-rock Nov 29, 2016

vjeffrey Nov 29, 2016

chris-rock Nov 29, 2016

chris-rock Nov 29, 2016

chris-rock Nov 29, 2016

chris-rock Nov 29, 2016

chris-rock Nov 29, 2016

chris-rock Nov 29, 2016

chris-rock Nov 29, 2016

vjeffrey Nov 29, 2016

chris-rock Nov 30, 2016

chris-rock Nov 30, 2016

vjeffrey commented Nov 30, 2016

chris-rock commented Nov 30, 2016

enable inspec compliance cli support automate #1297

enable inspec compliance cli support automate #1297

Conversation

vjeffrey commented Nov 16, 2016 • edited Loading

vjeffrey commented Nov 17, 2016 • edited Loading

chris-rock left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vjeffrey commented Nov 21, 2016 • edited Loading

hannah-radish commented Nov 21, 2016

vjeffrey commented Nov 22, 2016

vjeffrey commented Nov 22, 2016

hannah-radish commented Nov 23, 2016

vjeffrey commented Nov 23, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vjeffrey commented Nov 30, 2016

chris-rock commented Nov 30, 2016

vjeffrey commented Nov 16, 2016 •

edited

Loading

vjeffrey commented Nov 17, 2016 •

edited

Loading

vjeffrey commented Nov 21, 2016 •

edited

Loading