hieraviz 0.1.1 → 0.1.2

data/app/public/js/nodes.js

@@ -35,7 +35,6 @@ ready( () => {
     }
   }
 
-
   function build_line(top, file, key, value, overriden) {
     if (overriden === true) {
       rowclass = "row overriden";
@@ -84,7 +83,6 @@ ready( () => {
       wrapper.className = 'rows info';
       top.appendChild(wrapper);
       Array.prototype.forEach.call(Object.keys(hash), (item, k) => {
-        console.log(item);
         addTo(wrapper,  "<div class=\"row\">" +
                         "<span class=\"infokey\">" + item + "</span>" +
                         "<span class=\"infovalue\">" + JSON.stringify(hash[item], null, 2) + "</span>" +
@@ -98,6 +96,163 @@ ready( () => {
     window.location.hash = '#' + title +'/info';
   }
 
+  function update_facts(node, facts) {
+    var req = new Request(
+      '/v1/' + base + '/node/' + node + '/facts',
+      { 
+        method: 'POST',
+        headers: {
+          'Accept': 'application/json',
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(facts)
+      }
+    );
+    fetch(req, auth_header()).
+      then(res => res.json()).
+      then(j => {
+        if (j.error != undefined) {
+          show_error(hierachy, j['error']);
+        } else {
+          location.reload();
+        }
+      });
+  }
+
+  function get_input() {
+    var input = document.querySelectorAll('input.userinput');
+    var output = {};
+    Array.prototype.forEach.call(Object.keys(input), (item, k) => {
+      output[input[item].name] = input[item].value;
+    });
+    return output;
+  }
+
+  function clear_input(node) {
+    var req = new Request(
+      '/v1/' + base + '/node/' + node + '/facts',
+      { method: 'DELETE' }
+    );
+    fetch(req, auth_header()).
+      then(res => res.json()).
+      then(j => {
+        if (j.error != undefined) {
+          show_error(hierachy, j['error']);
+        } else {
+          location.reload();
+        }
+      });
+  }
+
+  function build_hierarchy(top, node) {
+    var hierarchy = document.createElement('div');
+    hierarchy.className = 'hierarchy';
+    top.insertBefore(hierarchy, top.firstChild);
+    fetch('/v1/' + base + '/node/' + node + '/hierarchy', auth_header()).
+      then(res => res.json()).
+      then(j => {
+        var hierachy = document.querySelector('div.hierarchy');
+        if (j.error != undefined) {
+          show_error(hierachy, j['error']);
+        } else {
+          console.debug(j);
+          // --------------------
+          addTo(hierarchy, "<h3>From hiera config</h3>");
+          var hierafiles = document.createElement('div');
+          hierafiles.className = "hierafiles";
+          hierarchy.appendChild(hierafiles);
+          Array.prototype.forEach.call(Object.keys(j.hiera), (item, k) => {
+            addTo(hierafiles, "<div>"+j.hiera[item]+"</div>");
+          });
+          // --------------------
+          addTo(hierarchy, "<h3>From Node Data</h3>");
+          var nodeinfo = document.createElement('div');
+          nodeinfo.className = "nodeinfo";
+          hierarchy.appendChild(nodeinfo);
+          Array.prototype.forEach.call(Object.keys(j.info), (item, k) => {
+            var index = j.vars.indexOf(item);
+            if (index > -1 && (j.facts == null || j.facts[item] == undefined)) {
+              addTo(nodeinfo, "<div class=\"var\"><div class=\"label\">"+item+"</div>" + 
+                              "<div><input type=\"text\" name=\""+item+"\" value=\""+j.info[item]+"\" disabled></div></div>");
+              j.vars.splice(index, 1);
+            }
+          });
+          // --------------------
+          addTo(hierarchy, "<h3>From Facts</h3>");
+          var factinfo = document.createElement('div');
+          factinfo.className = "factinfo";
+          hierarchy.appendChild(factinfo);
+          if (j.facts == null) {
+            Array.prototype.forEach.call(Object.keys(j.vars), (item, k) => {
+              if (j.defaults != null && j.defaults[j.vars[item]] != undefined) {
+                addTo(factinfo, "<div class=\"var\"><div class=\"label\">"+j.vars[item]+"</div>" +
+                                "<div><input type=\"text\" class=\"userinput\" name=\"" +
+                                j.vars[item]+"\" value=\"" + 
+                                j.defaults[j.vars[item]]+"\"></div></div>");
+              }
+            });
+            Array.prototype.forEach.call(Object.keys(j.vars), (item, k) => {
+              if (j.defaults == null || j.defaults[j.vars[item]] == undefined) {
+                addTo(factinfo, "<div class=\"var\"><div class=\"label\">"+j.vars[item]+"</div>" +
+                                "<div><input type=\"text\" class=\"userinput\" name=\"" + 
+                                j.vars[item]+"\" value=\"\"></div></div>");
+              }
+            });
+          } else {
+            Array.prototype.forEach.call(Object.keys(j.facts), (item, k) => {
+              var override = '';
+              if (j.defaults != null && j.defaults[item] != undefined) {
+                override = " <i>("+j.defaults[item]+")</i>";
+              }
+              addTo(factinfo, "<div class=\"var\"><div class=\"label\">" +
+                              item + override + "</div>" +
+                              "<div><input type=\"text\" class=\"userinput\" name=\"" +
+                              item + "\" value=\"" + 
+                              j.facts[item]+"\"></div></div>");
+            
+            });
+          }
+          var updatediv = document.createElement('div');
+          updatediv.className = "updateinfo";
+          hierarchy.appendChild(updatediv);
+          // . . . . . . . . . . .
+          var updateinfo = document.createElement('button');
+          updateinfo.id = 'updateinfo';
+          updateinfo.innerText = 'Update';
+          updatediv.appendChild(updateinfo);
+          updateinfo.addEventListener('click', (ev) => {
+            var fields = get_input();
+            update_facts(node, fields);
+          });
+          // // . . . . . . . . . . .
+          // var checkinfo = document.createElement('button');
+          // checkinfo.id = 'checkinfo';
+          // checkinfo.innerText = 'Check';
+          // updatediv.appendChild(checkinfo);
+          // checkinfo.addEventListener('click', (ev) => {
+
+          // });
+          // . . . . . . . . . . .
+          var restoreinfo = document.createElement('button');
+          restoreinfo.id = 'restoreinfo';
+          restoreinfo.innerText = 'Restore Defaults';
+          updatediv.appendChild(restoreinfo);
+          restoreinfo.addEventListener('click', (ev) => {
+            clear_input(node);
+            location.reload();
+          });
+          // --------------------
+          addTo(hierarchy, "<h3>Resulting files</h3>");
+          var nodefiles = document.createElement('div');
+          nodefiles.className = "nodefiles";
+          hierarchy.appendChild(nodefiles);
+          Array.prototype.forEach.call(Object.keys(j.files), (item, k) => {
+            addTo(nodefiles, "<div>"+j.files[item]+"</div>");
+          });
+        }
+      });
+  }
+
   function build_params(top, title, hash) {
     if (Object.keys(hash).length > 0) {
       var wrapper = document.createElement('div');
@@ -108,6 +263,7 @@ ready( () => {
       });
       var rows = document.querySelectorAll('div.row');
       filterBox(".paramfilter input", rows);
+      build_hierarchy(top, title);
     } else {
       addTo(top, "<div>There is no params in this node.</div>\n");
     }
@@ -136,7 +292,7 @@ ready( () => {
       fetch('/v1/' + base + '/node/' + node, auth_header()).
         then(res => res.json()).
         then(j => {
-          console.log(auth_header().headers.getAll('x-auth'));
+          // console.log(auth_header().headers.getAll('x-auth'));
           build_top(node);
           if (j.error != undefined) {
             show_error(meat, j['error']);
@@ -197,6 +353,7 @@ ready( () => {
     });
   });
 
+  update_footer('/v1/' + base + '/nodes');
   restore_url(nodes);
 
 });

data/app/views/farms.erb

@@ -7,8 +7,8 @@
 <input type="text" name="filter" />
 </form>
 <ul>
-<% @farms.each do |farm| %>
-<li class="farm" data-env="<%= @base %>" data-item="<%= farm %>"><%= farm %></li>
+<% @farms.each do |farm, count| %>
+<li class="farm<%= ' none' if count == 0 %>" data-env="<%= @base %>" data-item="<%= farm %>"><%= farm %> <span class="count"><%= count %></span></li>
 <% end %>
 </ul>
 </div>

data/app/views/user.erb

@@ -18,5 +18,11 @@ ready( () => {
 <% end -%>
 <% end -%>
 <tr><td>Session Key</td><td><%= session['access_token'] %></td></tr>
+<% if settings.configdata['auth_method'] == 'gitlab' -%>
+<tr><td>Manage authorization</td><td>
+<a href="<%= settings.configdata['gitlab_auth']['host'] %>/profile/applications">
+  <%= settings.configdata['gitlab_auth']['host'] %>/profile/applications
+</a></td></tr>
+<% end -%>
 </table>
 </div>

data/app/web.rb

@@ -29,6 +29,24 @@ module HieravizApp
     end
 
     case settings.configdata['auth_method']
+    when 'dummy'
+
+      get '/logout' do
+        session.delete :access_token
+        erb :logout
+      end
+
+      get '/login' do
+        session[:access_token] = '0000'
+        redirect '/'
+      end
+
+      helpers do
+        def check_authorization
+          'dummy'
+        end
+      end
+
     when 'http'
 
       use Rack::Auth::Basic, "Puppet Private Access" do |username, password|
@@ -37,18 +55,15 @@ module HieravizApp
       end
 
       get '/logout' do
-        erb :logout, layout: :_layout
+        erb :logout
       end
 
       helpers do
-        def get_username
-          settings.configdata['http_auth']['username']
-        end
-        def get_userinfo
-          { 'username' => settings.configdata['http_auth']['username'] }
-        end
         def check_authorization
-          true
+          if !session['access_token']
+            session[:access_token] = settings.configdata['http_auth']['access_token']
+          end
+          settings.configdata['http_auth']['username']
         end
       end
 
@@ -57,20 +72,6 @@ module HieravizApp
       set :oauth, Hieraviz::AuthGitlab.new(settings.configdata['gitlab_auth'])
 
       helpers do
-        def get_username
-          if session['access_token']
-            session_info = Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
-            if session_info
-              session_info['username']
-            else
-              ''
-            end
-          end
-        end
-
-        def get_userinfo
-          Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
-        end
 
         def check_authorization
           if !session['access_token']
@@ -131,7 +132,7 @@ module HieravizApp
     get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       @username = check_authorization
       hieracles_config = prepare_config(base)
-      @farms = Hieracles::Registry.farms(hieracles_config)
+      @farms = Hieracles::Registry.farms_counted(hieracles_config, base)
       erb :farms
     end
 

data/lib/hieraviz/auth_gitlab.rb

@@ -43,9 +43,7 @@ module Hieraviz
         if resp['error'] ||
            (resp[@settings['required_response_key']] &&
            resp[@settings['required_response_key']] != resp[@settings['required_response_value']])
-          false
-        else
-          true
+          return false
         end
       end
       true

data/lib/hieraviz/config.rb

@@ -3,7 +3,7 @@ module Hieraviz
     extend self
 
     def load
-      @_config ||= YAML.load_file(configfile)
+      @_config = YAML.load_file(configfile)
     end
 
     def configfile

data/lib/hieraviz/facts.rb

@@ -0,0 +1,27 @@
+module Hieraviz
+  class Facts
+
+    def initialize(tmpdir, base, node, user)
+      @filename = File.join(tmpdir, "#{base}__#{node}__#{user}")
+    end
+    
+    def exist?
+      File.exist? @filename
+    end
+
+    def read
+      if exist?
+        Marshal.load(File.binread(@filename))
+      end
+    end
+    
+    def write(data)
+      File.open(@filename, 'wb') {|f| f.write(Marshal.dump(data)) }
+    end
+
+    def remove
+      File.unlink @filename
+    end
+
+  end
+end

data/lib/hieraviz/puppetdb.rb

@@ -0,0 +1,13 @@
+module Hieraviz
+  class Puppetdb
+
+    def initialize(config)
+      @request = Hieracles::Puppetdb::Request.new config
+    end
+
+    def events
+      @request.events
+    end
+
+  end
+end

data/lib/hieraviz/version.rb

@@ -1,3 +1,3 @@
 module Hieraviz
-  VERSION = "0.1.0"
+  VERSION = File.read(File.expand_path('../../../CHANGELOG.md', __FILE__))[/([0-9]+\.[0-9]+\.[0-9]+)/]
 end

data/lib/hieraviz.rb

@@ -2,7 +2,9 @@ require 'hieracles'
 require "hieraviz/version"
 require "hieraviz/config"
 require "hieraviz/store"
+require "hieraviz/facts"
 require "hieraviz/auth_gitlab"
+require "hieraviz/puppetdb"
 
 module Hieraviz
   # Your code goes here...

data/spec/app/apiv1_spec.rb

@@ -1,11 +1,10 @@
-require 'spec_helper'
 require 'sinatra_helper'
 
 describe HieravizApp::ApiV1 do
 
   context "page not found" do
     describe "GET /v1/blahblah" do
-      let(:expected) { { 'error' => "data not found" }  }
+      let(:expected) { { 'error' => "endpoint not found" }  }
       before do
         get '/blahblah'
       end
@@ -171,13 +170,21 @@ describe HieravizApp::ApiV1 do
       it { expect(JSON.parse last_response.body).to eq expected }
     end
     describe "GET /v1/farms" do
-      let(:expected) { ['farm1'] }
+      let(:expected) { { "farm1" => 0 } }
       before do
         get '/farms'
       end
       it { expect(last_response).to be_ok }
       it { expect(JSON.parse last_response.body).to eq expected }
     end
+    describe "GET /v1/vars" do
+      let(:expected) { ['fqdn', 'farm'] }
+      before do
+        get '/vars'
+      end
+      it { expect(last_response).to be_ok }
+      it { expect(JSON.parse last_response.body).to eq expected }
+    end
   end
 
 end

data/spec/app/web_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'sinatra_helper'
 
 describe HieravizApp::Web do
@@ -44,7 +43,10 @@ describe HieravizApp::Web do
       it { expect(last_response.status).to eq 404 }
       it { expect(last_response.body).to include 'Page not found' }
     end
+    describe "GET /user" do
+      before { get '/user' }
+      it { expect(last_response.body).to include 'toto' }
+    end
   end
 
-
 end

data/spec/files/config.yml

@@ -16,6 +16,7 @@ auth_method: http
 http_auth:
   username: 'toto'
   password: 'toto'
+  access_token: '123456'
 gitlab_auth:
   host: https://gitlab.example.com
   application_id: xxxid

data/spec/files/config_dummy.yml

@@ -0,0 +1,27 @@
+---
+app_name: HieraViz
+basepath: "spec/files/puppet"
+classpath: "farm_modules/%s/manifests/init.pp"
+hierafile: "hiera.yml"
+session_seed: "toto"
+tmpdir: "spec/files/tmp"
+session_renew: 3600
+usedb: false
+debug: false
+puppetdb:
+  usessl: false
+  host: puppetdb.example.com
+  port: 8080
+
+auth_method: dummy
+http_auth:
+  username: 'toto'
+  password: 'toto'
+  access_token: '123456'
+gitlab_auth:
+  host: https://gitlab.example.com
+  application_id: xxxid
+  secret: xxxsecret
+  resource_required: '/api/v3/projects/group%2Fpuppet'
+  required_response_key: 'id'
+  required_response_value: '42'

data/spec/files/config_gitlab.yml

@@ -16,6 +16,7 @@ auth_method: gitlab
 http_auth:
   username: 'toto'
   password: 'toto'
+  access_token: '123456'
 gitlab_auth:
   host: https://gitlab.example.com
   application_id: xxxid

data/spec/files/config_multi.yml

@@ -0,0 +1,27 @@
+---
+app_name: HieraViz
+basepath: "spec/files/puppet"
+basepath_dir: "spec/files/puppet*"
+classpath: "farm_modules/%s/manifests/init.pp"
+hierafile: "hiera.yml"
+session_seed: "toto"
+tmpdir: "spec/files/tmp"
+session_renew: 3600
+usedb: false
+debug: false
+puppetdb:
+  usessl: false
+  host: puppetdb.example.com
+  port: 8080
+auth_method: http
+http_auth:
+  username: 'toto'
+  password: 'toto'
+  access_token: '123456'
+gitlab_auth:
+  host: https://gitlab.example.com
+  application_id: xxxid
+  secret: xxxsecret
+  resource_required: '/api/v3/projects/group%2Fpuppet'
+  required_response_key: 'id'
+  required_response_value: '42'

data/spec/files/puppet2/enc/node1.example.com.yaml

@@ -0,0 +1,7 @@
+---
+classes: 
+  - farm1
+parameters:
+  country: fr
+  datacenter: equinix
+  farm: dev

data/spec/files/puppet2/farm_modules/farm1/manifests/init.pp

@@ -0,0 +1,3 @@
+class farm1 {
+  include module1
+}

data/spec/files/puppet2/hiera.yml

@@ -0,0 +1,10 @@
+---
+:backends:
+  - yaml
+:hierarchy:
+  - "nodes/%{fqdn}"
+  - "farm/%{farm}"
+  - "common/common"
+:yaml:
+  :datadir: "params/"
+:merge_behavior: deeper

data/spec/files/puppet2/modules/module1/init.pp

@@ -0,0 +1,2 @@
+class module1 {
+}

data/spec/files/puppet2/params/common/common.yaml

@@ -0,0 +1,4 @@
+param1:
+  subparam1: value common
+param2:
+  subparam2: another value

data/spec/files/puppet2/params/nodes/node1.example.com.yaml

@@ -0,0 +1,2 @@
+param1:
+  subparam1: value1

data/spec/lib/config_spec.rb

@@ -2,23 +2,62 @@ require 'spec_helper'
 
 describe Hieraviz::Config do
 
-  before do
-    ENV['HIERAVIZ_CONFIG_FILE'] = File.expand_path '../../files/config.yml', __FILE__
-  end
+  context 'with a single puppet dir' do
+    before do
+      ENV['HIERAVIZ_CONFIG_FILE'] = File.expand_path '../../files/config.yml', __FILE__
+      Hieraviz::Config.load
+    end
 
-  describe '.load' do
-    let(:expected) { "spec/files/puppet" }
-    it { expect(Hieraviz::Config.load['basepath']).to eq expected }
-  end
+    describe '.load' do
+      let(:expected) { "spec/files/puppet" }
+      it { expect(Hieraviz::Config.load['basepath']).to eq expected }
+    end
+
+    describe '.configfile' do
+      let(:expected) { File.expand_path('../../files/config.yml', __FILE__) }
+      it { expect(Hieraviz::Config.configfile).to eq expected }
+    end
+
+    describe '.basepaths' do
+      let(:expected) { nil }
+      it { expect(Hieraviz::Config.basepaths).to eq expected }
+    end
 
-  describe '.configfile' do
-    let(:expected) { File.expand_path('../../files/config.yml', __FILE__) }
-    it { expect(Hieraviz::Config.configfile).to eq expected }
+    describe '.root' do
+      let(:expected) { File.expand_path('../../../', __FILE__) }
+      it { expect(Hieraviz::Config.root).to eq expected }
+    end
+
+    describe '.root_path' do
+      context 'when path starts with a slash' do
+        let(:path) { '/some/path' }
+        let(:expected) { path }
+        it { expect(Hieraviz::Config.root_path path).to eq expected }
+      end
+      context 'when path don\'t start with a slash' do
+        let(:path) { 'relative/path' }
+        let(:expected) { File.expand_path(File.join('../../../', path), __FILE__) }
+        it { expect(Hieraviz::Config.root_path path).to eq expected }
+      end
+    end
   end
 
-  describe '.root' do
-    let(:expected) { File.expand_path('../../../', __FILE__) }
-    it { expect(Hieraviz::Config.root).to eq expected }
+  context 'with multiple puppet dirs' do
+    before do
+      ENV['HIERAVIZ_CONFIG_FILE'] = File.expand_path '../../files/config_multi.yml', __FILE__
+      Hieraviz::Config.load
+    end
+
+    describe '.basepaths' do
+      let(:expected) { 
+        [
+          File.expand_path('../../../spec/files/puppet', __FILE__),
+          File.expand_path('../../../spec/files/puppet2', __FILE__)
+        ]
+      }
+      it { expect(Hieraviz::Config.basepaths).to match_array(expected) }
+    end
+
   end
 
 end

data/spec/lib/facts_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Hieraviz::Facts do
+
+  let(:tmpdir) { "spec/files/tmp" }
+  let(:base) { "base" }
+  let(:node) { "node" }
+  let(:user) { "dummy" }
+  let(:facts) { Hieraviz::Facts.new tmpdir, base, node, user }
+  let(:expected) { "spec/files/tmp/base__node__dummy" }
+
+  describe '.new' do
+    it { expect(facts.instance_variable_get(:@filename)).to eq expected }
+  end
+
+  describe '.exist?' do
+    context 'when file exists' do
+      before { FileUtils.touch expected }
+      after  { File.unlink expected }
+      it { expect(facts.exist?).to be_truthy }
+    end
+    context 'when file does not exist' do
+      it { expect(facts.exist?).to be_falsey }
+    end
+  end
+
+  describe '.write' do
+    let(:data) { Object.new }
+    before { facts.write(data) }
+    after  { File.unlink expected }
+    it { expect(File).to exist(expected) }
+  end
+
+  describe '.read' do
+    let(:data) { { a: 'b'} }
+    before { facts.write(data) }
+    after  { File.unlink expected }
+    it { expect(facts.read).to eq data }
+  end
+
+end