knife-opc 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f10de72126959cda281388a2e5ab0e4d0f01313
-  data.tar.gz: 3ed8f3d554ffa5b72b0d08c2e3b317184b6b1ce0
+  metadata.gz: 87ecff3bb04b042ba9a49a4554e851add4d434de
+  data.tar.gz: 464ec5db424d80b2fe59712d493b8d0401d41598
 SHA512:
-  metadata.gz: 303ad9f15fbb77b3a5d1709c2df28e6b5c897885ba53b2b20a43491b159570240f64f0fbed6f17f0e5a761442724220acf418ec006e4550641e24e02fb741fd2
-  data.tar.gz: 2c09e76ff39ffaa8a0d6a459f11f834745370a5adac9be58ea94ed91a0a236249fd9ed12bf659e234fd676f50c48d1b523fbfcb06fa0564ab342c76cc5313f2d
+  metadata.gz: 834430d0757c6dffd83208127ba461a7954ff2aa22f7e84d4bf9533e90a77e8ad1f8fc3c9c799fc00768d780b7c49894ad2de13c21874455837dbeec261162e9
+  data.tar.gz: 0b33736468f0fa75e85d3118d9a3715faa1d76c8d8ec9fb97b11921a6fac10de05902af8c096584cc0b9c634a648313e4fa40751e2e3a4f29ab4c4dcdafe9700

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

@@ -0,0 +1,47 @@
+#
+# 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/knife/opc_org_user_add.rb

@@ -50,7 +50,10 @@ module Opc
           raise e
         end
       end
-      org.add_user_to_group('admins', @username) if config[:admin]
+      if config[:admin]
+        org.add_user_to_group('admins', @username)
+        org.add_user_to_group('billing-admins', @username)
+      end
     end
   end
 end

data/lib/chef/knife/opc_user_create.rb

@@ -54,6 +54,15 @@ module Opc
         :password =>     password
       }
 
+     # Check the file before creating the user so the api is more transactional.
+     if config[:filename]
+       file = config[:filename]
+       unless File.exists?(file) ? File.writable?(file) : File.writable?(File.dirname(file))
+         ui.fatal "File #{config[:filename]} is not writable.  Check permissions."
+         exit 1
+       end
+     end
+
       @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
       result = @chef_rest.post_rest("users/", user_hash)
       if config[:filename]

data/lib/chef/knife/opc_user_edit.rb

@@ -20,6 +20,16 @@ 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',
+    :description => 'Name of file to use for PUT or POST'
+
+    option :filename,
+    :long => '--filename FILENAME',
+    :short => '-f FILENAME',
+    :description => 'Write private key to FILENAME rather than STDOUT'
 
     def run
       user_name = @name_args[0]
@@ -32,16 +42,28 @@ module Opc
 
       @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 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])
-        ui.msg edited_user
         result = @chef_rest.put_rest("users/#{user_name}", edited_user)
         ui.msg("Saved #{user_name}.")
+        if ! result['private_key'].nil?
+          if config[:filename]
+            File.open(config[:filename], "w") do |f|
+              f.print(result['private_key'])
+            end
+          else
+            ui.msg result['private_key']
+          end
+        end
       else
-        ui.msg("User unchaged, not saving.")
+        ui.msg("User unchanged, not saving.")
       end
 
     end
   end
-end
+end

data/lib/knife-opc/version.rb

@@ -1,3 +1,3 @@
 module KnifeOPC
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-opc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Steven Danna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,6 +79,7 @@ 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
@@ -110,8 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Knife Tools for Opscode Chef Server
 test_files: []
+has_rdoc: