knife-opc 0.3.2 → 0.4.0

data/lib/chef/knife/opc_user_show.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Steven Danna (<steve@opscode.com>)
-# Copyright:: Copyright 2011 Opscode, Inc.
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'chef/mixin/root_rest'
+require "chef/mixin/root_rest"
 
 module Opc
   class OpcUserShow < Chef::Knife
@@ -30,10 +30,10 @@ module Opc
 
     def run
       user_name = @name_args[0]
-      results =  root_rest.get("users/#{user_name}")
+      results = root_rest.get("users/#{user_name}")
       if config[:with_orgs]
-        orgs =  root_rest.get("users/#{user_name}/organizations")
-        results["organizations"] = orgs.map {|o| o['organization']['name']}
+        orgs = root_rest.get("users/#{user_name}/organizations")
+        results["organizations"] = orgs.map { |o| o["organization"]["name"] }
       end
       ui.output results
     end

data/lib/chef/mixin/root_rest.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Steven Danna (<steve@chef.io>)
-# Copyright:: Copyright 2011 Chef Software, Inc
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'chef/server_api'
+require "chef/server_api"
 class Chef
   module Mixin
     module RootRestv0
@@ -24,7 +24,7 @@ class Chef
         # Rather than upgrade all of this code to move to v1, the goal is to remove the
         # need for this plugin.  See
         # https://github.com/chef/chef/issues/3517
-        @root_rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_root], {:api_version => "0"})
+        @root_rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_root], { :api_version => "0" })
       end
     end
   end

data/lib/chef/org.rb

@@ -1,7 +1,7 @@
-require 'chef/json_compat'
-require 'chef/mixin/params_validate'
-require 'chef/rest'
-require 'chef/org/group_operations'
+require "chef/json_compat"
+require "chef/mixin/params_validate"
+require "chef/server_api"
+require "chef/org/group_operations"
 
 class Chef
   class Org
@@ -9,9 +9,9 @@ class Chef
     include Chef::Mixin::ParamsValidate
     include Chef::Org::GroupOperations
 
-    def initialize(name='')
+    def initialize(name = "")
       @name = name
-      @full_name = ''
+      @full_name = ""
       # The Chef API returns the private key of the validator
       # client on create
       @private_key = nil
@@ -19,25 +19,25 @@ class Chef
     end
 
     def chef_rest
-      @chef_rest ||= Chef::REST.new(Chef::Config[:chef_server_root])
+      @chef_rest ||= Chef::ServerAPI.new(Chef::Config[:chef_server_root])
     end
 
-    def name(arg=nil)
+    def name(arg = nil)
       set_or_return(:name, arg,
                     :regex => /^[a-z0-9\-_]+$/)
     end
 
-    def full_name(arg=nil)
+    def full_name(arg = nil)
       set_or_return(:full_name,
                     arg, :kind_of => String)
     end
 
-    def private_key(arg=nil)
+    def private_key(arg = nil)
       set_or_return(:private_key,
                     arg, :kind_of => String)
     end
 
-    def guid(arg=nil)
+    def guid(arg = nil)
       set_or_return(:guid,
                     arg, :kind_of => String)
     end
@@ -45,7 +45,7 @@ class Chef
     def to_hash
       result = {
         "name" => @name,
-        "full_name" => @full_name
+        "full_name" => @full_name,
       }
       result["private_key"] = @private_key if @private_key
       result["guid"] = @guid if @guid
@@ -57,15 +57,15 @@ class Chef
     end
 
     def create
-      payload = {:name => self.name, :full_name => self.full_name}
+      payload = { :name => name, :full_name => full_name }
       new_org = chef_rest.post_rest("organizations", payload)
-      Chef::Org.from_hash(self.to_hash.merge(new_org))
+      Chef::Org.from_hash(to_hash.merge(new_org))
     end
 
     def update
-      payload = {:name => self.name, :full_name => self.full_name}
+      payload = { :name => name, :full_name => full_name }
       new_org = chef_rest.put_rest("organizations/#{name}", payload)
-      Chef::Org.from_hash(self.to_hash.merge(new_org))
+      Chef::Org.from_hash(to_hash.merge(new_org))
     end
 
     def destroy
@@ -73,22 +73,20 @@ class Chef
     end
 
     def save
-      begin
-        create
-      rescue Net::HTTPServerException => e
-        if e.response.code == "409"
-          update
-        else
-          raise e
-        end
+      create
+    rescue Net::HTTPServerException => e
+      if e.response.code == "409"
+        update
+      else
+        raise e
       end
     end
 
     def associate_user(username)
-      request_body = {:user => username}
+      request_body = { :user => username }
       response = chef_rest.post_rest "organizations/#{@name}/association_requests", request_body
       association_id = response["uri"].split("/").last
-      chef_rest.put_rest "users/#{username}/association_requests/#{association_id}", { :response => 'accept' }
+      chef_rest.put_rest "users/#{username}/association_requests/#{association_id}", { :response => "accept" }
     end
 
     def dissociate_user(username)
@@ -98,10 +96,10 @@ class Chef
     # Class methods
     def self.from_hash(org_hash)
       org = Chef::Org.new
-      org.name org_hash['name']
-      org.full_name org_hash['full_name']
-      org.private_key org_hash['private_key'] if org_hash.key?('private_key')
-      org.guid org_hash['guid'] if org_hash.key?('guid')
+      org.name org_hash["name"]
+      org.full_name org_hash["full_name"]
+      org.private_key org_hash["private_key"] if org_hash.key?("private_key")
+      org.guid org_hash["guid"] if org_hash.key?("guid")
       org
     end
 
@@ -114,12 +112,12 @@ class Chef
     end
 
     def self.load(org_name)
-      response =  Chef::REST.new(Chef::Config[:chef_server_root]).get_rest("organizations/#{org_name}")
+      response = Chef::ServerAPI.new(Chef::Config[:chef_server_root]).get_rest("organizations/#{org_name}")
       Chef::Org.from_hash(response)
     end
 
-    def self.list(inflate=false)
-      orgs = Chef::REST.new(Chef::Config[:chef_server_root]).get_rest('organizations')
+    def self.list(inflate = false)
+      orgs = Chef::ServerAPI.new(Chef::Config[:chef_server_root]).get_rest("organizations")
       if inflate
         orgs.inject({}) do |org_map, (name, _url)|
           org_map[name] = Chef::Org.load(name)

data/lib/chef/org/group_operations.rb

@@ -1,19 +1,59 @@
-require 'chef/org'
+require "chef/org"
 
 class Chef
   class Org
     module GroupOperations
+      def group(groupname)
+        @group ||= {}
+        @group[groupname] ||= chef_rest.get_rest "organizations/#{name}/groups/#{groupname}"
+      end
+
+      def user_member_of_group?(username, groupname)
+        group = group(groupname)
+        group["actors"].include? username
+      end
+
       def add_user_to_group(groupname, username)
-        group = chef_rest.get_rest "organizations/#{name}/groups/#{groupname}"
+        group = group(groupname)
         body_hash = {
           :groupname => "#{groupname}",
           :actors => {
             "users" => group["actors"].concat([username]),
-            "groups" => group["groups"]
-          }
+            "groups" => group["groups"],
+          },
         }
         chef_rest.put_rest "organizations/#{name}/groups/#{groupname}", body_hash
       end
+
+      def remove_user_from_group(groupname, username)
+        group = group(groupname)
+        group["actors"].delete(username)
+        body_hash = {
+          :groupname => "#{groupname}",
+          :actors => {
+            "users" => group["actors"],
+            "groups" => group["groups"],
+          },
+        }
+        chef_rest.put_rest "organizations/#{name}/groups/#{groupname}", body_hash
+      end
+
+      def actor_delete_would_leave_admins_empty?
+        admins = group("admins")
+        if admins["groups"].empty?
+          # exclude 'pivotal' but don't mutate the group since we're caching it
+          if admins["actors"].include? "pivotal"
+            admins["actors"].length <= 2
+          else
+            admins["actors"].length <= 1
+          end
+        else
+          # We don't check recursively. If the admins group contains a group,
+          # and the user is the only member of that group,
+          # we'll still turn up a 'safe to delete'.
+          false
+        end
+      end
     end
     include Chef::Org::GroupOperations
   end

data/lib/knife-opc/version.rb

@@ -1,3 +1,3 @@
 module KnifeOPC
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,73 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: knife-opc
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Steven Danna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Knife Tools for Opscode Chef Server
-email: steve@opscode.com
+date: 2018-06-06 00:00:00.000000000 Z
+dependencies: []
+description: Knife Tools for Chef Server
+email: steve@chef.io
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -93,8 +37,9 @@ files:
 - lib/chef/org.rb
 - lib/chef/org/group_operations.rb
 - lib/knife-opc/version.rb
-homepage: http://wiki.opscode.com/display/chef
-licenses: []
+homepage: https://github.com/knife-opc
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -112,9 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Knife Tools for Opscode Chef Server
+summary: Knife Tools for Chef Server
 test_files: []
-has_rdoc: