dd2tf 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c037ac78d253678306c6024b8392a6a367effb18
-  data.tar.gz: 2568060ea2c6110d5ca454d1885a53424bd891bf
+  metadata.gz: a8a2f18e1bde472cb2cc32ed1297334f74647ca5
+  data.tar.gz: b74172a38ce877b6c8ddc6ef1a08021e7b2dd241
 SHA512:
-  metadata.gz: 65df4757d1d84981fa4ef22fcc107ac9d4e4c2f2a81d6e8c706bb83146c0d4de02d7efb756d35dded379d2e9e7eda1e420dd7707ef471f315bfdb0da0e6011a2
-  data.tar.gz: 3d9914aa01411f71adb40e61964e46459801765277941f0df54e4655ac3963e7e3f11b3654321ed51a0bec70de8f15e41ca3a4098b8fbe7a55bc22e39315fbbd
+  metadata.gz: d4ba7d722f27b99fed6ca38d96da4f04086de9c3fe8018c6daeb5431ebf1716076e61b30a8695bf3d5577cd7c02adf9ff390aad225ec96c9f843b8bc438e06b2
+  data.tar.gz: 3334c6dbf87aeb4eb2cf2ceb03bda267dc29b5ffedbf7f8ecc577ebaf6497cefd475f34e080f520b90223de79d2de21c68f58b26891d3dc3525905fe3e73085c

data/exe/dd2tf

@@ -5,52 +5,11 @@ require 'thor'
 require 'dogapi'
 
 module Dd2tf
-  module Util
-    def initialize(*args, &block)
-      super
-      client
-    end
-
-    private
-
-    def client
-      return @client unless @client.nil?
-      config = Config.new(options[:dd_api_key], options[:dd_app_key])
-      @client ||= ::Dogapi::Client.new(config.api_key, config.app_key)
-    end
-  end
-
-  class Print < Thor
-    include Util
-
-    desc "user", "ipmort user resource to tfstate"
-    def user
-      puts ::Dd2tf::Import::User.new(client).print
-    end
-
-    desc "downtime", "ipmort downtime resource to tfstate"
-    def downtime
-      puts ::Dd2tf::Import::Downtime.new(client).print
-    end
-
-    desc "monitor", "ipmort monitor resource to tfstate"
-    def monitor
-      puts ::Dd2tf::Import::Monitor.new(client).print
-    end
-
-    desc "timeboard", "ipmort timeboard resource to tfstate"
-    def timeboard
-      puts ::Dd2tf::Import::Timeboard.new(client).print
-    end
-  end
-
   class Cli < Thor
-    include Util
+    include Thor::Actions
 
     class_option :dd_api_key, type: :string
     class_option :dd_app_key, type: :string
-    desc "print [resource]", "Print import resource command from remote to tfstate."
-    subcommand 'print', Print
 
     desc "puts monitor configuration as terraform config", "puts monitor config"
     def monitor
@@ -66,6 +25,14 @@ module Dd2tf
     def user
       puts User.new(client).output
     end
+
+    private
+
+    def client
+      return @client unless @client.nil?
+      config = Config.new(options[:dd_api_key], options[:dd_app_key])
+      @client ||= ::Dogapi::Client.new(config.api_key, config.app_key)
+    end
   end
 end
 

data/lib/dd2tf.rb

@@ -1,13 +1,6 @@
 require "dd2tf/version"
-require "dd2tf/config"
-
 require "dd2tf/base"
-require "dd2tf/user"
 require "dd2tf/monitor"
 require "dd2tf/timeboard"
-
-require "dd2tf/import/base"
-require "dd2tf/import/user"
-require "dd2tf/import/monitor"
-require "dd2tf/import/timeboard"
-require "dd2tf/import/downtime"
+require "dd2tf/user"
+require "dd2tf/config"

data/lib/dd2tf/version.rb

@@ -1,3 +1,3 @@
 module Dd2tf
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dd2tf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - reizist
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
@@ -116,11 +116,6 @@ files:
 - lib/dd2tf.rb
 - lib/dd2tf/base.rb
 - lib/dd2tf/config.rb
-- lib/dd2tf/import/base.rb
-- lib/dd2tf/import/downtime.rb
-- lib/dd2tf/import/monitor.rb
-- lib/dd2tf/import/timeboard.rb
-- lib/dd2tf/import/user.rb
 - lib/dd2tf/monitor.rb
 - lib/dd2tf/timeboard.rb
 - lib/dd2tf/user.rb

data/lib/dd2tf/import/base.rb

@@ -1,33 +0,0 @@
-require 'active_support'
-require 'active_support/core_ext'
-
-module Dd2tf
-  module Import
-    class Base
-      attr_reader :resources
-      class NotImplementedError < StandardError; end
-      UNALLOWED_RESOURCE_TITLE_REGEXP = /\(|\)|'|\.|\[|\]|:/
-
-      def initialize(client)
-        @client = client
-      end
-
-      def print
-        resources.each do |resource|
-          puts "terraform import #{resource_type}.#{resource[:resource_name]} #{resource[:resource_id]}"
-        end
-        nil
-      end
-
-      private
-
-      def resources
-        raise NotImplementedError
-      end
-
-      def resource_type
-        raise NotImplementedError
-      end
-    end
-  end
-end

data/lib/dd2tf/import/downtime.rb

@@ -1,21 +0,0 @@
-module Dd2tf
-  module Import
-    class Downtime < Base
-      def resource_type
-        "datadog_downtime"
-      end
-
-      def resources
-        resources = []
-        downtimes = @client.get_all_downtimes[1]
-
-        downtimes.each do |downtime|
-          downtime_name = downtime["id"]
-          resource_id = downtime["id"]
-          resources << { resource_id: resource_id, resource_name: downtime_name }
-        end
-        resources
-      end
-    end
-  end
-end

data/lib/dd2tf/import/monitor.rb

@@ -1,22 +0,0 @@
-module Dd2tf
-  module Import
-    class Monitor < Base
-      def resource_type
-        "datadog_monitor"
-      end
-
-      def resources
-        resources = []
-        monitors = @client.get_all_monitors[1]
-
-        monitors.each do |monitor|
-          monitor_name = monitor["name"].underscore.gsub(" ", "_").gsub(UNALLOWED_RESOURCE_TITLE_REGEXP, '')
-          resource_id = monitor["id"]
-          resources << { resource_id: resource_id, resource_name: monitor_name }
-        end
-
-        resources
-      end
-    end
-  end
-end

data/lib/dd2tf/import/timeboard.rb

@@ -1,22 +0,0 @@
-module Dd2tf
-  module Import
-    class Timeboard < Base
-      def resource_type
-        "datadog_timeboard"
-      end
-
-      def resources
-        resources = []
-        boards = @client.get_dashboards[1]["dashes"]
-
-        boards.each do |board|
-          board_name = board["title"].underscore.gsub(" ", "_").gsub(UNALLOWED_RESOURCE_TITLE_REGEXP, '')
-          resource_id = board["id"]
-          resources << { resource_id: resource_id, resource_name: board_name }
-        end
-
-        resources
-      end
-    end
-  end
-end

data/lib/dd2tf/import/user.rb

@@ -1,23 +0,0 @@
-module Dd2tf
-  module Import
-    class User < Base
-      def resource_type
-        "datadog_user"
-      end
-
-      def resources
-        resources = []
-        users = @client.get_all_users[1]["users"]
-
-        users.each do |user|
-          user_name = user["name"].to_s.underscore.gsub(" ", "_").gsub(UNALLOWED_RESOURCE_TITLE_REGEXP, '')
-          # resource_id is the email address
-          # see: https://www.terraform.io/docs/providers/datadog/r/user.html#import
-          resource_id = user["email"]
-          resources << { resource_id: resource_id, resource_name: user_name }
-        end
-        resources
-      end
-    end
-  end
-end