knife-acl 0.0.12 → 1.0.0.beta.1

data/lib/chef/knife/group_show.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Jeremiah Snapp (<jeremiah@chef.io>)
+# Copyright:: Copyright 2011--2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,38 +20,25 @@
 module OpscodeAcl
   class GroupShow < Chef::Knife
     category "OPSCODE HOSTED CHEF ACCESS CONTROL"
-    banner "knife group show GROUP"
-    
+    banner "knife group show GROUP_NAME"
+
     deps do
-      require 'pp'
-      require 'yaml'
+      include OpscodeAcl::AclBase
     end
 
     def run
-      @user_map = if ::File.exists?("actor-map.yaml")
-                   YAML.load(IO.read("actor-map.yaml"))[:user_map]
-                 else
-                   {:users => {}, :usags => {}}
-                 end
       group_name = name_args[0]
-      if !group_name || group_name.empty?
-        ui.error "must specify a group name"
+
+      if name_args.length != 1
+        show_usage
+        ui.fatal "You must specify group name"
         exit 1
       end
-      chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
-      group = chef_rest.get_rest("groups/#{group_name}")
-      ui.output(annotate_usags(group))
-    end
 
-    def annotate_usags(group)
-      annotated = group["groups"].map do |name|
-        user = @user_map[:usags][name] || ""
-        {"group_id" => name,
-          "user_usag" => user}
-      end
-      group["annotated_groups"] = annotated
-      group
+      validate_member_name!(group_name)
+
+      group = rest.get_rest("groups/#{group_name}")
+      ui.output group
     end
   end
 end
-

data/lib/chef/knife/user_list.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Jeremiah Snapp (<jeremiah@chef.io>)
+# Copyright:: Copyright 2011--2015 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,8 +27,7 @@ module OpscodeAcl
     end
 
     def run
-      chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
-      users = chef_rest.get_rest("users").map { |u| u["user"]["username"] }
+      users = rest.get_rest("users").map { |u| u["user"]["username"] }
       pp users.sort
     end
   end

data/lib/knife-acl/version.rb

@@ -1,3 +1,3 @@
 module KnifeACL
-  VERSION = "0.0.12"
+  VERSION = "1.0.0.beta.1"
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-acl
 version: !ruby/object:Gem::Version
-  version: 0.0.12
-  prerelease: 
+  version: 1.0.0.beta.1
 platform: ruby
 authors:
 - Seth Falcon
+- Jeremiah Snapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies: []
-description: ACL Knife Tools for Opscode hosted Enterprise Chef/Enterprise Chef
-email: support@opscode.com
+description: Knife plugin to manupulate Chef server access control lists
+email: support@chef.io
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -23,14 +23,15 @@ files:
 - README.md
 - lib/chef/knife/acl_add.rb
 - lib/chef/knife/acl_base.rb
+- lib/chef/knife/acl_bulk_add.rb
+- lib/chef/knife/acl_bulk_remove.rb
 - lib/chef/knife/acl_remove.rb
 - lib/chef/knife/acl_show.rb
-- lib/chef/knife/actor_map.rb
-- lib/chef/knife/group_add_actor.rb
+- lib/chef/knife/group_add.rb
 - lib/chef/knife/group_create.rb
 - lib/chef/knife/group_destroy.rb
 - lib/chef/knife/group_list.rb
-- lib/chef/knife/group_remove_actor.rb
+- lib/chef/knife/group_remove.rb
 - lib/chef/knife/group_show.rb
 - lib/chef/knife/user_dissociate.rb
 - lib/chef/knife/user_invite_add.rb
@@ -39,29 +40,28 @@ files:
 - lib/chef/knife/user_list.rb
 - lib/chef/knife/user_show.rb
 - lib/knife-acl/version.rb
-homepage: https://github.com/opscode/knife-acl/blob/master/README.md
+homepage: https://github.com/chef/knife-acl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
-summary: ACL Knife Tools for Opscode hosted Enterprise Chef/Enterprise Chef
+specification_version: 4
+summary: Knife plugin to manupulate Chef server access control lists
 test_files: []
 has_rdoc: 

data/lib/chef/knife/actor_map.rb

@@ -1,57 +0,0 @@
-#
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module OpscodeAcl
-  class ActorMap < Chef::Knife
-    category "OPSCODE HOSTED CHEF ACCESS CONTROL"
-    banner "knife actor map"
-
-    # writes a yaml file to current working directly named
-    # 'actor-map.yaml'
-    # group add/remove operations will read this file
-    # 
-    deps do
-      require 'pp'
-      require 'yaml'
-    end
-
-    def run
-      chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
-      usags = chef_rest.get_rest("groups").keys.select do |gname|
-        gname.length == 32 && gname =~ /^[0-9a-f]+$/
-      end
-      user_map = {:users => {}, :usags => {}}
-      user_map = usags.inject(user_map) do |map, usag|
-        a_group = chef_rest.get_rest("groups/#{usag}")
-        actors = a_group["actors"]
-        if actors.length == 1
-          user_map[:users][actors.first] = usag
-          user_map[:usags][usag] = actors.first
-        end
-        user_map
-      end
-      clients = chef_rest.get_rest("clients").keys.inject({}) { |h, c| h[c] = c; h }
-      open("actor-map.yaml", "w") do |f|
-        f.write({ :user_map => user_map, :clients => clients }.to_yaml)
-      end
-      ui.msg "Found %d users and %d clients" % [user_map[:users].size, clients.size]
-      ui.msg "wrote map to 'actor-map.yaml'"
-    end
-  end
-end
-

data/lib/chef/knife/group_add_actor.rb

@@ -1,89 +0,0 @@
-#
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module OpscodeAcl
-  class GroupAddActor < Chef::Knife
-    category "OPSCODE HOSTED CHEF ACCESS CONTROL"
-    banner "knife group add actor GROUP ACTOR"
-    attr_reader :actor_name, :group_name, :user_map, :clients
-    deps do
-      require 'yaml'
-    end
-
-    def run
-      if !File.exists?("actor-map.yaml")
-        ui.error "unable to find 'actor-map.yaml'. Run 'knife actor map' and try again."
-        exit 1
-      end
-      actor_map = YAML.load(IO.read("actor-map.yaml"))
-      @user_map = actor_map[:user_map]
-      @clients = actor_map[:clients]
-      @group_name = name_args[0]
-      @actor_name = name_args[1]
-
-      if !group_name || !actor_name
-        ui.error "must specify GROUP and ACTOR"
-        exit 1
-      end
-      find_actor_in_map
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
-      group = @chef_rest.get_rest("groups/#{group_name}")
-      save_group(group)
-    end
-
-    def save_group(group)
-      new_group = make_group_for_put(group)
-      @chef_rest.put_rest("groups/#{new_group["groupname"]}", new_group)
-    end
-
-    def make_group_for_put(existing_group)
-      new_group = {
-        "groupname" => existing_group["groupname"],
-        "orgname" => existing_group["orgname"],
-        "actors" => {
-          # users are added to groups via the user's USAG so we never
-          # modify the users directly
-          "users" => existing_group["users"],
-          "clients" => maybe_add_actor(:client, existing_group["clients"]),
-          "groups" => maybe_add_actor(:user, existing_group["groups"])
-        }
-      }
-    end
-
-    def maybe_add_actor(type, actors)
-      new_actors = actors.dup
-      if @actor_type == type && !new_actors.include?(@actor_id)
-          new_actors << @actor_id
-      end
-      new_actors
-    end
-
-    def find_actor_in_map
-      @actor_type, @actor_id = if user_map[:users][actor_name]
-                                 [:user, user_map[:users][actor_name]]
-                               else
-                                 [:client, clients[actor_name]]
-                               end
-      if @actor_id.nil?
-        ui.error("no user or client named '#{actor_name}' in actor-map.yaml")
-        exit 1
-      end
-      true
-    end
-  end
-end

data/lib/chef/knife/group_remove_actor.rb

@@ -1,86 +0,0 @@
-#
-# Author:: Seth Falcon (<seth@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module OpscodeAcl
-  class GroupRemoveActor < Chef::Knife
-    category "OPSCODE HOSTED CHEF ACCESS CONTROL"
-    banner "knife group remove actor GROUP ACTOR"
-    attr_reader :actor_name, :group_name, :user_map, :clients
-    deps do
-      require 'yaml'
-    end
-
-    def run
-      if !File.exists?("actor-map.yaml")
-        ui.error "unable to find 'actor-map.yaml'. Run 'knife actor map' and try again."
-        exit 1
-      end
-      actor_map = YAML.load(IO.read("actor-map.yaml"))
-      @user_map = actor_map[:user_map]
-      @clients = actor_map[:clients]
-      @group_name = name_args[0]
-      @actor_name = name_args[1]
-
-      if !group_name || !actor_name
-        ui.error "must specify GROUP and ACTOR"
-        exit 1
-      end
-      find_actor_in_map
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_url])
-      group = @chef_rest.get_rest("groups/#{group_name}")
-      case @actor_type
-      when :user
-        group["groups"].delete(@actor_id)
-        group["users"].delete(actor_name)
-      when :client
-        group["clients"].delete(@actor_id)
-      end
-      save_group(group)
-    end
-
-    def save_group(group)
-      new_group = make_group_for_put(group)
-      @chef_rest.put_rest("groups/#{new_group["groupname"]}", new_group)
-    end
-
-    def make_group_for_put(existing_group)
-      new_group = {
-        "groupname" => existing_group["groupname"],
-        "orgname" => existing_group["orgname"],
-        "actors" => {
-          "clients" => existing_group["clients"],
-          "groups" => existing_group["groups"],
-          "users" => existing_group["users"]
-        }
-      }
-    end
-
-    def find_actor_in_map
-      @actor_type, @actor_id = if user_map[:users][actor_name]
-                                 [:user, user_map[:users][actor_name]]
-                               else
-                                 [:client, clients[actor_name]]
-                               end
-      if @actor_id.nil?
-        ui.error("no user or client named '#{actor_name}' in actor-map.yaml")
-        exit 1
-      end
-      true
-    end
-  end
-end