soracom 1.0.9 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e9745bc2f0f947a2cb0954fe49cdc1fc50590a4
-  data.tar.gz: 501bcd5ecda32e92233dac8bf3d60a8f4d3cee1a
+  metadata.gz: 76e5bdebebad971ecab7c61854f14379ed898737
+  data.tar.gz: 1b4187c8005078047866acaec5e3bd5771bfd47e
 SHA512:
-  metadata.gz: 1ec3fd4d06886bd480cbba8488104c478bdb33ae3df13c32386641915e9a82554fcfeee2c4d20d3e96083ebe9539d26834c1ef874b0ed2fc64ee5a725c6fdbe8
-  data.tar.gz: 0b029b540cab0faa08082b7c1bfc1b86c03fb094ee0d63db98985678186ffaaccce6813170bfb222bc0671b8477bd39e5695cd08f79a288c854f6a8403a91d62
+  metadata.gz: b32df7ef3e41262310fc24f97e52f61a527173758961b770fcfbc4d78e11f7f4dd5ec1a22331f39c9cee234ec2ae3a2d0aec44fb2792ccd6ae13303d1392a76e
+  data.tar.gz: 02ff32ffa7a5e7e70ba311503e8fec1ac8e1441acb5e98103182c486f5d5c793fb411144d6ab715634cb1e360f94e3ee120ec6701ad13732260f6743462b14c9

data/lib/soracom/cli.rb

@@ -10,7 +10,8 @@ module SoracomCli
     option :limit, type: :numeric, required: false, desc: 'max number of result(default:1024)'
     option :filter, type: :hash, required: false, desc: 'ex) --filter key:imsi value:001010000000001 / --filter key:tagname value:tagvalue'
     def list
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
+      options.delete('profile')
       sims = client.list_subscribers(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts JSON.pretty_generate(sims)
     end
@@ -21,21 +22,22 @@ module SoracomCli
     option :type, type: :string, desc: 'default plan type'
     option :tags, type: :hash, desc: 'tag as hash i.e. --tags name:"foo" group:"bar"'
     def register
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
+      options.delete('profile')
       puts JSON.pretty_generate(client.register_subscriber(Hash[options.map { |k, v| [k.to_sym, v] }]))
     end
 
     desc 'activate', 'activate Subscriber(SIM)s'
     option :imsi, type: :array, required: true
     def activate
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.activate_subscriber(options[:imsi]))
     end
 
     desc 'deactivate', 'deactivate Subscriber(SIM)s'
     option :imsi, type: :array, required: true
     def deactivate
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.deactivate_subscriber(options[:imsi]))
     end
 
@@ -44,21 +46,21 @@ module SoracomCli
     option :confirm, type: :string
     def terminate
       abort 'You may not revert terminate opereation. Please add "--confirm YES" if you are sure.' if options[:confirm] != 'YES'
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.terminate_subscriber(options[:imsi]))
     end
 
     desc 'enable_termination', 'enable termination of Subscriber(SIM)s'
     option :imsi, type: :array, required: true
     def enable_termination
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.enable_termination(options[:imsi]))
     end
 
     desc 'disable_termination', 'disable termination of Subscriber(SIM)s'
     option :imsi, type: :array, required: true
     def disable_termination
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.disable_termination(options[:imsi]))
     end
 
@@ -66,7 +68,7 @@ module SoracomCli
     option :imsi, type: :array, required: true
     option :tags, type: :hash, required: true
     def update_tags
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.update_subscriber_tags(options[:imsi], options[:tags]))
     end
 
@@ -74,7 +76,7 @@ module SoracomCli
     option :imsi, type: :array, required: true
     option :tag_name, type: :string, required: true
     def delete_tag
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.delete_subscriber_tag(options[:imsi], options[:tag_name]))
     end
 
@@ -82,7 +84,7 @@ module SoracomCli
     option :imsi, type: :array, required: true
     option :speed_class, type: :string, required: true
     def update_speed_class
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.update_subscriber_speed_class(options[:imsi], options[:speed_class]))
     end
 
@@ -90,14 +92,14 @@ module SoracomCli
     option :imsi, type: :array, required: true
     option :expiry_time, type: :numeric, required: true
     def set_expiry_time
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.set_expiry_time(options[:imsi], options[:expiry_time]))
     end
 
     desc 'unset_expiry_time', 'delete expiry time of Subscriber(SIM)s'
     option :imsi, type: :array, required: true
     def unset_expiry_time
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.unset_expiry_time(options[:imsi]))
     end
 
@@ -105,14 +107,14 @@ module SoracomCli
     option :imsi, type: :string, required: true
     option :group_id, type: :string, required: true
     def set_group
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.set_group(options[:imsi], options[:group_id]))
     end
 
     desc 'unset_group', 'unset group of Subscriber(SIM)'
     option :imsi, type: :string, required: true
     def unset_group
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.unset_group(options[:imsi]))
     end
   end
@@ -122,28 +124,28 @@ module SoracomCli
     desc 'list', 'list groups'
     option :group_id, type: :string, desc: 'group ID'
     def list
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.list_groups(options.group_id))
     end
 
     desc 'list_subscribers', 'list subscriber in a group'
     option :group_id, type: :string, required:true, desc: 'group ID'
     def list_subscribers
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.list_subscribers_in_group(options.group_id))
     end
 
     desc 'create', 'create group'
     option :tags, type: :hash, desc: 'group tags'
     def create
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.create_group(options.tags))
     end
 
     desc 'delete_group', 'delete a group'
     option :group_id, type: :string, required:true, desc: 'group ID'
     def delete
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.delete_group(options.group_id))
     end
 
@@ -152,7 +154,16 @@ module SoracomCli
     option :namespace, type: :string, required:true, desc: 'namespace of the parameter'
     option :params, type: :string, required:true, desc: 'JSON string of the configuration parameter'
     def update_configuration
-      client = Soracom::Client.new
+      if options.params=~/^[a-z]+:\/\/(.+)/
+        begin
+          content = open(options.params.sub(/^file:\/\//,'')).read
+          options['params'] = content
+        rescue Errno::ENOENT
+        rescue SocketError
+          abort "ERROR: Cannot access #{options.params}."
+        end
+      end
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.update_group_configuration(options.group_id, options.namespace, options.params))
     end
 
@@ -161,7 +172,7 @@ module SoracomCli
     option :namespace, type: :string, required:true, desc: 'namespace of the parameter'
     option :name, type: :string, required:true, desc: 'name of configuration parameter to delete'
     def delete_configuration
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.delete_group_configuration(options.group_id, options.namespace, options.name))
     end
 
@@ -169,7 +180,7 @@ module SoracomCli
     option :group_id, type: :string, required:true, desc: 'group ID'
     option :tags, type: :string, required:true, desc: 'JSON string of tags i.e. [{"tagName":"name","tagValue":"new group name"}]'
     def update_tags
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.update_group_tags(options.group_id, options.tags))
     end
 
@@ -177,7 +188,7 @@ module SoracomCli
     option :group_id, type: :string, required:true, desc: 'group ID'
     option :name, type: :string, required:true, desc: 'tag name to delete'
     def delete_tag
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.delete_group_tags(options.group_id, options.name))
     end
   end
@@ -189,21 +200,31 @@ module SoracomCli
     option :imsi, type: :string, desc: 'SIM unique ID, 15 digits'
     option :target, type: :string, desc: 'target can be operator/imsi/tag'
     def list
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
+      options.delete('profile')
       puts JSON.pretty_generate(client.list_event_handlers(Hash[options.map { |k, v| [k.to_sym, v] }]))
     end
 
     desc 'create', 'create event handler'
     option :req, type: :string, desc: 'JSON string of event handler configuration'
     def create
-      client = Soracom::Client.new
+      if options.req=~/^[a-z]+:\/\/(.+)/
+        begin
+          content = open(options.req.sub(/^file:\/\//,'')).read
+          options['req'] = content
+        rescue Errno::ENOENT
+        rescue SocketError
+          abort "ERROR: Cannot access #{options.req}."
+        end
+      end
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.create_event_handler(options.req))
     end
 
     desc 'delete', 'delete event handler'
     option :handler_id, type: :string, required:true, desc: 'Event Handler ID'
     def delete
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.delete_event_handler(options.handler_id))
     end
 
@@ -211,7 +232,16 @@ module SoracomCli
     option :handler_id, type: :string, required:true, desc: 'Event Handler ID'
     option :req, type: :string, desc: 'JSON string of event handler configuration'
     def update
-      client = Soracom::Client.new
+      if options.req=~/^[a-z]+:\/\/(.+)/
+        begin
+          content = open(options.req.sub(/^file:\/\//,'')).read
+          options['req'] = content
+        rescue Errno::ENOENT
+        rescue SocketError
+          abort "ERROR: Cannot access #{options.req}."
+        end
+      end
+      client = Soracom::Client.new(profile:options.profile)
       puts JSON.pretty_generate(client.update_event_handler(options.handler_id, options.req))
     end
   end
@@ -224,7 +254,8 @@ module SoracomCli
     option :to, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window ends'
     option :period, type: :string, required: false, desc: 'miniutes or day or month'
     def get_air_usage
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
+      options.delete('profile')
       data = client.get_air_usage(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts JSON.pretty_generate(data)
     end
@@ -235,7 +266,8 @@ module SoracomCli
     option :to, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window ends'
     option :period, type: :string, required: false, desc: 'miniutes or day or month'
     def get_beam_usage
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
+      options.delete('profile')
       data = client.get_beam_usage(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts JSON.pretty_generate(data)
     end
@@ -245,7 +277,7 @@ module SoracomCli
     option :to, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window ends'
     option :period, type: :string, required: false, desc: 'miniutes or day or month'
     def export_air_usage
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       csv = client.export_air_usage(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts csv
     end
@@ -255,54 +287,299 @@ module SoracomCli
     option :to, type: :numeric, required: false, desc: 'UNIX time in seconds when stat window ends'
     option :period, type: :string, required: false, desc: 'miniutes or day or month'
     def export_beam_usage
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
+      options.delete('profile')
       csv = client.export_beam_usage(Hash[options.map { |k, v| [k.to_sym, v] }])
       puts csv
     end
   end
 
+  # Operator related commands
   class Operator < Thor
-    desc 'list_auth_keys', 'list auth keys'
+    desc 'list_auth_keys', 'list auth keys for Operator'
     def list_auth_keys
-      client = Soracom::Client.new
-      data = client.list_auth_keys()
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.list_operator_auth_keys()
       puts JSON.pretty_generate(data)
     end
 
-    desc 'create_auth_key', 'create new auth key'
-    def create_auth_key
-      client = Soracom::Client.new
-      data = client.create_auth_key()
+    desc 'generate_auth_key', 'generate new auth key for Operator'
+    def generate_auth_key
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.generate_operator_auth_key()
       puts JSON.pretty_generate(data)
     end
 
-    desc 'delete_auth_key', 'delete existing auth key'
+    desc 'delete_auth_key', 'delete existing auth key for Operator'
     option :auth_key_id, type: :string, required: true, desc: 'auth key id starting "keyId-"'
     def delete_auth_key
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.delete_operator_auth_key(options.auth_key_id)
+      puts JSON.pretty_generate(data)
+    end
+  end
+
+  # User related commands
+  class User < Thor
+    desc 'list_users', 'list users under Operator'
+    def list_users
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.list_users()
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'delete_user', 'delete user under Operator'
+    option :user_name, required: true, desc: 'User name'
+    def delete_user
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.delete_user(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'get_user', 'get user info under Operator'
+    option :user_name, desc: 'User name'
+    def get_user
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.get_user(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'create_user', 'create user under Operator'
+    option :user_name, required: true, desc: 'User name'
+    option :description, desc: 'description for the user'
+    def create_user
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.create_user(options.user_name, options.description)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'update_user', 'update user under Operator'
+    option :user_name, required: true, desc: 'User name'
+    option :description, desc: 'description for the user'
+    def update_user
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.update_user(options.user_name, options.description)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'list_auth_keys', 'list auth keys for user'
+    option :user_name, desc: 'User name'
+    def list_auth_keys
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.list_users_auth_key(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'generate_auth_key', 'generate new auth key for user'
+    option :user_name, desc: 'User name'
+    def generate_auth_key
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.generate_users_auth_key(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'delete_auth_key', 'delete existing auth key for user'
+    option :user_name, desc: 'User name'
+    option :auth_key_id, type: :string, required: true, desc: 'auth key id starting "keyId-"'
+    def delete_auth_key
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.delete_users_auth_key(options.user_name, options.auth_key_id)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'get_auth_key', 'get auth key info for user'
+    option :user_name, desc: 'User name'
+    option :auth_key_id, type: :string, required: true, desc: 'auth key id starting "keyId-"'
+    def get_auth_key
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.get_users_auth_key(options.user_name, options.auth_key_id)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'delete_password', 'delete existing password for user'
+    option :user_name, desc: 'User name'
+    def delete_password
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.delete_user_password(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'has_password', 'check if the user has password'
+    option :user_name, desc: 'User name'
+    def has_password
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.has_user_password(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'create_password', 'create passwod for the user'
+    option :user_name, desc: 'User name'
+    option :password, desc: 'Password for the user'
+    def create_password
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.create_user_password(options.user_name, options.password)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'get_permission', 'get permission for the user'
+    option :user_name, desc: 'User name'
+    def get_permission
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.get_user_permission(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'upadte_permission', 'update permission for the user'
+    option :user_name, desc: 'User name'
+    option :permission, required:true, desc: 'Permission string for the user'
+    option :description, desc: 'Description for the permission'
+    def update_permission
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.update_user_permission(options.user_name, options.permission, options.description)
+      puts JSON.pretty_generate(data)
+    end
+
+  end
+
+  # Role related commands
+  class Role < Thor
+    desc 'list_roles', 'list roles'
+    def list_roles
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.list_roles()
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'delete_roles', 'delete role'
+    option :role_id, required: true, desc: 'ID of the role'
+    def delete_role
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.delete_role()
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'get_role', 'get information of role'
+    option :role_id, required: true, desc: 'ID of the role'
+    def get_role
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.get_role(options.role_id)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'create_role', 'create a role'
+    option :role_id, required: true, desc: 'ID of the role'
+    option :permission, required: true, desc: 'Permission for the role'
+    option :description, desc: 'Descroption for the role'
+    def create_role
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.create_role(options.role_id, options.permission, options.description)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'update_role', 'update existing role'
+    option :role_id, required: true, desc: 'ID of the role'
+    option :permission, required: true, desc: 'Permission for the role'
+    option :description, desc: 'Descroption for the role'
+    def update_role
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.update_role(options.role_id, options.permission, options.description)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'list_role_attached_users', 'list users having a role attached'
+    def list_role_attached_users
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.list_role_attached_users
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'list_user_roles', 'list roles attached to a user'
+    option :user_name, required: true, desc: 'user name'
+    def list_user_roles
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.list_user_roles(options.user_name)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'attach_role_to_user', 'attach role to user'
+    option :user_name, required: true, desc: 'user name'
+    option :role_id, required: true, desc: 'role_id'
+    def attach_role_to_user
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.attach_role_to_user(options.user_name, options.role_id)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'delete_role_from_user', 'delete role from user'
+    option :user_name, required: true, desc: 'user name'
+    option :role_id, required: true, desc: 'role_id'
+    def delete_role_from_user
+      client = Soracom::Client.new(profile:options.profile)
+      data = client.delete_role_from_user(options.user_name, options.role_id)
+      puts JSON.pretty_generate(data)
+    end
+
+  end
+
+  class Credentials < Thor
+    desc 'list_credentials', 'list stored credentials'
+    def list_credentials
+      client = Soracom::Client.new
+      data = client.list_credentials
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'create_credentials', 'create new credentials'
+    option :credentials_id, type: :string, required: true, desc: 'Credentials Id'
+    option :credentials_body, type: :string, required: true, desc: 'Credentials Body as JSON string'
+    def create_credentials
+      if options.credentials_body=~/^[a-z]+:\/\/(.+)/
+        begin
+          content = open(options.credentials_body.sub(/^file:\/\//,'')).read
+          options['credentials_body'] = content
+        rescue Errno::ENOENT
+        rescue SocketError
+          abort "ERROR: Cannot access #{options.credentials_body}."
+        end
+      end
+      client = Soracom::Client.new
+      data = client.create_credentials(options.credentials_id, options.credentials_body)
+      puts JSON.pretty_generate(data)
+    end
+
+    desc 'delete_credentials', 'delete credentials'
+    option :credentials_id, type: :string, required: true, desc: 'credentials Id'
+    def delete_credentials
       client = Soracom::Client.new
-      data = client.delete_auth_key(options.auth_key_id)
+      data = client.delete_credentials(options.credentials_id)
       puts JSON.pretty_generate(data)
     end
   end
 
   # Using Thor for CLI Implementation
   class CLI < Thor
+    class_option :profile, default: 'default', desc: 'profile to use, stored in $HOME/.soracom/PROFILE.json'
+
     register(Subscriber, 'subscriber', 'subscriber <command>', 'Subscriber related operations')
     register(Subscriber, 'sim', 'sim <command>', 'Subscriber related operations(alias)')
     register(Group, 'group', 'group <command>', 'Group related operations')
     register(EventHandler, 'event_handler', 'event_handler <command>', 'Event Handler related operations')
     register(Stats, 'stats', 'stats <command>', 'Stats related operations')
     register(Operator, 'operator', 'operator <command>', 'Operator related operations')
+    register(User, 'user', 'user <command>', 'SAM User related operations')
+    register(Role, 'role', 'role <command>', 'Role related operations')
+    register(Credentials, 'credentials', 'credentials <command>', 'Credentials related operations')
 
     desc 'auth', 'test authentication'
     def auth
-      puts 'testing authentication...'
+      puts "testing authentication... #{options.profile}"
       begin
-        client = Soracom::Client.new
+        client = Soracom::Client.new(profile:options.profile)
         puts <<EOS
 authentication succeeded.
 apiKey: #{client.api_key}
 operatorId: #{client.operator_id}
+userName: #{client.user_name}
 token: #{client.token}
 EOS
       rescue => evar
@@ -310,9 +587,53 @@ EOS
       end
     end
 
+    desc 'configure', 'setup soracom environment'
+    def configure
+      print <<EOS
+--- SORACOM CLI setup ---
+This will create .soracom directory under #{ENV['HOME']} and place '#{options.profile}.json' in it.
+
+Please select which authentication method to use.
+
+1. Input AuthKeyId and AuthKey *Recommended*
+2. Input Operator credentials (Operator Email and Password)
+3. Input SAM credentials (OperatorId and UserName and Password)
+
+EOS
+      mode = STDIN.tap{print "select(1-3)> "}.gets.chomp
+      begin
+        Dir.mkdir("#{ENV['HOME']}/.soracom/",0700)
+      rescue Errno::EEXIST
+      end
+      case mode
+      when '1'
+        authKeyId = STDIN.tap{print "authKeyId: "}.gets.chomp
+        authKey = STDIN.tap{print "authKey: "}.noecho(&:gets).tap{print "\n"}.chomp
+        File.open("#{ENV['HOME']}/.soracom/#{options.profile}.json", "w") do |f|
+          f.print JSON.pretty_generate ({authKeyId: authKeyId, authKey: authKey})
+        end
+      when '2'
+        email = STDIN.tap{print "Email: "}.gets.chomp
+        password = STDIN.tap{print "Password: "}.noecho(&:gets).tap{print "\n"}.chomp
+        File.open("#{ENV['HOME']}/.soracom/#{options.profile}.json", "w") do |f|
+          f.print JSON.pretty_generate ({email: email, password: password})
+        end
+      when '3'
+        operatorId = STDIN.tap{print "operatorId: "}.gets.chomp
+        userName = STDIN.tap{print "userName: "}.gets.chomp
+        password = STDIN.tap{print "password: "}.noecho(&:gets).tap{print "\n"}.chomp
+        File.open("#{ENV['HOME']}/.soracom/#{options.profile}.json", "w") do |f|
+          f.print JSON.pretty_generate ({operatorId: operatorId, userName: userName, password: password})
+        end
+      else
+        abort "invalid number."
+      end
+      print "wrote to #{ENV['HOME']}/.soracom/#{options.profile}.json\n"
+    end
+
     desc 'support', 'open support site'
     def support
-      client = Soracom::Client.new
+      client = Soracom::Client.new(profile:options.profile)
       url = client.get_support_url
       system "open '#{url}' &> /dev/null || ( echo open following URL in your browser. ; echo '#{url}' )"
     end

data/lib/soracom/client.rb

@@ -13,24 +13,35 @@ module Soracom
   class Client
     # 設定されなかった場合には、環境変数から認証情報を取得
     def initialize(
-        endpoint:ENV['SORACOM_ENDPOINT'],
-        email:ENV['SORACOM_EMAIL'], password:ENV['SORACOM_PASSWORD'],
-        auth_key_id:ENV['SORACOM_AUTH_KEY_ID'], auth_key:ENV['SORACOM_AUTH_KEY']
+        profile: nil,
+        endpoint: ENV['SORACOM_ENDPOINT'] || API_BASE_URL,
+        email:ENV['SORACOM_EMAIL'], password:ENV['SORACOM_PASSOWRD'],
+        auth_key_id:ENV['SORACOM_AUTH_KEY_ID'], auth_key:ENV['SORACOM_AUTH_KEY'],
+        operator_id:ENV['SORACOM_OPERATOR_ID'], user_name:ENV['SORACOM_USER_NAME']
       )
       @log = Logger.new(STDERR)
       @log.level = ENV['SORACOM_DEBUG'] ? Logger::DEBUG : Logger::WARN
+      @endpoint = endpoint
       begin
-        if auth_key_id && auth_key
-          @auth = auth_by_key(auth_key_id, auth_key, endpoint)
+        if profile
+          @auth = auth_by_profile(profile)
+        elsif auth_key_id && auth_key
+          @auth = auth_by_key(auth_key_id, auth_key, @endpoint)
         elsif email && password
-          @auth = auth(email, password, endpoint)
+          @auth = auth_by_email(email, password, @endpoint)
+        elsif operator_id && user_name && password
+          @auth = auth_by_user(operator_id, user_name, password, @endpoint)
         else
-          fail 'Could not find any credentials(authKeyId & authKey or email & password)'
+          @auth = auth_by_profile('default')
         end
       rescue => evar
         abort 'ERROR: ' + evar.to_s
       end
-      @api = Soracom::ApiClient.new(@auth, endpoint)
+      if @auth
+        @api = Soracom::ApiClient.new(@auth, @endpoint)
+      else
+        fail 'Could not find any credentials(authKeyId & authKey or email & password or operatorId & userName and password)'
+      end
     end
 
     # 特定Operator下のSubscriber一覧を取
@@ -233,6 +244,7 @@ module Soracom
 
     # コンフィグパラメータの更新
     def update_group_configuration(group_id, namespace, params)
+      params = transform_json(params)
       @api.put(path: "/groups/#{group_id}/configuration/#{namespace}", payload: params)
     end
 
@@ -266,6 +278,7 @@ module Soracom
 
     # イベントハンドラーを新規作成する
     def create_event_handler(req)
+      req = transform_json req
       @api.post(path: '/event_handlers', payload: req)
     end
 
@@ -280,8 +293,9 @@ module Soracom
     end
 
     # イベントハンドラーを更新する
-    def update_event_handler(handler_id, params)
-      @api.put(path: "/event_handlers/#{handler_id}", payload: params)
+    def update_event_handler(handler_id, req)
+      req = transform_json req
+      @api.put(path: "/event_handlers/#{handler_id}", payload: req)
     end
 
     # Subscriber毎のAir使用状況を得る(デフォルトでは直近１日)
@@ -312,15 +326,145 @@ module Soracom
       "https://soracom.zendesk.com/access/jwt?jwt=#{res['token']}&return_to=#{return_to}"
     end
 
-    def list_auth_keys()
+    def list_credentials()
+      @api.get(path: '/credentials')
+    end
+
+    def create_credentials(credentials_id, credentials)
+      @api.post(path: "/credentials/#{credentials_id}", payload: credentials)
+    end
+
+    def delete_credentials(credentials_id)
+      @api.delete(path: "/credentials/#{credentials_id}")
+    end
+
+    # SAMユーザー一覧取得
+    def list_users()
+      @api.get(path: "/operators/#{@auth[:operatorId]}/users")
+    end
+
+    # SAMユーザーを削除する
+    def delete_user(username)
+      @api.delete(path: "/operators/#{@auth[:operatorId]}/users/#{username}")
+    end
+
+    # SAMユーザー取得
+    def get_user(username=@auth[:userName])
+      @api.get(path: "/operators/#{@auth[:operatorId]}/users/#{username}")
+    end
+
+    # SAMユーザーを新しく追加する
+    def create_user(username, description='')
+      @api.post(path: "/operators/#{@auth[:operatorId]}/users/#{username}", payload: { description: description })
+    end
+
+    # SAMユーザーを更新する
+    def update_user(username, description='')
+      @api.put(path: "/operators/#{@auth[:operatorId]}/users/#{username}", payload: { description: description })
+    end
+
+    # SAMユーザーのAuthKey一覧取得
+    def list_users_auth_key(username=@auth[:userName])
+      @api.get(path: "/operators/#{@auth[:operatorId]}/users/#{username}/auth_keys")
+    end
+
+    # SAMユーザーのAuthKey生成
+    def generate_users_auth_key(username=@auth[:userName])
+      @api.post(path: "/operators/#{@auth[:operatorId]}/users/#{username}/auth_keys")
+    end
+
+    # SAMユーザーのAuthKey削除
+    def delete_users_auth_key(username, auth_key_id)
+      @api.delete(path: "/operators/#{@auth[:operatorId]}/users/#{username}/auth_keys/#{auth_key_id}")
+    end
+
+    # SAMユーザーのAuthKey取得
+    def get_users_auth_key(username, auth_key_id)
+      @api.get(path: "/operators/#{@auth[:operatorId]}/users/#{username}/auth_keys/#{auth_key_id}")
+    end
+
+    # SAMユーザーのパスワードを削除する
+    def delete_user_password(username=@auth[:userName])
+      @api.delete(path: "/operators/#{@auth[:operatorId]}/users/#{username}/password")
+    end
+
+    # SAMユーザーのパスワードがセットされているかを取得する
+    def has_user_password(username=@auth[:userName])
+      @api.get(path: "/operators/#{@auth[:operatorId]}/users/#{username}/password")
+    end
+
+    # SAMユーザーのパスワードを作成する
+    def create_user_password(username=@auth[:userName], password)
+      @api.post(path: "/operators/#{@auth[:operatorId]}/users/#{username}/password", payload:{password: password})
+    end
+
+    # SAMユーザーの権限設定を取得する
+    def get_user_permission(username=@auth[:userName])
+      @api.get(path: "/operators/#{@auth[:operatorId]}/users/#{username}/permission")
+    end
+
+    # SAMユーザーの権限を更新する
+    def update_user_permission(username=@auth[:userName], permission="", description="")
+      @api.put(path: "/operators/#{@auth[:operatorId]}/users/#{username}/permission", payload:{description: description, permission: permission})
+    end
+
+    # Role一覧取得
+    def list_roles()
+      @api.get(path: "/operators/#{@auth[:operatorId]}/roles")
+    end
+
+    # Role を削除する
+    def delete_role(role_id)
+      @api.delete(path: "/operators/#{@auth[:operatorId]}/roles/#{role_id}")
+    end
+
+    # Role を取得する
+    def get_role(role_id)
+      @api.get(path: "/operators/#{@auth[:operatorId]}/roles/#{role_id}")
+    end
+
+    # Role を新しく追加する
+    def create_role(role_id, permission, description='')
+      @api.post(path: "/operators/#{@auth[:operatorId]}/roles/#{role_id}", payload:{description: description, permission: permission})
+    end
+
+    # Role を編集する
+    def update_role(role_id, permission, description='')
+      @api.put(path: "/operators/#{@auth[:operatorId]}/roles/#{role_id}", payload:{description: description, permission: permission})
+    end
+
+    # Role に紐づくユーザーの一覧を取得する
+    def list_role_attached_users(role_id)
+      @api.get(path: "/operators/#{@auth[:operatorId]}/roles/#{role_id}/users")
+    end
+
+    # SAMユーザーのロール一覧取得
+    def list_user_roles(user_name)
+      @api.get(path: "/operators/#{@auth[:operatorId]}/users/#{user_name}/roles")
+    end
+
+    # SAMユーザーにロールをアタッチ
+    def attach_role_to_user(user_name, role_id)
+      @api.post(path: "/operators/#{@auth[:operatorId]}/users/#{user_name}/roles", payload: {roleId: role_id})
+    end
+
+    # SAMユーザーからロールをデタッチ
+    def delete_role_from_user(user_name, role_id)
+      @api.delete(path: "/operators/#{@auth[:operatorId]}/users/#{user_name}/roles/#{role_id}")
+    end
+
+    # OperatorのAuthKey一覧取得
+    def list_operator_auth_keys()
       @api.get(path: "/operators/#{@auth[:operatorId]}/auth_keys")
     end
 
-    def create_auth_key()
+    # OperatorのAuthKey生成
+    def generate_operator_auth_key()
       @api.post(path: "/operators/#{@auth[:operatorId]}/auth_keys")
     end
 
-    def delete_auth_key(auth_key_id)
+    # OperatorのAuthKey削除
+    def delete_operator_auth_key(auth_key_id)
       @api.delete(path: "/operators/#{@auth[:operatorId]}/auth_keys/#{auth_key_id}")
     end
 
@@ -334,6 +478,11 @@ module Soracom
       @auth[:operatorId]
     end
 
+    # ユーザ名を取得
+    def user_name
+      @auth[:userName]
+    end
+
     # トークンを取得
     def token
       @auth[:token]
@@ -342,7 +491,7 @@ module Soracom
     private
 
     # authenticate by email and password
-    def auth(email, password, endpoint)
+    def auth_by_email(email, password, endpoint)
       endpoint = API_BASE_URL if endpoint.nil?
       res = RestClient.post endpoint + '/auth',
                             { email: email, password: password },
@@ -365,10 +514,49 @@ module Soracom
       Hash[JSON.parse(res.body).map { |k, v| [k.to_sym, v] }]
     end
 
+    # authenticate by operator_id and user_name and password
+    def auth_by_user(operator_id, user_name, password, endpoint)
+      endpoint = API_BASE_URL if endpoint.nil?
+      res = RestClient.post endpoint + '/auth',
+                            { operatorId: operator_id, userName: user_name, password: password },
+                            'Content-Type' => 'application/json',
+                            'Accept' => 'application/json'
+      result = JSON.parse(res.body)
+      fail result['message'] if res.code != '200'
+      Hash[JSON.parse(res.body).map { |k, v| [k.to_sym, v] }]
+    end
+
+    def auth_by_profile(profile)
+      profile_string = open( "#{ENV['HOME']}/.soracom/#{profile}.json").read
+      profile_data = JSON.parse(profile_string)
+      @endpoint = profile_data.fetch('endpoint', @endpoint)
+      if profile_data['authKeyId'] && profile_data['authKey']
+        @auth = auth_by_key(profile_data['authKeyId'], profile_data['authKey'], @endpoint)
+      elsif profile_data['email'] && profile_data['password']
+        @auth = auth_by_email(profile_data['email'], profile_data['password'], @endpoint)
+      elsif profile_data['operatorId'] && profile_data['userName'] && profile_data['password']
+        @auth = auth_by_user(profile_data['operatorId'], profile_data['userName'], profile_data['password'], @endpoint)
+      else
+        return nil
+      end
+    end
+
     def extract_jwt(jwt)
       encoded = jwt.split('.')[1]
       encoded += '=' * (4 - encoded.length % 4) # add padding(=) for Base64
       Base64.decode64(encoded)
     end
+
+    def transform_json(json)
+      begin
+        target=JSON.parse(json)
+        if target.class == Hash
+          target = target.map{|k,v| {"key" => k, "value" => v}}
+        end
+      rescue JSON::ParserError
+        abort("ERROR: parameter cannot be parsed as JSON.")
+      end
+      JSON.pretty_generate target
+    end
   end
 end

data/lib/soracom/version.rb

@@ -1,4 +1,4 @@
 # version info
 module Soracom
-  VERSION = '1.0.9'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soracom
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.1
 platform: ruby
 authors:
 - MATSUI, Motokatsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler