hotdog 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3141bb4b97ec0c63dc50eae72bd1cf5d44c148
-  data.tar.gz: 548009a66b40670fa5d2a0c3d81616fe1f4c759f
+  metadata.gz: ca3cf225477ffccd577b502f07b089096c09151e
+  data.tar.gz: c686cbfbf95c690db8f840cbafe0bd85cd74223f
 SHA512:
-  metadata.gz: 6e6d38e556cbfcb953e9affa5890ecd34fc9dc91dd5eb5bba48f1ed661d5fbe8b15c87157257f428cf9ddb26aa434f9bea91cdb9f3bf39bb8a4658929af285ad
-  data.tar.gz: 52b4f24c92001e3ebf55f6a527af9d0f2454476ceba4f46edc307dc72dc30a9787f0cad71a7a23b783c7dab4eee420998f05c7ed1b89faa489369ce42d78c05a
+  metadata.gz: 8556bf0dc32a05c44212b5ff7f52c95ced92e1a6cfd669a7cf211dfa86efe55251d2345f0a1ed907e6775a1350f98567382022ef1fd09e3258b02ae1bc30729b
+  data.tar.gz: 728f6a9170a8bd680b548b8e060c5317f11c1cb9b664254d2c92fae99e407cbb2c231301a4a831b1f913e32c5ce00154101f9c0164dc5c538bfc298f8d5138f8

data/lib/hotdog/application.rb

@@ -76,14 +76,6 @@ module Hotdog
           exit(1)
         end
 
-        unless options[:api_key]
-          raise("DATADOG_API_KEY is not set")
-        end
-
-        unless options[:application_key]
-          raise("DATADOG_APPLICATION_KEY is not set")
-        end
-
         if options[:format] == "ltsv"
           options[:headers] = true
         end
@@ -111,6 +103,32 @@ module Hotdog
       end
     end
 
+    def api_key()
+      if options[:api_key]
+        options[:api_key]
+      else
+        update_api_key!
+        if options[:api_key]
+          options[:api_key]
+        else
+          raise("DATADOG_API_KEY is not set")
+        end
+      end
+    end
+
+    def application_key()
+      if options[:application_key]
+        options[:application_key]
+      else
+        update_application_key!
+        if options[:application_key]
+          options[:application_key]
+        else
+          raise("DATADOG_APPLICATION_KEY is not set")
+        end
+      end
+    end
+
     private
     def define_options
       @optparse.on("--endpoint ENDPOINT", "Datadog API endpoint") do |endpoint|
@@ -231,6 +249,28 @@ module Hotdog
         end
       end
     end
+
+    def update_api_key!()
+      if options[:api_key_command]
+        options[:api_key] = IO.popen(options[:api_key_command]).read.strip
+      else
+        update_keys!
+      end
+    end
+
+    def update_application_key!()
+      if options[:application_key_command]
+        options[:application_key] = IO.popen(options[:application_key_command]).read.strip
+      else
+        update_keys!
+      end
+    end
+
+    def update_keys!()
+      if options[:key_command]
+        options[:api_key], options[:application_key] = IO.popen(options[:key_command]).read.strip.split(":", 2)
+      end
+    end
   end
 end
 

data/lib/hotdog/commands.rb

@@ -291,7 +291,7 @@ module Hotdog
       def get_all_tags() #==> Hash<Tag,Array<Host>>
         endpoint = options[:endpoint]
         requests = {all_downtime: "/api/v1/downtime", all_tags: "/api/v1/tags/hosts"}
-        query = URI.encode_www_form(api_key: options[:api_key], application_key: options[:application_key])
+        query = URI.encode_www_form(api_key: application.api_key, application_key: application.application_key)
         begin
           parallelism = Parallel.processor_count
           responses = Hash[Parallel.map(requests, in_threads: parallelism) { |name, request_path|
@@ -323,7 +323,7 @@ module Hotdog
       end
 
       def dog()
-        @dog ||= Dogapi::Client.new(options[:api_key], options[:application_key])
+        @dog ||= Dogapi::Client.new(application.api_key, application.application_key)
       end
 
       def split_tag(tag)

data/lib/hotdog/commands/tag.rb

@@ -6,7 +6,11 @@ module Hotdog
   module Commands
     class Tag < BaseCommand
       def define_options(optparse, options={})
+        default_option(options, :tag_source, "user")
         default_option(options, :tags, [])
+        optparse.on("--source SOURCE") do |v|
+          options[:tag_source] = v
+        end
         optparse.on("--tag TAG") do |v|
           options[:tags] << v
         end
@@ -20,9 +24,9 @@ module Hotdog
             # nop
           else
             # add all as user tags
-            code, add_tags = dog.add_tags(host_name, options[:tags], source="user")
+            code, add_tags = dog.add_tags(host_name, options[:tags], source=options[:tag_source])
             if code.to_i / 100 != 2
-              raise("dog.add_tags(#{host_name.inspect}, #{options[:tags].inspect}, source=\"user\") returns [#{code.inspect}, #{add_tags.inspect}]")
+              raise("dog.add_tags(#{host_name.inspect}, #{options[:tags].inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{add_tags.inspect}]")
             end
           end
         end

data/lib/hotdog/commands/untag.rb

@@ -6,7 +6,11 @@ module Hotdog
   module Commands
     class Untag < BaseCommand
       def define_options(optparse, options={})
+        default_option(options, :tag_source, "user")
         default_option(options, :tags, [])
+        optparse.on("--source SOURCE") do |v|
+          options[:tag_source] = v
+        end
         optparse.on("--tag TAG") do |v|
           options[:tags] << v
         end
@@ -18,23 +22,23 @@ module Hotdog
 
           if options[:tags].empty?
             # delete all user tags
-            code, detach_tags = dog.detach_tags(host_name, source="user")
+            code, detach_tags = dog.detach_tags(host_name, source=options[:tag_source])
             if code.to_i / 100 != 2
-              raise("dog.detach_tags(#{host_name.inspect}, source=\"user\") returns [#{code.inspect}, #{detach_tags.inspect}]")
+              raise("dog.detach_tags(#{host_name.inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{detach_tags.inspect}]")
             end
           else
-            code, host_tags = dog.host_tags(host_name, source="user")
+            code, host_tags = dog.host_tags(host_name, source=options[:tag_source])
             if code.to_i / 100 != 2
-              raise("dog.host_tags(#{host_name.inspect}, source=\"user\") returns [#{code.inspect}, #{host_tags.inspect}]")
+              raise("dog.host_tags(#{host_name.inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{host_tags.inspect}]")
             end
             old_tags = host_tags["tags"]
             new_tags = old_tags - options[:tags]
             if old_tags == new_tags
               # nop
             else
-              code, update_tags = dog.update_tags(host_name, new_tags, source="user")
+              code, update_tags = dog.update_tags(host_name, new_tags, source=options[:tag_source])
               if code.to_i / 100 != 2
-                raise("dog.update_tags(#{host_name.inspect}, #{new_tags.inspect}, source=\"user\") returns [#{code.inspect}, #{update_tags.inspect}]")
+                raise("dog.update_tags(#{host_name.inspect}, #{new_tags.inspect}, source=#{options[:tag_source].inspect}) returns [#{code.inspect}, #{update_tags.inspect}]")
               end
             end
           end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler