knife-opc 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c54f906018c0289af53b226e2c727b05316d7804
-  data.tar.gz: 80b121d10fbedf271168accbb16d4aa3e4d9bf6a
+  metadata.gz: 3257cb3b536d35a41ec3fccb5c73162012fa9953
+  data.tar.gz: a439aff11ffa9bde8fe771cc4d39800875c26ae0
 SHA512:
-  metadata.gz: 2924964157951a54db7916efec203806267910954516e1081559684fb0d3d7e1f52a4cccc18b1bce664db08f2726e44ee190a9e7c53e3d2fa66f828fd6b549cb
-  data.tar.gz: 5bf0cb7097e45c2c8665bf53cb2cce2249f8d422f850ca0bfcc73534868889a7b430b95ba864ce0b18e75d8d1958c70fe6f3b23edbe3487b8c2f256aaef6d3d4
+  metadata.gz: 3195effbdcb420a5a81d75dcbdede8345174b733e0b6a8cfe0e71cded805592b5c941a09848d4cbbf09e0429128a42702949b9ef1b25901f5184c00ac698a1c2
+  data.tar.gz: df351c0d42dadc75f675121a6e39bb4da13a5e7abca00dd0392f2aae521300f5959549ad8d10ef69321777397050349ac164c6cf29f664d9993b4e76059dc91a

data/README.md

@@ -27,7 +27,7 @@ To install the latest development version:
     git clone https://github.com/opscode/knife-opc.git
     cd knife-opc
     gem build knife-opc.gemspec
-    gem install knife-opc-0.1.1.gem
+    gem install knife-opc-0.3.2.gem
 
 # Configuration
 

data/lib/chef/knife/opc_org_delete.rb

@@ -15,17 +15,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcOrgDelete < Chef::Knife
     category "OPSCODE PRIVATE CHEF ORGANIZATION MANAGEMENT"
     banner "knife opc org delete ORG_NAME"
 
+    include Chef::Mixin::RootRestv0
+
     def run
       org_name = @name_args[0]
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
       ui.confirm "Do you want to delete the organization #{org_name}"
-      ui.output @chef_rest.delete_rest("organizations/#{org_name}")
+      ui.output root_rest.delete("organizations/#{org_name}")
     end
   end
 end

data/lib/chef/knife/opc_org_edit.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcOrgEdit < Chef::Knife
@@ -30,8 +31,9 @@ module Opc
         exit 1
       end
 
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      original_org =  @chef_rest.get_rest("organizations/#{org_name}")
+      include Chef::Mixin::RootRestv0
+
+      original_org =  root_rest.get("organizations/#{org_name}")
       edited_org = edit_data(original_org)
 
       if original_org == edited_org
@@ -39,9 +41,8 @@ module Opc
         exit
       end
 
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
       ui.msg edited_org
-      result = @chef_rest.put_rest("organizations/#{org_name}", edited_org)
+      root_rest.put("organizations/#{org_name}", edited_org)
       ui.msg("Saved #{org_name}.")
     end
   end

data/lib/chef/knife/opc_org_list.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcOrgList < Chef::Knife
@@ -31,10 +32,11 @@ module Opc
     :short => "-a",
     :description => "Show auto-generated hidden orgs in output"
 
+    include Chef::Mixin::RootRestv0
+
     def run
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      results =  @chef_rest.get_rest("organizations")
-      unless config[:all_orgs] 
+      results =  root_rest.get("organizations")
+      unless config[:all_orgs]
         results = results.select { |k,v| !(k.length == 20 && k =~ /^[a-z]+$/) }
       end
       ui.output(ui.format_list_for_display(results))

data/lib/chef/knife/opc_org_show.rb

@@ -15,16 +15,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcOrgShow < Chef::Knife
     category "OPSCODE PRIVATE CHEF ORGANIZATION MANAGEMENT"
     banner "knife opc org show ORGNAME"
 
+    include Chef::Mixin::RootRestv0
+
     def run
       org_name = @name_args[0]
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      ui.output @chef_rest.get_rest("organizations/#{org_name}")
+      ui.output root_rest.get("organizations/#{org_name}")
     end
   end
 end

data/lib/chef/knife/opc_user_create.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcUserCreate < Chef::Knife
@@ -31,6 +32,8 @@ module Opc
     :short => '-o ORGNAME',
     :description => 'Associate new user to an organization matching ORGNAME'
 
+    include Chef::Mixin::RootRestv0
+
     def run
       case @name_args.count
       when 6
@@ -63,8 +66,7 @@ module Opc
        end
      end
 
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      result = @chef_rest.post_rest("users/", user_hash)
+      result = root_rest.post("users/", user_hash)
       if config[:filename]
         File.open(config[:filename], "w") do |f|
           f.print(result['private_key'])
@@ -74,9 +76,9 @@ module Opc
       end
       if config[:orgname]
         request_body = {:user => username}
-        response = @chef_rest.post_rest "organizations/#{config[:orgname]}/association_requests", request_body
+        response = root_rest.post("organizations/#{config[:orgname]}/association_requests", request_body)
         association_id = response["uri"].split("/").last
-        @chef_rest.put_rest "users/#{username}/association_requests/#{association_id}", { :response => 'accept' }
+        root_rest.put("users/#{username}/association_requests/#{association_id}", {:response => 'accept'})
       end
     end
   end

data/lib/chef/knife/opc_user_delete.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcUserDelete < Chef::Knife
@@ -26,18 +27,19 @@ module Opc
     :short => "-d",
     :description => "Don't disassociate the user first"
 
+    include Chef::Mixin::RootRestv0
+
     def run
       username = @name_args[0]
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
       ui.confirm "Do you want to delete the user #{username}"
       unless config[:no_disassociate_user]
-         orgs =  @chef_rest.get_rest("users/#{username}/organizations")
+         orgs =  root_rest.get("users/#{username}/organizations")
          org_names = orgs.map {|o| o['organization']['name']}
          org_names.each do |org|
-            ui.output @chef_rest.delete_rest("organizations/#{org}/users/#{username}")
+            ui.output root_rest.delete("organizations/#{org}/users/#{username}")
          end
       end
-      ui.output @chef_rest.delete_rest("users/#{username}")
+      ui.output root_rest.delete("users/#{username}")
     end
   end
 end

data/lib/chef/knife/opc_user_edit.rb

@@ -15,12 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcUserEdit < Chef::Knife
     category "OPSCODE PRIVATE CHEF ORGANIZATION MANAGEMENT"
     banner "knife opc user edit USERNAME"
-    
+
     option :input,
     :long => '--input FILENAME',
     :short => '-i FILENAME',
@@ -31,6 +32,8 @@ module Opc
     :short => '-f FILENAME',
     :description => 'Write private key to FILENAME rather than STDOUT'
 
+    include Chef::Mixin::RootRestv0
+
     def run
       user_name = @name_args[0]
 
@@ -40,16 +43,14 @@ module Opc
         exit 1
       end
 
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      original_user =  @chef_rest.get_rest("users/#{user_name}")
+      original_user =  root_rest.get("users/#{user_name}")
       if config[:input]
         edited_user = JSON.parse(IO.read(config[:input]))
       else
         edited_user = edit_data(original_user)
       end
       if original_user != edited_user
-        @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-        result = @chef_rest.put_rest("users/#{user_name}", edited_user)
+        result = root_rest.put("users/#{user_name}", edited_user)
         ui.msg("Saved #{user_name}.")
         if ! result['private_key'].nil?
           if config[:filename]

data/lib/chef/knife/opc_user_list.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcUserList < Chef::Knife
@@ -26,9 +27,10 @@ module Opc
     :short => "-w",
     :description => "Show corresponding URIs"
 
+    include Chef::Mixin::RootRestv0
+
     def run
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      results = @chef_rest.get_rest("users")
+      results = root_rest.get("users")
       ui.output(ui.format_list_for_display(results))
     end
   end

data/lib/chef/knife/opc_user_password.rb

@@ -15,17 +15,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcUserPassword < Chef::Knife
     category "OPSCODE PRIVATE CHEF ORGANIZATION MANAGEMENT"
-    banner "knife opc user password USERNAME [PASSWORD | --enable_external_auth]"
+    banner "knife opc user password USERNAME [PASSWORD | --enable-external-auth]"
 
     option :enable_external_auth,
     :long => "--enable-external-auth",
     :short => "-e",
     :description => "Enable external authentication for this user (such as LDAP)"
 
+    include Chef::Mixin::RootRestv0
+
     def run
       # check that correct number of args was passed, should be either
       # USERNAME PASSWORD or USERNAME --enable-external-auth
@@ -43,13 +46,11 @@ module Opc
       # note that this will be nil if config[:enable_external_auth] is true
       password = @name_args[1]
 
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-
       # since the API does not pass back whether recovery_authentication_enabled is
       # true or false, there is no way of knowing if the user is using ldap or not,
       # so we will update the user every time, instead of checking if we are actually
       # changing anything before we PUT.
-      user =  @chef_rest.get_rest("users/#{user_name}")
+      user =  root_rest.get("users/#{user_name}")
 
       user["password"] = password if not password.nil?
 
@@ -59,9 +60,8 @@ module Opc
       # wants to disable ldap and put user in recover (if they are using ldap).
       user["recovery_authentication_enabled"] = !config[:enable_external_auth]
 
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
       begin
-        result = @chef_rest.put_rest("users/#{user_name}", user)
+        root_rest.put("users/#{user_name}", user)
       rescue => e
         raise e
         exit 1

data/lib/chef/knife/opc_user_show.rb

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require 'chef/mixin/root_rest'
 
 module Opc
   class OpcUserShow < Chef::Knife
@@ -25,12 +26,13 @@ module Opc
     :long => "--with-orgs",
     :short => "-l"
 
+    include Chef::Mixin::RootRestv0
+
     def run
       user_name = @name_args[0]
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      results =  @chef_rest.get_rest("users/#{user_name}")
+      results =  root_rest.get("users/#{user_name}")
       if config[:with_orgs]
-        orgs =  @chef_rest.get_rest("users/#{user_name}/organizations")
+        orgs =  root_rest.get("users/#{user_name}/organizations")
         results["organizations"] = orgs.map {|o| o['organization']['name']}
       end
       ui.output results

data/lib/chef/mixin/root_rest.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright 2011 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.
+#
+require 'chef/server_api'
+class Chef
+  module Mixin
+    module RootRestv0
+      def root_rest
+        # Use v0 API for now
+        # 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"})
+      end
+    end
+  end
+end

data/lib/knife-opc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-opc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Steven Danna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,7 +79,6 @@ files:
 - lib/chef/knife/opc_org_create.rb
 - lib/chef/knife/opc_org_delete.rb
 - lib/chef/knife/opc_org_edit.rb
-- lib/chef/knife/opc_org_edit.rc~
 - lib/chef/knife/opc_org_list.rb
 - lib/chef/knife/opc_org_show.rb
 - lib/chef/knife/opc_org_user_add.rb
@@ -90,9 +89,9 @@ files:
 - lib/chef/knife/opc_user_list.rb
 - lib/chef/knife/opc_user_password.rb
 - lib/chef/knife/opc_user_show.rb
+- lib/chef/mixin/root_rest.rb
 - lib/chef/org.rb
 - lib/chef/org/group_operations.rb
-- lib/chef/org/group_operations.rb~
 - lib/knife-opc/version.rb
 homepage: http://wiki.opscode.com/display/chef
 licenses: []

data/lib/chef/knife/opc_org_edit.rc~

@@ -1,47 +0,0 @@
-#
-# Author:: Steven Danna (<steve@opscode.com>)
-# Copyright:: Copyright 2011 Opscode, 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 Opc
-  class OpcUserEdit < Chef::Knife
-    category "OPSCODE PRIVATE CHEF ORGANIZATION MANAGEMENT"
-    banner "knife opc user edit USERNAME"
-
-    def run
-      user_name = @name_args[0]
-
-      if user_name.nil?
-        show_usage
-        ui.fatal("You must specify a user name")
-        exit 1
-      end
-
-      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-      original_user =  @chef_rest.get_rest("users/#{user_name}")
-      edited_user = edit_data(original_user)
-      if original_user != edited_user
-        @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
-        ui.msg edited_user
-        result = @chef_rest.put_rest("users/#{user_name}", edited_user)
-        ui.msg("Saved #{user_name}.")
-      else
-        ui.msg("User unchaged, not saving.")
-      end
-
-    end
-  end
-end

data/lib/chef/org/group_operations.rb~

@@ -1,21 +0,0 @@
-require 'chef/org'
-
-class Chef
-  class Org
-    module GroupOperations
-      def add_user_to_group(groupname, username)
-        group = chef_rest.get_rest "organizations/#{name}/groups/#{groupname}"
-        body_hash = {
-          :groupname => "#{groupname}",
-          :actors => {
-            "users" => group["actors"].concat([username]),
-            "groups" => group["groups"]
-          }
-        }
-        chef_rest.put_rest "organizations/#{name}/groups/#{groupname}", body_hash
-      end
-    end
-  end
-
-  include Chef::Org::GroupOperations
-end