sambot 0.1.223 → 0.1.225

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5096933a1f30de324555298311a65541e2e5f96c
-  data.tar.gz: 407fa64cc091116c102c696cb31167e9b3a4eebb
+  metadata.gz: 181b34f8dc667713236f6eb5b977d4867b03dcb5
+  data.tar.gz: 73117bd92de7f49725971cb1a1a71671f48852dd
 SHA512:
-  metadata.gz: 6abbedc56de4aa5da548d924fb6418166ca16345dd596616c5f28543f4425c932ddc7dbe07f3de7f006828a29590637d5595a60f648a61904b8bf42ffe3764b3
-  data.tar.gz: 37662ebcdadee13a0d56c4c8e8434bb3567f11f45b0b887b9c39c56a292d37c0c2cd6f99262dd6fe44dea5545c91e163bb3e5fdece8f5869e5d10aecb3bf4e89
+  metadata.gz: eb5c17af4f26acf78f6409965e524ae0959cedc09b5c96d5c8f23e8770cea813f0f91446895fb8286a7be195fc29b13c05b77046a9733fd3bdfea3f0290cfb4a
+  data.tar.gz: 07f4af7a8f0bf13babb5293c4220543c0689490fe876871e414b9568c10ccac24d89a458af0e82e7ff7a1f5bc2f13009849c21911de175599c288dc26f921ede

data/integration_tests/.byebug_history

@@ -0,0 +1,3 @@
+c
+existing_secret.data
+existing_secret

data/integration_tests/.config.yml

@@ -0,0 +1,31 @@
+name: as-ldap-server
+version: 0.0.7
+platforms:
+- centos
+identifier:
+description: Installs the 389-ds directory server
+dependencies:
+- as-vault-token-v2
+suites:
+  - name: default
+    run_list:
+      - recipe[as-ldap-server::default]
+    verifier:
+      inspec_tests:
+      - name: as-ldap-server-profile
+        path: controls
+local_testing:
+  secrets:
+   - description: LDAP root password hash
+     path: dev/nightswatch/ldap/root_dn_pwd
+     keys:
+     - ssha: '{SSHA}QkYU9g2DCC8CuavASnoEQ+9i8LuePRs='
+   - description: GCS backup credentials
+     path: dev/nightswatch/gcs/backupcreds
+     keys:
+     - access_key: GOOG5AA6QCCSQ2TNKOUA
+     - secret_key: oKVkpPerVeMDxfj/OOYkuHXgj/tIbfejCRlPkdFF
+   - description: GCS backup encryption key
+     path: dev/nightswatch/gcs/backup_encryption_key
+     keys:
+     - value: Fj9zCPAJw9t125O

data/integration_tests/vault_helper_spec.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'spec_helper'
+require 'awesome_print'
+require 'byebug'
 
 VaultHelper = Sambot::Testing::VaultHelper
 Fixtures = Sambot::Testing::Fixtures
@@ -31,6 +33,18 @@ RSpec.describe Sambot::Testing::VaultHelper do
 
   end
 
+  context '.load_secrets()' do
+
+    it 'can save multiple keys' do
+      config = Sambot::Config.read
+      VaultHelper.load_secrets(config)
+      secret = VaultHelper.read_path('dev/nightswatch/gcs/backupcreds')
+      expect(secret.data[:access_key]).to_not be nil
+      expect(secret.data[:secret_key]).to_not be nil
+    end
+
+  end
+
   context '.generate_wrapped_token()' do
 
     it 'generates the correct token' do

data/lib/sambot/testing/vault_helper.rb

@@ -64,6 +64,16 @@ module Sambot
           end
         end
 
+        def read_path(path)
+          configure
+          Vault.logical.read(path)
+        end
+
+        def read_field(path, key)
+          configure
+          Vault.logical.read(path, key)
+        end
+
         private
 
         def store_secrets(secrets, src)
@@ -88,8 +98,13 @@ module Sambot
         end
 
         def write_to_vault(path, key, value)
-          configure
-          Vault.logical.write(path, key.to_sym => value)
+          existing_secret = Vault.logical.read(path)
+          new_value =  {key.to_sym => value}
+          if existing_secret
+            UI.info("Adding the key '#{key}' to the existing path '#{path}'")
+            new_value = new_value.merge(existing_secret.data)
+          end
+          Vault.logical.write(path, new_value)
         end
 
       end

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.223'
+  VERSION = '0.1.225'
 end

data/sambot.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'teamcity-ruby-client'
   spec.add_dependency 'open4'
   spec.add_dependency 'diplomat'
+  spec.add_dependency 'byebug'
   spec.add_dependency 'semantic'
   spec.add_dependency 'chef', '~> 12.18'
   spec.add_dependency 'thor', '~> 0.19'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.223
+  version: 0.1.225
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -391,6 +405,8 @@ files:
 - README.md
 - bin/sambot
 - bin/setup
+- integration_tests/.byebug_history
+- integration_tests/.config.yml
 - integration_tests/docker-compose.yml
 - integration_tests/spec_helper.rb
 - integration_tests/vault_helper_spec.rb