lib/conjur/command/variables.rb in conjur-cli-4.23.0 vs lib/conjur/command/variables.rb in conjur-cli-4.24.0

- old
+ new

@@ -16,49 +16,76 @@ # FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - class Conjur::Command::Variables < Conjur::Command desc "Manage variables" command :variable do |var| var.desc "Create and store a variable" var.arg_name "id [value]" var.command :create do |c| c.arg_name "mime_type" - c.flag [:m, :"mime-type"], default_value: "text/plain" + c.flag [:m, :"mime-type"], default_value: 'text/plain' c.arg_name "kind" - c.flag [:k, :"kind"], default_value: "secret" + c.flag [:k, :"kind"], default_value: 'secret' c.arg_name "value" c.desc "Initial value, which may also be specified as the second command argument after the variable id" c.flag [:v, :"value"] acting_as_option(c) - c.action do |global_options,options,args| - id = args.shift - unless id - ActiveSupport::Deprecation.warn "id argument will be required in future releases" - end + c.arg_name 'interactive' + c.desc 'Create variable interactively' + c.switch [:i, :'interactive'] + + c.action do |global_options,options, args| + @default_mime_type = c.flags[:m].default_value + @default_kind = c.flags[:k].default_value + + id = args.shift unless args.empty? + value = args.shift unless args.empty? - raise "Received extra arguments '#{args.join(' ')}'" unless args.empty? raise "Received conflicting value arguments" if value && options[:value] - - options[:id] = id if id - options[:value] ||= value if value + groupid = options[:'ownerid'] mime_type = options.delete(:m) kind = options.delete(:k) - + value ||= options.delete(:v) + + options.delete(:'interactive') options.delete(:"mime-type") options.delete(:"kind") + options.delete(:'value') + annotations = {} + + # If the user asked for interactive mode, or he didn't specify + # both an id and a value, prompt for any missing options. + if options.delete(:i) || !(id && value) + id ||= prompt_for_id + + groupid ||= prompt_for_group + + kind = prompt_for_kind if !kind || kind == @default_kind + + mime_type = prompt_for_mime_type if !mime_type || mime_type == @default_mime_type + + annotations = prompt_for_annotations + + value ||= prompt_for_value + end + + options[:id] = id + options[:value] = value + options[:'ownerid'] = groupid if groupid + var = api.create_variable(mime_type, kind, options) + api.resource(var).annotations.merge!(annotations) if annotations && !annotations.empty? display(var, options) end end var.desc "Show a variable" @@ -121,7 +148,59 @@ id = require_arg(args, 'variable') $stdout.write api.variable(id).value(options[:version]) end end + end + + def self.prompt_for_id + highline.ask('Enter the id: ') + end + + def self.prompt_for_group + highline.ask('Enter the group: ', ->(name) { @group && @group.roleid } ) do |q| + q.validate = ->(name) do + name.empty? || (@group = api.group(name)).exists? + end + q.responses[:not_valid] = "Group '<%= @answer %>' doesn't exist, or you don't have permission to use it" + end + end + + def self.prompt_for_kind + highline.ask('Enter the kind: ') {|q| q.default = @default_kind } + end + + def self.prompt_for_mime_type + highline.ask('Enter the MIME type: ') {|q| q.default = @default_mime_type } + end + + def self.prompt_for_annotations + highline.say('Add annotations (press enter to finish):') + {}.tap do |annotations| + until (name = highline.ask('annotation name: ')).empty? + annotations[name] = read_till_eof('annotation value (^D to finish):') + end + end + end + + def self.prompt_for_value + read_till_eof('Enter the value (^D on its own line to finish):') + end + + def self.highline + require 'highline' + @highline ||= HighLine.new($stdin,$stderr) + end + + def self.read_till_eof(prompt = nil) + highline.say(prompt) if prompt + [].tap do |lines| + loop do + begin + lines << highline.ask('') + rescue EOFError + break + end + end + end.join("\n") end end