datadog_backup 0.10.2 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c83b8ce7b212ad43f91a1619363eb683b58cbf7089a24f05b56a5a6a72d250
-  data.tar.gz: 82986e61ff8d93fed519d03c6b38095cce0c97f0981274bb904d94f7b762e056
+  metadata.gz: 04e0cf7686b2efa66728d2bb5d3fd021847368a6522b3b3ba3cc9012a118e32f
+  data.tar.gz: 22643d6160be735c52f6bc25c134f250adae2ce9b6751c62ee04265d2082b9d3
 SHA512:
-  metadata.gz: ec5087654fd806a8cb562912d460dfbdf7c9e1bdb9d75728ce310b4c0b20ba690b7ccb42584c1c28dc4b5db6ba49cfe46d6cb64ad623e6dfb8939ad07dfed56c
-  data.tar.gz: 072762f43d59b7727baccbff8a7273a84ab0b0e1fe0fbd1787486d6b1b08faad9b492b39d68a83be90637a09a6f2bbc436f386775b9da4751308253b0ff6bbc8
+  metadata.gz: 2293472fd1e18a59755e9e44ed1a39a17eb071e36de772c8ae146070138574f0726b016e9d0049cb8c8b8d625ce440a227ad5cf18a07a82ab77601580b96d01a
+  data.tar.gz: 583ff00c4a38005736f1bca85d80fc82eb6fbf8deb107044423ea2e7c3f87e05d82834f0051bf5fb7e5c2e476ea8c810292f93c392a3a1fe4e08a2be4327849e

data/.gitignore

@@ -117,3 +117,5 @@ Gemfile.lock
 
 spec/helpers/failures.txt
 backup/
+
+.envrc

data/.rubocop.yml

@@ -0,0 +1 @@
+require: rubocop-rspec

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+# [1.0.0-alpha.2](https://github.com/scribd/datadog_backup/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2021-01-19)
+
+
+### Features
+
+* If resource doesn't exist in Datadog, the resource is recreated. ([f2f9e1f](https://github.com/scribd/datadog_backup/commit/f2f9e1f7b244eb3eeaaf121025769f9f327f4e1e))
+
+
+### BREAKING CHANGES
+
+* `datadog-backup` used to exit with an error if a resource
+wasn't found in Datadog.
+
+# [1.0.0-alpha.1](https://github.com/scribd/datadog_backup/compare/v0.11.0...v1.0.0-alpha.1) (2021-01-17)
+
+
+### Features
+
+* If resource doesn't exist in Datadog, the resource is recreated. ([95d9699](https://github.com/scribd/datadog_backup/commit/95d9699e3fe6a6ecae0d6690dce225680f1d6a8a))
+
+
+### BREAKING CHANGES
+
+* `datadog-backup` used to exit with an error if a resource
+wasn't found in Datadog.
+
+# [0.11.0](https://github.com/scribd/datadog_backup/compare/v0.10.3...v0.11.0) (2021-01-12)
+
+
+### Features
+
+* Add force-restore flag to allow running in automation ([#46](https://github.com/scribd/datadog_backup/issues/46)) ([e067386](https://github.com/scribd/datadog_backup/commit/e0673862b6f6d86297e1352faaee872f2c4884c8))
+
+## [0.10.3](https://github.com/scribd/datadog_backup/compare/v0.10.2...v0.10.3) (2020-12-11)
+
+
+### Performance Improvements
+
+* coerce patch release ([bc86649](https://github.com/scribd/datadog_backup/commit/bc86649b874cd5be1da2f6bc0d1b1ecd0728676c))
+
 ## [0.10.2](https://github.com/scribd/datadog_backup/compare/v0.10.1...v0.10.2) (2020-11-03)
 
 

data/Gemfile

@@ -9,4 +9,5 @@ group :development, :test do
   gem 'guard-rspec'
   gem 'rspec'
   gem 'rubocop'
+  gem 'rubocop-rspec'
 end

data/Guardfile

@@ -17,7 +17,7 @@
 #
 # and, you'll have to watch "config/Guardfile" instead of "Guardfile"
 
-# Note: The cmd option is now required due to the increasing number of ways
+# NOTE: The cmd option is now required due to the increasing number of ways
 #       rspec may be run, below are examples of the most common uses.
 #  * bundler: 'bundle exec rspec'
 #  * bundler binstubs: 'bin/rspec'

data/bin/datadog_backup

@@ -23,6 +23,7 @@ LOGGER.level = Logger::INFO
   diff_format: :color,
   resources: [DatadogBackup::Dashboards, DatadogBackup::Monitors],
   output_format: :yaml,
+  force_restore: false,
   logger: LOGGER
 }
 
@@ -54,7 +55,10 @@ def prereqs
     opts.on('--dashboards-only') do
       @options[:resources] = [DatadogBackup::Dashboards]
     end
-    opts.on('--json', 'format backups as JSON instead of YAML. Does not impact `diffs` nor `restore`, but do not mix formats in the same backup-dir.') do
+    opts.on(
+      '--json',
+      'format backups as JSON instead of YAML. Does not impact `diffs` nor `restore`, but do not mix formats in the same backup-dir.'
+    ) do
       @options[:output_format] = :json
     end
     opts.on('--no-color', 'removes colored output from diff format') do
@@ -63,6 +67,9 @@ def prereqs
     opts.on('--diff-format FORMAT', 'one of `color`, `html_simple`, `html`') do |format|
       @options[:diff_format] = format.to_sym
     end
+    opts.on('--force-restore', 'force restore to Datadog') do
+      @options[:force_restore] = true
+    end
   end
   options.parse!
 

data/datadog_backup.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'concurrent-ruby-edge', '0.6.0'
   spec.add_dependency 'deepsort', '0.4.5'
   spec.add_dependency 'diffy', '3.4.0'
-  spec.add_dependency 'dogapi', '1.42.0'
+  spec.add_dependency 'dogapi', '1.44.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'

data/example/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem 'datadog_backup', :source => 'https://scribd.jfrog.io/artifactory/gems-local'
+gem 'datadog_backup'

data/lib/datadog_backup/cli.rb

@@ -91,7 +91,7 @@ module DatadogBackup
     end
 
     def matching_resource_instance(klass)
-      resource_instances.select { |resource_instance| resource_instance.class == klass }.first
+      resource_instances.select { |resource_instance| resource_instance.instance_of?(klass) }.first
     end
 
     def resource_instances
@@ -108,27 +108,30 @@ module DatadogBackup
         id, diff = *future.value!
         next unless diff
 
-        puts '--------------------------------------------------------------------------------'
-        puts format_diff_output([id, diff])
-        puts '(r)estore to Datadog, overwrite local changes and (d)ownload, (s)kip, or (q)uit?'
-        response = $stdin.gets.chomp
-        case response
-        when 'q'
-          exit
-        when 'r'
-          puts "Restoring #{id} to Datadog."
-          definitive_resource_instance(id).update_with_200(id, definitive_resource_instance(id).load_from_file_by_id(id))
-        when 'd'
-          puts "Downloading #{id} from Datadog."
-          definitive_resource_instance(id).get_and_write_file(id)
-        when 's'
-          next
+        if @options[:force_restore]
+          definitive_resource_instance(id).restore(id)
         else
-          puts 'Invalid response, please try again.'
+          puts '--------------------------------------------------------------------------------'
+          puts format_diff_output([id, diff])
+          puts '(r)estore to Datadog, overwrite local changes and (d)ownload, (s)kip, or (q)uit?'
           response = $stdin.gets.chomp
+          case response
+          when 'q'
+            exit
+          when 'r'
+            puts "Restoring #{id} to Datadog."
+            definitive_resource_instance(id).restore(id)
+          when 'd'
+            puts "Downloading #{id} from Datadog."
+            definitive_resource_instance(id).get_and_write_file(id)
+          when 's'
+            next
+          else
+            puts 'Invalid response, please try again.'
+            response = $stdin.gets.chomp
+          end
         end
       end
-
       watcher.join if watcher.status
     end
 

data/lib/datadog_backup/core.rb

@@ -24,55 +24,48 @@ module DatadogBackup
       raise 'subclass is expected to implement #backup'
     end
 
-    # Calls out to Datadog and checks for a '200' response
-    def client_with_200(method, *id)
-      max_retries = 6
-      retries ||= 0
-
-      response = client.send(method, *id)
-
-      # logger.debug response
-      raise "Method #{method} failed with error #{response}" unless response[0] == '200'
-
-      response[1]
-    rescue ::Net::OpenTimeout => e
-      if (retries += 1) <= max_retries
-        sleep(0.1 * retries**5) # 0.1, 3.2, 24.3, 102.4 seconds per retry
-        retry
-      else
-        raise "Method #{method} failed with error #{e.message}"
-      end
-    end
-
     # Returns the diffy diff.
     # Optionally, supply an array of keys to remove from comparison
-    def diff(id, banlist = [])
-      current = except(get_by_id(id), banlist).deep_sort.to_yaml
-      filesystem = except(load_from_file_by_id(id), banlist).deep_sort.to_yaml
+    def diff(id)
+      current = except(get_by_id(id)).deep_sort.to_yaml
+      filesystem = except(load_from_file_by_id(id)).deep_sort.to_yaml
       result = ::Diffy::Diff.new(current, filesystem, include_plus_and_minus_in_html: true).to_s(diff_format)
       logger.debug("Compared ID #{id} and found #{result}")
       result
     end
 
     # Returns a hash with banlist elements removed
-    def except(hash, banlist)
+    def except(hash)
       hash.tap do # tap returns self
-        banlist.each do |key|
+        @banlist.each do |key|
           hash.delete(key) # delete returns the value at the deleted key, hence the tap wrapper
         end
       end
     end
 
+    def get(id)
+      with_200 do
+        api_service.request(Net::HTTP::Get, "/api/#{api_version}/#{api_resource_name}/#{id}", nil, nil, false)
+      end
+    end
+
+    def get_all
+      with_200 do
+        api_service.request(Net::HTTP::Get, "/api/#{api_version}/#{api_resource_name}", nil, nil, false)
+      end
+    end
+
     def get_and_write_file(id)
       write_file(dump(get_by_id(id)), filename(id))
     end
 
-    def get_by_id(_id)
-      raise 'subclass is expected to implement #get_by_id(id)'
+    def get_by_id(id)
+      except(get(id))
     end
 
     def initialize(options)
       @options = options
+      @banlist = []
       ::FileUtils.mkdir_p(mydir)
     end
 
@@ -80,25 +73,46 @@ module DatadogBackup
       self.class.to_s.split(':').last.downcase
     end
 
-    def restore
-      raise 'subclass is expected to implement #restore'
+    # Calls out to Datadog and checks for a '200' response
+    def create(body)
+      result = with_200 do
+        api_service.request(Net::HTTP::Post, "/api/#{api_version}/#{api_resource_name}", nil, body, true)
+      end
+      logger.warn 'Successfully created in datadog.'
+      result
     end
 
+    # Calls out to Datadog and checks for a '200' response
     def update(id, body)
-      api_service.request(Net::HTTP::Put, "/api/#{api_version}/#{api_resource_name}/#{id}", nil, body, true)
+      result = with_200 do
+        api_service.request(Net::HTTP::Put, "/api/#{api_version}/#{api_resource_name}/#{id}", nil, body, true)
+      end
+      logger.warn 'Successfully restored to datadog.'
+      result
     end
 
-    # Calls out to Datadog and checks for a '200' response
-    def update_with_200(id, body)
+    def restore(id)
+      body = load_from_file_by_id(id)
+      begin
+        update(id, body)
+      rescue RuntimeError => e
+        if e.message.include?('Request failed with error ["404"')
+          new_id = create(body).fetch('id')
+
+          FileUtils.rm(find_file_by_id(id))
+          get_and_write_file(new_id)
+        else
+          raise e.message
+        end
+      end
+    end
+
+    def with_200
       max_retries = 6
       retries ||= 0
 
-      response = update(id, body)
-
-      # logger.debug response
-      raise "Update failed with error #{response}" unless response[0] == '200'
-
-      logger.warn "Successfully restored #{id} to datadog."
+      response = yield
+      raise "Request failed with error #{response}" unless response[0] == '200'
 
       response[1]
     rescue ::Net::OpenTimeout => e
@@ -106,7 +120,7 @@ module DatadogBackup
         sleep(0.1 * retries**5) # 0.1, 3.2, 24.3, 102.4 seconds per retry
         retry
       else
-        raise "Update failed with error #{e.message}"
+        raise "Net::OpenTimeout: #{e.message}"
       end
     end
   end

data/lib/datadog_backup/dashboards.rb

@@ -2,10 +2,8 @@
 
 module DatadogBackup
   class Dashboards < Core
-    BANLIST = %w[modified_at url]
-
     def all_boards
-      client_with_200(:get_all_boards).fetch('dashboards')
+      get_all.fetch('dashboards')
     end
 
     def api_service
@@ -37,14 +35,9 @@ module DatadogBackup
       Concurrent::Promises.zip(*futures).value!
     end
 
-    def diff(id)
-      super(id, BANLIST)
-    end
-
-    def get_by_id(id)
-      except(client_with_200(:get_board, id), BANLIST)
+    def initialize(options)
+      super(options)
+      @banlist = %w[modified_at url].freeze
     end
-
-    def restore!; end
   end
 end

data/lib/datadog_backup/local_filesystem.rb

@@ -31,9 +31,10 @@ module DatadogBackup
     end
 
     def dump(object)
-      if output_format == :json
+      case output_format
+      when :json
         JSON.pretty_generate(object.deep_sort)
-      elsif output_format == :yaml
+      when :yaml
         YAML.dump(object.deep_sort)
       else
         raise 'invalid output_format specified or not specified'
@@ -45,7 +46,7 @@ module DatadogBackup
     end
 
     def file_type(filepath)
-      ::File.extname(filepath).strip.downcase[1..-1].to_sym
+      ::File.extname(filepath).strip.downcase[1..].to_sym
     end
 
     def find_file_by_id(id)
@@ -53,9 +54,10 @@ module DatadogBackup
     end
 
     def load_from_file(string, output_format)
-      if output_format == :json
+      case output_format
+      when :json
         JSON.parse(string)
-      elsif output_format == :yaml
+      when :yaml
         YAML.safe_load(string)
       else
         raise 'invalid output_format specified or not specified'

data/lib/datadog_backup/monitors.rb

@@ -2,11 +2,8 @@
 
 module DatadogBackup
   class Monitors < Core
-    API_SERVICE_NAME = :@monitor_svc
-    BANLIST = %w[overall_state overall_state_modified matching_downtimes modified]
-
     def all_monitors
-      @all_monitors ||= client_with_200(:get_all_monitors)
+      @all_monitors ||= get_all
     end
 
     def api_service
@@ -29,14 +26,13 @@ module DatadogBackup
       end
     end
 
-    def diff(id)
-      super(id, BANLIST)
-    end
-
     def get_by_id(id)
-      except(all_monitors.select { |monitor| monitor['id'].to_s == id.to_s }.first, BANLIST)
+      except(all_monitors.select { |monitor| monitor['id'].to_s == id.to_s }.first)
     end
 
-    def restore!; end
+    def initialize(options)
+      super(options)
+      @banlist = %w[overall_state overall_state_modified matching_downtimes modified].freeze
+    end
   end
 end

data/lib/datadog_backup/options.rb

@@ -42,5 +42,9 @@ module DatadogBackup
     def resources
       @options[:resources]
     end
+
+    def force_restore
+      @options[:force_restore]
+    end
   end
 end

data/lib/datadog_backup/thread_pool.rb

@@ -11,7 +11,7 @@ module DatadogBackup
 
     def self.watcher(logger)
       Thread.new(TPOOL) do |pool|
-        while pool.queue_length > 0
+        while pool.queue_length.positive?
           sleep 2
           logger.info("#{pool.queue_length} tasks remaining for execution.")
         end

data/lib/datadog_backup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogBackup
-  VERSION = '0.10.2'
+  VERSION = '1.0.0.alpha.2'
 end

data/spec/datadog_backup/cli_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 describe DatadogBackup::Cli do
+  let(:api_service_double) { double(Dogapi::APIService) }
   let(:client_double) { double }
   let(:tempdir) { Dir.mktmpdir }
   let(:options) do
@@ -18,10 +19,10 @@ describe DatadogBackup::Cli do
       resources: [DatadogBackup::Dashboards]
     }
   end
-  let(:cli) { DatadogBackup::Cli.new(options) }
+  let(:cli) { described_class.new(options) }
   let(:dashboards) { DatadogBackup::Dashboards.new(options) }
 
-  before(:example) do
+  before do
     allow(cli).to receive(:resource_instances).and_return([dashboards])
   end
 
@@ -38,13 +39,28 @@ describe DatadogBackup::Cli do
           }
         ]
       end
-      before(:example) do
+
+      before do
         dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/stillthere.json")
         dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/alsostillthere.json")
         dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/deleted.json")
 
-        allow(client_double).to receive(:get_all_boards).and_return(all_boards)
-        allow(client_double).to receive(:get_board).and_return(['200', {}])
+        allow(client_double).to receive(:instance_variable_get).with(:@dashboard_service).and_return(api_service_double)
+        allow(api_service_double).to receive(:request).with(Net::HTTP::Get,
+                                                            '/api/v1/dashboard',
+                                                            nil,
+                                                            nil,
+                                                            false).and_return(all_boards)
+        allow(api_service_double).to receive(:request).with(Net::HTTP::Get,
+                                                            '/api/v1/dashboard/stillthere',
+                                                            nil,
+                                                            nil,
+                                                            false).and_return(['200', {}])
+        allow(api_service_double).to receive(:request).with(Net::HTTP::Get,
+                                                            '/api/v1/dashboard/alsostillthere',
+                                                            nil,
+                                                            nil,
+                                                            false).and_return(['200', {}])
       end
 
       it 'deletes the file locally as well' do
@@ -55,16 +71,18 @@ describe DatadogBackup::Cli do
   end
 
   describe '#diffs' do
-    before(:example) do
+    subject { cli.diffs }
+
+    before do
       dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/diffs1.json")
       dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/diffs2.json")
       dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/diffs3.json")
       allow(dashboards).to receive(:get_by_id).and_return({ 'text' => 'diff2' })
       allow(cli).to receive(:initialize_client).and_return(client_double)
     end
-    subject { cli.diffs }
+
     it {
-      is_expected.to include(
+      expect(subject).to include(
         " ---\n id: diffs1\n ---\n-text: diff2\n+text: diff\n",
         " ---\n id: diffs3\n ---\n-text: diff2\n+text: diff\n",
         " ---\n id: diffs2\n ---\n-text: diff2\n+text: diff\n"
@@ -73,44 +91,46 @@ describe DatadogBackup::Cli do
   end
 
   describe '#restore' do
-    before(:example) do
+    subject { cli.restore }
+
+    before do
       dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/diffs1.json")
       allow(dashboards).to receive(:get_by_id).and_return({ 'text' => 'diff2' })
       allow(cli).to receive(:initialize_client).and_return(client_double)
     end
 
-    subject { cli.restore }
-
     example 'starts interactive restore' do
       allow($stdin).to receive(:gets).and_return('q')
-      begin
-        expect { subject }.to(
-          output(/\(r\)estore to Datadog, overwrite local changes and \(d\)ownload, \(s\)kip, or \(q\)uit\?/).to_stdout
-          .and(raise_error(SystemExit))
-        )
-      end
+
+      expect { subject }.to(
+        output(/\(r\)estore to Datadog, overwrite local changes and \(d\)ownload, \(s\)kip, or \(q\)uit\?/).to_stdout
+        .and(raise_error(SystemExit))
+      )
     end
 
     example 'restore' do
       allow($stdin).to receive(:gets).and_return('r')
-      expect(dashboards).to receive(:update_with_200).with('diffs1', { 'text' => 'diff' })
+      expect(dashboards).to receive(:update).with('diffs1', { 'text' => 'diff' })
       subject
     end
+
     example 'download' do
       allow($stdin).to receive(:gets).and_return('d')
       expect(dashboards).to receive(:write_file).with(%({\n  "text": "diff2"\n}), "#{tempdir}/dashboards/diffs1.json")
       subject
     end
+
     example 'skip' do
       allow($stdin).to receive(:gets).and_return('s')
-      expect(dashboards).to_not receive(:write_file)
-      expect(dashboards).to_not receive(:update)
+      expect(dashboards).not_to receive(:write_file)
+      expect(dashboards).not_to receive(:update)
       subject
     end
+
     example 'quit' do
       allow($stdin).to receive(:gets).and_return('q')
-      expect(dashboards).to_not receive(:write_file)
-      expect(dashboards).to_not receive(:update)
+      expect(dashboards).not_to receive(:write_file)
+      expect(dashboards).not_to receive(:update)
       expect { subject }.to raise_error(SystemExit)
     end
   end

data/spec/datadog_backup/core_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DatadogBackup::Core do
@@ -5,7 +7,7 @@ describe DatadogBackup::Core do
   let(:client_double) { double }
   let(:tempdir) { Dir.mktmpdir }
   let(:core) do
-    DatadogBackup::Core.new(
+    described_class.new(
       action: 'backup',
       api_service: api_service_double,
       client: client_double,
@@ -19,24 +21,19 @@ describe DatadogBackup::Core do
 
   describe '#client' do
     subject { core.client }
+
     it { is_expected.to eq client_double }
   end
 
-  describe '#client_with_200' do
-    subject { core.client_with_200(:get_all_boards) }
-
+  describe '#with_200' do
     context 'with 200' do
-      before(:example) do
-        allow(client_double).to receive(:get_all_boards).and_return(['200', { foo: :bar }])
-      end
+      subject { core.with_200 { ['200', { foo: :bar }] } }
 
       it { is_expected.to eq({ foo: :bar }) }
     end
 
     context 'with not 200' do
-      before(:example) do
-        allow(client_double).to receive(:get_all_boards).and_return(['401', {}])
-      end
+      subject { core.with_200 { ['400', 'Error message'] } }
 
       it 'raises an error' do
         expect { subject }.to raise_error(RuntimeError)
@@ -45,43 +42,33 @@ describe DatadogBackup::Core do
   end
 
   describe '#diff' do
-    before(:example) do
+    subject { core.diff('diff') }
+
+    before do
       allow(core).to receive(:get_by_id).and_return({ 'text' => 'diff1', 'extra' => 'diff1' })
       core.write_file('{"text": "diff2", "extra": "diff2"}', "#{tempdir}/core/diff.json")
     end
 
-    context 'without banlist' do
-      subject { core.diff('diff') }
-      it {
-        is_expected.to eq <<~EOF
-           ---
-          -extra: diff1
-          -text: diff1
-          +extra: diff2
-          +text: diff2
-        EOF
-      }
-    end
-
-    context 'with banlist' do
-      subject { core.diff('diff', ['extra']) }
-      it {
-        is_expected.to eq <<~EOF
-           ---
-          -text: diff1
-          +text: diff2
-        EOF
-      }
-    end
+    it {
+      expect(subject).to eq <<~EOF
+         ---
+        -extra: diff1
+        -text: diff1
+        +extra: diff2
+        +text: diff2
+      EOF
+    }
   end
 
   describe '#except' do
-    subject { core.except({ a: :b, b: :c }, [:b]) }
-    it { is_expected.to eq({ a: :b }) }
+    subject { core.except({ a: :b, b: :c }) }
+
+    it { is_expected.to eq({ a: :b, b: :c }) }
   end
 
   describe '#initialize' do
     subject { core }
+
     it 'makes the subdirectories' do
       expect(FileUtils).to receive(:mkdir_p).with("#{tempdir}/core")
       subject
@@ -90,18 +77,93 @@ describe DatadogBackup::Core do
 
   describe '#myclass' do
     subject { core.myclass }
+
     it { is_expected.to eq 'core' }
   end
 
+  describe '#create' do
+    subject { core.create({ 'a' => 'b' }) }
+
+    example 'it calls Dogapi::APIService.request' do
+      stub_const('Dogapi::APIService::API_VERSION', 'v1')
+      allow(core).to receive(:api_service).and_return(api_service_double)
+      allow(core).to receive(:api_version).and_return('v1')
+      allow(core).to receive(:api_resource_name).and_return('dashboard')
+      expect(api_service_double).to receive(:request).with(Net::HTTP::Post,
+                                                           '/api/v1/dashboard',
+                                                           nil,
+                                                           { 'a' => 'b' },
+                                                           true).and_return(['200', { 'id' => 'whatever-id-abc' }])
+      subject
+    end
+  end
+
   describe '#update' do
-    subject { core.update_with_200('abc-123-def', '{"a": "b"}') }
+    subject { core.update('abc-123-def', { 'a' => 'b' }) }
+
     example 'it calls Dogapi::APIService.request' do
       stub_const('Dogapi::APIService::API_VERSION', 'v1')
       allow(core).to receive(:api_service).and_return(api_service_double)
       allow(core).to receive(:api_version).and_return('v1')
       allow(core).to receive(:api_resource_name).and_return('dashboard')
-      expect(api_service_double).to receive(:request).with(Net::HTTP::Put, '/api/v1/dashboard/abc-123-def', nil, '{"a": "b"}', true).and_return(%w[200 Created])
+      expect(api_service_double).to receive(:request).with(Net::HTTP::Put,
+                                                           '/api/v1/dashboard/abc-123-def',
+                                                           nil,
+                                                           { 'a' => 'b' },
+                                                           true).and_return(['200', { 'id' => 'whatever-id-abc' }])
       subject
     end
   end
+
+  describe '#restore' do
+    before do
+      allow(core).to receive(:api_service).and_return(api_service_double)
+      allow(core).to receive(:api_version).and_return('api-version-string')
+      allow(core).to receive(:api_resource_name).and_return('api-resource-name-string')
+      allow(api_service_double).to receive(:request).with(Net::HTTP::Get,
+                                                          '/api/api-version-string/api-resource-name-string/abc-123-def',
+                                                          nil,
+                                                          nil,
+                                                          false).and_return(['200', { test: :ok }])
+      allow(api_service_double).to receive(:request).with(Net::HTTP::Get,
+                                                          '/api/api-version-string/api-resource-name-string/bad-123-id',
+                                                          nil,
+                                                          nil,
+                                                          false).and_return(['404', { error: :blahblah_not_found }])
+      allow(core).to receive(:load_from_file_by_id).and_return({ 'load' => 'ok' })
+    end
+
+    context 'when id exists' do
+      subject { core.restore('abc-123-def') }
+
+      example 'it calls out to update' do
+        expect(core).to receive(:update).with('abc-123-def', { 'load' => 'ok' })
+        subject
+      end
+    end
+
+    context 'when id does not exist' do
+      subject { core.restore('bad-123-id') }
+
+      before do
+        allow(api_service_double).to receive(:request).with(Net::HTTP::Put,
+                                                            '/api/api-version-string/api-resource-name-string/bad-123-id',
+                                                            nil, { 'load' => 'ok' },
+                                                            true).and_return(['404', { 'Error' => 'my not found' }])
+        allow(api_service_double).to receive(:request).with(Net::HTTP::Post,
+                                                            '/api/api-version-string/api-resource-name-string',
+                                                            nil,
+                                                            { 'load' => 'ok' },
+                                                            true).and_return(['200', { 'id' => 'my-new-id' }])
+      end
+
+      example 'it calls out to create then saves the new file and deletes the new file' do
+        expect(core).to receive(:create).with({ 'load' => 'ok' }).and_return({ 'id' => 'my-new-id' })
+        expect(core).to receive(:get_and_write_file).with('my-new-id')
+        allow(core).to receive(:find_file_by_id).with('bad-123-id').and_return('/path/to/bad-123-id.json')
+        expect(FileUtils).to receive(:rm).with('/path/to/bad-123-id.json')
+        subject
+      end
+    end
+  end
 end

data/spec/datadog_backup/dashboards_spec.rb

@@ -3,10 +3,11 @@
 require 'spec_helper'
 
 describe DatadogBackup::Dashboards do
+  let(:api_service_double) { double(Dogapi::APIService) }
   let(:client_double) { double }
   let(:tempdir) { Dir.mktmpdir }
   let(:dashboards) do
-    DatadogBackup::Dashboards.new(
+    described_class.new(
       action: 'backup',
       client: client_double,
       backup_dir: tempdir,
@@ -58,9 +59,13 @@ describe DatadogBackup::Dashboards do
       'title' => 'example dashboard'
     }
   end
-  before(:example) do
-    allow(client_double).to receive(:get_all_boards).and_return(all_boards)
-    allow(client_double).to receive(:get_board).and_return(example_dashboard)
+
+  before do
+    allow(client_double).to receive(:instance_variable_get).with(:@dashboard_service).and_return(api_service_double)
+    allow(api_service_double).to receive(:request).with(Net::HTTP::Get, '/api/v1/dashboard', nil, nil,
+                                                        false).and_return(all_boards)
+    allow(api_service_double).to receive(:request).with(Net::HTTP::Get, '/api/v1/dashboard/abc-123-def', nil, nil,
+                                                        false).and_return(example_dashboard)
   end
 
   describe '#backup' do
@@ -79,24 +84,38 @@ describe DatadogBackup::Dashboards do
   describe '#all_boards' do
     subject { dashboards.all_boards }
 
-    it 'calls get_all_boards' do
-      subject
-      expect(client_double).to have_received(:get_all_boards)
-    end
-
     it { is_expected.to eq [dashboard_description] }
   end
 
   describe '#diff' do
     it 'calls the api only once' do
       dashboards.write_file('{"a":"b"}', dashboards.filename('abc-123-def'))
-      dashboards.diff('abc-123-def')
-      expect(client_double).to have_received(:get_board).exactly(1).times
+      expect(dashboards.diff('abc-123-def')).to eq(<<~EOF
+         ---
+        -description: example dashboard
+        -graphs:
+        -- definition:
+        -    requests:
+        -    - q: min:foo.bar{a:b}
+        -      stacked: false
+        -    viz: timeseries
+        -  title: example graph
+        -title: example dashboard
+        +a: b
+      EOF
+                                                  )
     end
   end
 
+  describe '#except' do
+    subject { dashboards.except({ :a => :b, 'modified_at' => :c, 'url' => :d }) }
+
+    it { is_expected.to eq({ a: :b }) }
+  end
+
   describe '#get_by_id' do
     subject { dashboards.get_by_id('abc-123-def') }
+
     it { is_expected.to eq board_abc_123_def }
   end
 end

data/spec/datadog_backup/local_filesystem_spec.rb

@@ -27,55 +27,61 @@ describe DatadogBackup::LocalFilesystem do
   end
 
   describe '#all_files' do
-    before(:example) do
+    subject { core.all_files }
+
+    before do
       File.new("#{tempdir}/all_files.json", 'w')
     end
 
-    after(:example) do
+    after do
       FileUtils.rm "#{tempdir}/all_files.json"
     end
 
-    subject { core.all_files }
     it { is_expected.to eq(["#{tempdir}/all_files.json"]) }
   end
 
   describe '#all_file_ids_for_selected_resources' do
-    before(:example) do
+    subject { core.all_file_ids_for_selected_resources }
+
+    before do
       Dir.mkdir("#{tempdir}/dashboards")
       Dir.mkdir("#{tempdir}/monitors")
       File.new("#{tempdir}/dashboards/all_files.json", 'w')
       File.new("#{tempdir}/monitors/12345.json", 'w')
     end
 
-    after(:example) do
+    after do
       FileUtils.rm "#{tempdir}/dashboards/all_files.json"
       FileUtils.rm "#{tempdir}/monitors/12345.json"
     end
 
-    subject { core.all_file_ids_for_selected_resources }
     it { is_expected.to eq(['all_files']) }
   end
 
   describe '#class_from_id' do
-    before(:example) do
+    subject { core.class_from_id('abc-123-def') }
+
+    before do
       core.write_file('abc', "#{tempdir}/core/abc-123-def.json")
     end
 
-    after(:example) do
+    after do
       FileUtils.rm "#{tempdir}/core/abc-123-def.json"
     end
-    subject { core.class_from_id('abc-123-def') }
+
     it { is_expected.to eq DatadogBackup::Core }
   end
 
   describe '#dump' do
     context ':json' do
       subject { core.dump({ a: :b }) }
+
       it { is_expected.to eq(%({\n  "a": "b"\n})) }
     end
 
     context ':yaml' do
       subject { core_yaml.dump({ 'a' => 'b' }) }
+
       it { is_expected.to eq(%(---\na: b\n)) }
     end
   end
@@ -83,80 +89,94 @@ describe DatadogBackup::LocalFilesystem do
   describe '#filename' do
     context ':json' do
       subject { core.filename('abc-123-def') }
+
       it { is_expected.to eq("#{tempdir}/core/abc-123-def.json") }
     end
 
     context ':yaml' do
       subject { core_yaml.filename('abc-123-def') }
+
       it { is_expected.to eq("#{tempdir}/core/abc-123-def.yaml") }
     end
   end
 
   describe '#file_type' do
-    before(:example) do
+    subject { core.file_type("#{tempdir}/file_type.json") }
+
+    before do
       File.new("#{tempdir}/file_type.json", 'w')
     end
 
-    after(:example) do
+    after do
       FileUtils.rm "#{tempdir}/file_type.json"
     end
 
-    subject { core.file_type("#{tempdir}/file_type.json") }
     it { is_expected.to eq :json }
   end
 
   describe '#find_file_by_id' do
-    before(:example) do
+    subject { core.find_file_by_id('find_file') }
+
+    before do
       File.new("#{tempdir}/find_file.json", 'w')
     end
 
-    after(:example) do
+    after do
       FileUtils.rm "#{tempdir}/find_file.json"
     end
 
-    subject { core.find_file_by_id('find_file') }
     it { is_expected.to eq "#{tempdir}/find_file.json" }
   end
 
   describe '#load_from_file' do
     context ':json' do
       subject { core.load_from_file(%({\n  "a": "b"\n}), :json) }
+
       it { is_expected.to eq('a' => 'b') }
     end
 
     context ':yaml' do
       subject { core.load_from_file(%(---\na: b\n), :yaml) }
+
       it { is_expected.to eq('a' => 'b') }
     end
   end
 
   describe '#load_from_file_by_id' do
     context 'written in json read in yaml mode' do
-      before(:example) { core.write_file(%({"a": "b"}), "#{tempdir}/core/abc-123-def.json") }
-      after(:example) { FileUtils.rm "#{tempdir}/core/abc-123-def.json" }
-
       subject { core_yaml.load_from_file_by_id('abc-123-def') }
+
+      before { core.write_file(%({"a": "b"}), "#{tempdir}/core/abc-123-def.json") }
+
+      after { FileUtils.rm "#{tempdir}/core/abc-123-def.json" }
+
       it { is_expected.to eq('a' => 'b') }
     end
-    context 'written in yaml read in json mode' do
-      before(:example) { core.write_file(%(---\na: b), "#{tempdir}/core/abc-123-def.yaml") }
-      after(:example) { FileUtils.rm "#{tempdir}/core/abc-123-def.yaml" }
 
+    context 'written in yaml read in json mode' do
       subject { core.load_from_file_by_id('abc-123-def') }
+
+      before { core.write_file(%(---\na: b), "#{tempdir}/core/abc-123-def.yaml") }
+
+      after { FileUtils.rm "#{tempdir}/core/abc-123-def.yaml" }
+
       it { is_expected.to eq('a' => 'b') }
     end
 
     context 'Integer as parameter' do
-      before(:example) { core.write_file(%(---\na: b), "#{tempdir}/core/12345.yaml") }
-      after(:example) { FileUtils.rm "#{tempdir}/core/12345.yaml" }
-
       subject { core.load_from_file_by_id(12_345) }
+
+      before { core.write_file(%(---\na: b), "#{tempdir}/core/12345.yaml") }
+
+      after { FileUtils.rm "#{tempdir}/core/12345.yaml" }
+
       it { is_expected.to eq('a' => 'b') }
     end
   end
 
   describe '#write_file' do
     subject { core.write_file('abc123', "#{tempdir}/core/abc-123-def.json") }
+
     let(:file_like_object) { double }
 
     it 'writes a file to abc-123-def.json' do

data/spec/datadog_backup/monitors_spec.rb

@@ -3,10 +3,11 @@
 require 'spec_helper'
 
 describe DatadogBackup::Monitors do
+  let(:api_service_double) { double(Dogapi::APIService) }
   let(:client_double) { double }
   let(:tempdir) { Dir.mktmpdir }
   let(:monitors) do
-    DatadogBackup::Monitors.new(
+    described_class.new(
       action: 'backup',
       client: client_double,
       backup_dir: tempdir,
@@ -47,19 +48,18 @@ describe DatadogBackup::Monitors do
       monitor_description
     ]
   end
-  before(:example) do
-    allow(client_double).to receive(:get_all_monitors).and_return(all_monitors)
-    allow(client_double).to receive(:get_monitor).and_return(example_monitor)
+
+  before do
+    allow(client_double).to receive(:instance_variable_get).with(:@monitor_svc).and_return(api_service_double)
+    allow(api_service_double).to receive(:request).with(Net::HTTP::Get, '/api/v1/monitor', nil, nil,
+                                                        false).and_return(all_monitors)
+    allow(api_service_double).to receive(:request).with(Net::HTTP::Get, '/api/v1/dashboard/123455', nil, nil,
+                                                        false).and_return(example_monitor)
   end
 
   describe '#all_monitors' do
     subject { monitors.all_monitors }
 
-    it 'calls get_all_monitors' do
-      subject
-      expect(client_double).to have_received(:get_all_monitors)
-    end
-
     it { is_expected.to eq [monitor_description] }
   end
 
@@ -76,10 +76,10 @@ describe DatadogBackup::Monitors do
     end
   end
 
-  describe '#diff' do
+  describe '#diff and #except' do
     example 'it ignores `overall_state` and `overall_state_modified`' do
       monitors.write_file(monitors.dump(monitor_description), monitors.filename(123_455))
-      allow(client_double).to receive(:get_all_monitors).and_return(
+      allow(api_service_double).to receive(:request).and_return(
         [
           '200',
           [
@@ -88,8 +88,8 @@ describe DatadogBackup::Monitors do
               'message' => 'foo',
               'id' => 123_455,
               'name' => 'foo',
-              'overall_state' => 'NO DATA',
-              'overall_state_modified' => '2020-07-27T22:55:55+00:00'
+              'overall_state' => 'ZZZZZZZZZZZZZZZZZZZZZZZZZZZ',
+              'overall_state_modified' => '9999-07-27T22:55:55+00:00'
             }
           ]
         ]
@@ -103,16 +103,20 @@ describe DatadogBackup::Monitors do
 
   describe '#filename' do
     subject { monitors.filename(123_455) }
+
     it { is_expected.to eq("#{tempdir}/monitors/123455.json") }
   end
 
   describe '#get_by_id' do
     context 'Integer' do
       subject { monitors.get_by_id(123_455) }
+
       it { is_expected.to eq monitor_description }
     end
+
     context 'String' do
       subject { monitors.get_by_id('123455') }
+
       it { is_expected.to eq monitor_description }
     end
   end

data/spec/datadog_backup_bin_spec.rb

@@ -47,7 +47,7 @@ describe 'bin/datadog_backup' do
     it "dies unless given ENV[#{v}]" do
       ClimateControl.env[v] = nil
       _, status = run_bin('backup')
-      expect(status).to_not be_success
+      expect(status).not_to be_success
     end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
 
 require 'datadog_backup'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog_backup
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 1.0.0.alpha.2
 platform: ruby
 authors:
 - Kamran Farhadi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.42.0
+        version: 1.44.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.42.0
+        version: 1.44.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/rspec_and_release.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -183,9 +184,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: