knife-opc 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b4653f93629de8ea38f0523ea80c7fc897fca8
-  data.tar.gz: a8a8b03dece21b66e347ad46f7641a191a79a8cd
+  metadata.gz: f81638cb44c3efb4b8b2a2c1e98ca1a48295a8e9
+  data.tar.gz: 8166172b30bc738ac5ffb40ec8f492fb34fac43a
 SHA512:
-  metadata.gz: 7cc93df53f43488d2327de0ca541164c5aaaa962d64fae46a19f0856400eb39d0120dba98346e14a941904fb8a434afff0bf26ae229b9455bd06577d3181f9e5
-  data.tar.gz: 19c3259da6d761e448fc43e70db24501aee682ac499a7f489ce9b0876a6ba8f3fc37676248b8fbd6e6c7f350c753ac3aff9e2be039571b6d111ee3c2ab13ceb9
+  metadata.gz: 08ea03824872034a74c154a96f848614cc23c2cc870e20e546b2923de810f6257652ed0a6a48015ea3cac59f29a4aa5385e6c8a120b78e81a5030bff95a6cd1e
+  data.tar.gz: 3f8ee073eb6e57d8f80b19e85e3a8288a2a69e6cf07f17451f3b6f9a10ed9f335f9d70d47241a88a22c939668aa5e8f4d792289065cb3ef1530b243a9a82e976

data/README.md

@@ -16,7 +16,7 @@ This knife plugin is packaged as a gem.  To install it, clone the
 git repository and run the following:
 
     gem build knife-opc.gemspec
-    gem install knife-opc-0.0.1.gem
+    gem install knife-opc-0.1.1.gem
 
 # Configuration
 
@@ -112,6 +112,17 @@ validator client is returned.
 
 Deletes the given OPC user.
 
+## knife opc associate ORGNAME USERNAME
+
+Associates a user with an organization.  Requires that the named
+organization and user both exist.
+
+## knife opc disassociate ORGNAME USERNAME
+
+Dissociates a user with an organization.  Requires that the named
+organization and user both exist, and that the user is currently
+associated with the organization.
+
 # KNOWN ISSUES
 
 * Attempting to delete and immediately recreate an organization will

data/lib/chef/knife/opc_org_associate.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Marc Paradise (<marc@getchef.com>)
+# Copyright:: Copyright 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 Opc
+  class OpcOrgAssociate < Chef::Knife
+    category "OPSCODE PRIVATE CHEF ORGANIZATION MANAGEMENT"
+    banner "knife opc org associate ORG_NAME USER_NAME"
+    attr_accessor :org_name, :username
+
+    def run
+      @org_name, @username = @name_args
+
+      if !org_name || !username
+        ui.fatal "You must specify an ORG_NAME and USER_NAME"
+        show_usage
+        exit 1
+      end
+
+      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
+      request_body = {:user => username}
+      response = @chef_rest.post_rest "organizations/#{org_name}/association_requests", request_body
+      if response["error"]
+        ui.msg response["error"]
+      else
+        association_id = response["uri"].split("/").last
+        response = @chef_rest.put_rest "users/#{username}/association_requests/#{association_id}", { :response => 'accept' }
+        if response["error"]
+          ui.msg response["error"]
+        else
+          ui.msg "User #{username} is now associated with organization #{org_name}"
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/opc_org_dissociate.rb

@@ -0,0 +1,43 @@
+#
+# Author:: Marc Paradise (<marc@getchef.com>)
+# Copyright:: Copyright 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 Opc
+  class OpcOrgDissociate < Chef::Knife
+    category "OPSCODE PRIVATE CHEF ORGANIZATION MANAGEMENT"
+    banner "knife opc org dissociate ORG_NAME USER_NAME"
+    attr_accessor :org_name, :username
+
+    def run
+      @org_name, @username = @name_args
+
+      if !org_name || !username
+        ui.fatal "You must specify an ORG_NAME and USER_NAME"
+        show_usage
+        exit 1
+      end
+
+      @chef_rest = Chef::REST.new(Chef::Config[:chef_server_root])
+      response = @chef_rest.delete_rest "organizations/#{org_name}/users/#{username}"
+      if response["error"]
+        ui.msg response["error"]
+      else
+        ui.msg "User #{username} has been dissociated from organization #{org_name}"
+      end
+    end
+  end
+end

data/lib/chef/knife/opc_user_create.rb

@@ -26,6 +26,11 @@ module Opc
     :short => '-f FILENAME',
     :description => 'Write private key to FILENAME rather than STDOUT'
 
+    option :orgname,
+    :long => '--orgname ORGNAME',
+    :short => '-o ORGNAME',
+    :description => 'Associate new user to an organization matching ORGNAME'
+
     def run
       case @name_args.count
       when 6
@@ -58,6 +63,12 @@ module Opc
       else
         ui.msg result['private_key']
       end
+      if config[:orgname]
+        request_body = {:user => username}
+        response = @chef_rest.post_rest "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' }
+      end
     end
   end
 end

data/lib/knife-opc/version.rb

@@ -1,3 +1,3 @@
 module KnifeOPC
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-opc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Steven Danna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Knife Tools for Opscode Private Chef
+description: Knife Tools for Opscode Chef Server
 email: steve@opscode.com
 executables: []
 extensions: []
@@ -76,8 +76,10 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
+- lib/chef/knife/opc_org_associate.rb
 - lib/chef/knife/opc_org_create.rb
 - lib/chef/knife/opc_org_delete.rb
+- lib/chef/knife/opc_org_dissociate.rb
 - lib/chef/knife/opc_org_list.rb
 - lib/chef/knife/opc_org_show.rb
 - lib/chef/knife/opc_user_create.rb
@@ -108,6 +110,6 @@ rubyforge_project:
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: Knife Tools for Opscode Private Chef
+summary: Knife Tools for Opscode Chef Server
 test_files: []
 has_rdoc: