datadog_backup 0.11.0.alpha.1 → 1.0.1.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3894769e0beaf7ceec6916b814ee5178cea0676e1f449c0871e290f7e15b1186
-  data.tar.gz: 27f904e921aed4cb494ca269f4537ce3c6ca8547427d6d8399448f6d219a085a
+  metadata.gz: 24038b9209cab6ebe03f9f7f4d90aa102824a415fb80bc043c7e04694b0ea52c
+  data.tar.gz: 4372fa6964f6d08285b16d38ba5d934c37d12ac7cb7328af22f56b1ade996f7b
 SHA512:
-  metadata.gz: 0ac749ca73299279b3997ab4b144938e6b49f267f432e96b40b8afcc88546ba24fd841aa770778bf6b82953be10f534db1d7842a46a05b8addfe91961fa5c59e
-  data.tar.gz: 4bbece6af403febc4ef2d0f8f269fd176efb25da0684e486576d14d50d4d3640fc2ac1aaed37b50221d665c44dd993daef5342d6158c74ec674194665316e694
+  metadata.gz: 92f24e24cb04743e02b65a12cd1a500b2398ed5323cb482ce0a32538513100a7d451a23d71979c7fda14c4ef7b8f1466290fc571a416e9dec4b5f1847c09d015
+  data.tar.gz: 1c84a2c4390e66ba48ff593638fffcaba9a94442c7a1775ec073380b30160ab5304eb4ad58d5265f1d3983abc331732849a64df28f271d509a3a347c99f9b652

data/.github/dependabot.yml

@@ -9,6 +9,10 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    commit_message:
+      prefix: "deps"
+      prefix_development: "chore"
+      include_scope: true
   - package-ecosystem: "github-actions"
     directory: "/" # Location of package manifests
     schedule:

data/.github/workflows/rspec_and_release.yml

@@ -8,35 +8,30 @@ on:
 jobs:
   rspec:
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby 2.7.2
-      uses: actions/setup-ruby@v1.1.2
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.2
+        ruby-version: 2.7
+        bundler-cache: true
     - name: Test with Rspec
       run: |
-          gem install --no-document bundler
-          bundle install --jobs 4 --retry 3
           bundle exec rspec --format documentation
   release:
     if: github.event_name == 'push'
     needs: rspec
     runs-on: ubuntu-latest
-
+    env:
+      BUNDLE_WITHOUT: "development:test"
+      BUNDLE_DEPLOYMENT: "true"
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby 2.7.2
-      uses: actions/setup-ruby@v1.1.2
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7.2
-    - name: Build with bundler
-      run: |
-          gem install --no-document bundler
-          bundle config set deployment 'true'
-          bundle config set without 'development test'
-          bundle install --jobs 4 --retry 3
+        ruby-version: 2.7
+        bundler-cache: true
     - name: Zip
       run : |
         zip -r datadog_backup.zip ./*

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -1,9 +1,36 @@
-# [0.11.0-alpha.1](https://github.com/scribd/datadog_backup/compare/v0.10.2...v0.11.0-alpha.1) (2020-11-24)
+## [1.0.1-alpha.1](https://github.com/scribd/datadog_backup/compare/v1.0.0...v1.0.1-alpha.1) (2021-03-10)
+
+# [1.0.0](https://github.com/scribd/datadog_backup/compare/v0.11.0...v1.0.0) (2021-03-02)
+
+
+### Bug Fixes
+
+* handle gets with no result ([8d016a1](https://github.com/scribd/datadog_backup/commit/8d016a1858b44d374a0dff121c71340bf18062e0))
 
 
 ### Features
 
-* trigger release ([8865cad](https://github.com/scribd/datadog_backup/commit/8865cad798e2b8665a451ba76f62220b4dd2030f))
+* If resource doesn't exist in Datadog, the resource is recreated. ([18ba241](https://github.com/scribd/datadog_backup/commit/18ba24183e136f9d899351bbb0999aba2c22308f))
+
+
+### 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/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

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'amazing_print', '1.2.2'
-  spec.add_dependency 'concurrent-ruby', '1.1.7'
+  spec.add_dependency 'amazing_print', '1.3.0'
+  spec.add_dependency 'concurrent-ruby', '1.1.8'
   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.45.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'

data/lib/datadog_backup/cli.rb

@@ -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(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

@@ -47,6 +47,9 @@ module DatadogBackup
       with_200 do
         api_service.request(Net::HTTP::Get, "/api/#{api_version}/#{api_resource_name}/#{id}", nil, nil, false)
       end
+    rescue RuntimeError => e
+      return {} if e.message.include?('Request failed with error ["404"')
+      raise e.message
     end
 
     def get_all
@@ -73,12 +76,38 @@ module DatadogBackup
       self.class.to_s.split(':').last.downcase
     end
 
+    # 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)
-      with_200 do
+      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
+
+    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
@@ -94,9 +123,8 @@ module DatadogBackup
         sleep(0.1 * retries**5) # 0.1, 3.2, 24.3, 102.4 seconds per retry
         retry
       else
-        raise "Request failed with error #{e.message}"
+        raise "Net::OpenTimeout: #{e.message}"
       end
     end
-
   end
 end

data/lib/datadog_backup/monitors.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DatadogBackup
-  class Monitors < Core    
+  class Monitors < Core
     def all_monitors
       @all_monitors ||= get_all
     end
@@ -27,7 +27,8 @@ module DatadogBackup
     end
 
     def get_by_id(id)
-      except(all_monitors.select { |monitor| monitor['id'].to_s == id.to_s }.first)
+      monitor = all_monitors.select { |monitor| monitor['id'].to_s == id.to_s }.first
+      monitor.nil? ? {} : except(monitor)
     end
 
     def initialize(options)

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogBackup
-  VERSION = '0.11.0.alpha.1'
+  VERSION = '1.0.1.alpha.1'
 end

data/release.config.js

@@ -1,6 +1,13 @@
 module.exports = {
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    [
+      "@semantic-release/commit-analyzer",
+      {
+        "releaseRules": [
+          {"type": "deps", "release": "patch"}
+        ]
+      }
+    ],
     "@semantic-release/release-notes-generator",
     [
       "@semantic-release/changelog",

data/spec/datadog_backup/cli_spec.rb

@@ -19,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
 
@@ -39,15 +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(: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', {}])
+        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
@@ -58,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"
@@ -76,14 +91,14 @@ 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')
 
@@ -98,21 +113,24 @@ describe DatadogBackup::Cli do
       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

@@ -7,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,
@@ -21,18 +21,19 @@ describe DatadogBackup::Core do
 
   describe '#client' do
     subject { core.client }
+
     it { is_expected.to eq client_double }
   end
 
   describe '#with_200' do
     context 'with 200' do
-      subject { core.with_200 {['200', { foo: :bar }]} }
+      subject { core.with_200 { ['200', { foo: :bar }] } }
 
       it { is_expected.to eq({ foo: :bar }) }
     end
 
     context 'with not 200' do
-      subject { core.with_200 {['400', "Error message"]} }
+      subject { core.with_200 { ['400', 'Error message'] } }
 
       it 'raises an error' do
         expect { subject }.to raise_error(RuntimeError)
@@ -41,14 +42,15 @@ 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
 
-    subject { core.diff('diff') }
     it {
-      is_expected.to eq <<~EOF
+      expect(subject).to eq <<~EOF
          ---
         -extra: diff1
         -text: diff1
@@ -60,11 +62,13 @@ describe DatadogBackup::Core do
 
   describe '#except' do
     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
@@ -73,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('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

@@ -7,7 +7,7 @@ describe DatadogBackup::Dashboards do
   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,
@@ -59,10 +59,13 @@ describe DatadogBackup::Dashboards do
       'title' => 'example dashboard'
     }
   end
-  before(:example) do
+
+  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)
+    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
@@ -100,17 +103,19 @@ describe DatadogBackup::Dashboards do
         -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

@@ -7,7 +7,7 @@ describe DatadogBackup::Monitors do
   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,
@@ -49,14 +49,17 @@ describe DatadogBackup::Monitors do
     ]
   end
 
-  before(:example) do
+  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)
+    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 { is_expected.to eq [monitor_description] }
   end
 
@@ -100,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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog_backup
 version: !ruby/object:Gem::Version
-  version: 0.11.0.alpha.1
+  version: 1.0.1.alpha.1
 platform: ruby
 authors:
 - Kamran Farhadi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.7
+        version: 1.1.8
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby-edge
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.42.0
+        version: 1.45.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.42.0
+        version: 1.45.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