datadog_backup 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24893d65b7350e2c22c2f1f89068664f9d4dd932231d292a26ae4b5f0c87a57
-  data.tar.gz: d7a3a5e175b128a3e11bf523d5fa8fbd9b3c890260a3e14bb74ba8688f0aef06
+  metadata.gz: 332899376b51dd8ad98dda7a3528b7a7c80ca8cbbd2c4bbe9c2cb9976a1c7024
+  data.tar.gz: 68b89a77b5148006b16388c7a93241ca50fcecb6bc4edc09ab36cf34a80d92e8
 SHA512:
-  metadata.gz: bd41dd652e26e9d049d25439c81b29a7be45da046526188bc77e0ffd2e06607e25044d10d78d72a0c35066c4b83919f2bcfb435136f9582240f11fcf035c13d6
-  data.tar.gz: 256dd9b0eb76878f7966a853a644c39aede938882781f13e5b7577db4e09f97600c57748858a75aebcff0cd0a3ca32e2a4358618bb0481eea5568469bb57abe8
+  metadata.gz: ab35b9e6a6152cc22ff3de7714ed60f2bca54c056a510d5726e5d33921a0f54d088195bfd7b992494545ccdfa8350e99e097c19155cfde4f7396049aeaad9650
+  data.tar.gz: 4f2f791146658c9a9e4185ef3bda43180a5ef46938dd6b2754aa493bcac9949f19a53f70b972a125ae51ad7b71f6f8c309767d83654e40a4d7d5f4be70e6c39c

data/.github/workflows/rspec_and_release.yml

@@ -35,7 +35,6 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.7
-        bundler-cache: true
     - name: Zip
       run : |
         zip -r datadog_backup.zip ./*
@@ -44,14 +43,10 @@ jobs:
       uses: cycjimmy/semantic-release-action@v3
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_TOKEN }}
       with:
         semantic_version: 17
         extra_plugins: |
           @semantic-release/changelog@5
           @semantic-release/git@9
-    - name: push to rubygems
-      if: ${{ steps.semantic.output.new_release_published }}
-      env:
-        GEM_HOST_API_KEY: ${{ secrets.RUBYGEMS_API_TOKEN }}
-      run: |
-        gem push datadog_backup.gem
+          semantic-release-rubygem@1

data/.gitignore

@@ -120,4 +120,6 @@ backup/
 
 .envrc
 
-.vscode
+.vscode
+spec/examples.txt
+

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [3.1.1](https://github.com/scribd/datadog_backup/compare/v3.1.0...v3.1.1) (2022-09-01)
+
+
+### Bug Fixes
+
+* catch SystemExit so that rspec can complete ([9eee0e5](https://github.com/scribd/datadog_backup/commit/9eee0e5c5ea857baeafcf3fbc0f1c8f3748b0ca8))
+* specify minimum ruby version in Gemfile ([c7f48f9](https://github.com/scribd/datadog_backup/commit/c7f48f95269a23549e28576434292d4ba1332d59))
+
+
+### Reverts
+
+* Revert "fix: specify minimum ruby version in Gemfile" ([e934ac2](https://github.com/scribd/datadog_backup/commit/e934ac2611c9bb557a181dd2f6f6b2678287773d))
+
 # [3.1.0](https://github.com/scribd/datadog_backup/compare/v3.0.0...v3.1.0) (2022-08-30)
 
 

data/lib/datadog_backup/dashboards.rb

@@ -2,23 +2,11 @@
 
 module DatadogBackup
   # Dashboards specific overrides for backup and restore.
-  class Dashboards < Core
+  class Dashboards < Resources
     def all
       get_all.fetch('dashboards')
     end
 
-    def api_version
-      'v1'
-    end
-
-    def api_resource_name
-      'dashboard'
-    end
-
-    def id_keyname
-      'id'
-    end
-
     def backup
       LOGGER.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
       futures = all.map do |dashboard|
@@ -38,5 +26,19 @@ module DatadogBackup
       super(options)
       @banlist = %w[modified_at url].freeze
     end
+
+    private
+
+    def api_version
+      'v1'
+    end
+
+    def api_resource_name
+      'dashboard'
+    end
+
+    def id_keyname
+      'id'
+    end
   end
 end

data/lib/datadog_backup/local_filesystem.rb

@@ -7,7 +7,7 @@ require 'deepsort'
 
 module DatadogBackup
   ##
-  # Meant to be mixed into DatadogBackup::Core
+  # Meant to be mixed into DatadogBackup::Resources
   # Relies on @options[:backup_dir] and @options[:output_format]
   module LocalFilesystem
     def all_files

data/lib/datadog_backup/monitors.rb

@@ -2,19 +2,11 @@
 
 module DatadogBackup
   # Monitor specific overrides for backup and restore.
-  class Monitors < Core
+  class Monitors < Resources
     def all
       get_all
     end
 
-    def api_version
-      'v1'
-    end
-
-    def api_resource_name
-      'monitor'
-    end
-
     def backup
       all.map do |monitor|
         id = monitor['id']
@@ -31,5 +23,15 @@ module DatadogBackup
       super(options)
       @banlist = %w[overall_state overall_state_modified matching_downtimes modified].freeze
     end
+
+    private
+
+    def api_version
+      'v1'
+    end
+
+    def api_resource_name
+      'monitor'
+    end
   end
 end

data/lib/datadog_backup/{core.rb → resources.rb}

@@ -8,53 +8,16 @@ require 'faraday/retry'
 module DatadogBackup
   # The default options for backing up and restores.
   # This base class is meant to be extended by specific resources, such as Dashboards, Monitors, and so on.
-  class Core
+  class Resources
     include ::DatadogBackup::LocalFilesystem
     include ::DatadogBackup::Options
 
-    @retry_options = {
+    RETRY_OPTIONS = {
       max: 5,
       interval: 0.05,
       interval_randomness: 0.5,
       backoff_factor: 2
-    }
-
-    def api_service
-      @api_service ||= Faraday.new(
-        url: api_url,
-        headers: {
-          'DD-API-KEY' => ENV.fetch('DD_API_KEY'),
-          'DD-APPLICATION-KEY' => ENV.fetch('DD_APP_KEY')
-        }
-      ) do |faraday|
-        faraday.request :json
-        faraday.request :retry, @retry_options
-        faraday.response(:logger, LOGGER, { headers: true, bodies: LOGGER.debug?, log_level: :debug }) do |logger|
-          logger.filter(/(DD-API-KEY:)([^&]+)/, '\1[REDACTED]')
-          logger.filter(/(DD-APPLICATION-KEY:)([^&]+)/, '\1[REDACTED]')
-        end
-        faraday.response :raise_error
-        faraday.response :json
-        faraday.adapter Faraday.default_adapter
-      end
-    end
-
-    def api_url
-      ENV.fetch('DD_SITE_URL', 'https://api.datadoghq.com/')
-    end
-
-    def api_version
-      raise 'subclass is expected to implement #api_version'
-    end
-
-    def api_resource_name
-      raise 'subclass is expected to implement #api_resource_name'
-    end
-
-    # Some resources have a different key for the id.
-    def id_keyname
-      'id'
-    end
+    }.freeze
 
     def backup
       raise 'subclass is expected to implement #backup'
@@ -166,6 +129,43 @@ module DatadogBackup
 
     private
 
+    def api_url
+      ENV.fetch('DD_SITE_URL', 'https://api.datadoghq.com/')
+    end
+
+    def api_version
+      raise 'subclass is expected to implement #api_version'
+    end
+
+    def api_resource_name
+      raise 'subclass is expected to implement #api_resource_name'
+    end
+
+    # Some resources have a different key for the id.
+    def id_keyname
+      'id'
+    end
+
+    def api_service
+      @api_service ||= Faraday.new(
+        url: api_url,
+        headers: {
+          'DD-API-KEY' => ENV.fetch('DD_API_KEY'),
+          'DD-APPLICATION-KEY' => ENV.fetch('DD_APP_KEY')
+        }
+      ) do |faraday|
+        faraday.request :json
+        faraday.request :retry, RETRY_OPTIONS
+        faraday.response(:logger, LOGGER, { headers: true, bodies: LOGGER.debug?, log_level: :debug }) do |logger|
+          logger.filter(/(DD-API-KEY:)([^&]+)/, '\1[REDACTED]')
+          logger.filter(/(DD-APPLICATION-KEY:)([^&]+)/, '\1[REDACTED]')
+        end
+        faraday.response :raise_error
+        faraday.response :json
+        faraday.adapter Faraday.default_adapter
+      end
+    end
+
     # Create a new resource in Datadog, then move the old file to the new resource's ID
     def create_newly(file_id, body)
       new_id = create(body).fetch(id_keyname)

data/lib/datadog_backup/synthetics.rb

@@ -2,28 +2,11 @@
 
 module DatadogBackup
   # Synthetic specific overrides for backup and restore.
-  class Synthetics < Core
+  class Synthetics < Resources
     def all
       get_all.fetch('tests')
     end
 
-    def api_version
-      'v1'
-    end
-
-    def api_resource_name(body = nil)
-      return 'synthetics/tests' if body.nil?
-      return 'synthetics/tests' if body['type'].nil?
-      return 'synthetics/tests/browser' if body['type'].to_s == 'browser'
-      return 'synthetics/tests/api' if body['type'].to_s == 'api'
-
-      raise "Unknown type #{body['type']}"
-    end
-
-    def id_keyname
-      'public_id'
-    end
-
     def backup
       all.map do |synthetic|
         id = synthetic[id_keyname]
@@ -62,5 +45,24 @@ module DatadogBackup
       @get_all = nil
       resbody
     end
+
+    private
+
+    def api_version
+      'v1'
+    end
+
+    def api_resource_name(body = nil)
+      return 'synthetics/tests' if body.nil?
+      return 'synthetics/tests' if body['type'].nil?
+      return 'synthetics/tests/browser' if body['type'].to_s == 'browser'
+      return 'synthetics/tests/api' if body['type'].to_s == 'api'
+
+      raise "Unknown type #{body['type']}"
+    end
+
+    def id_keyname
+      'public_id'
+    end
   end
 end

data/lib/datadog_backup/thread_pool.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DatadogBackup
-  # Used by CLI and Dashboards to size thread pool according to available CPU cores.
+  # Used by CLI and Dashboards to size thread pool according to available CPU resourcess.
   module ThreadPool
     TPOOL = ::Concurrent::ThreadPoolExecutor.new(
       min_threads: [2, Concurrent.processor_count].max,

data/lib/datadog_backup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogBackup
-  VERSION = '3.1.0'
+  VERSION = '3.1.1'
 end

data/lib/datadog_backup.rb

@@ -5,7 +5,7 @@ require 'concurrent'
 require_relative 'datadog_backup/local_filesystem'
 require_relative 'datadog_backup/options'
 require_relative 'datadog_backup/cli'
-require_relative 'datadog_backup/core'
+require_relative 'datadog_backup/resources'
 require_relative 'datadog_backup/dashboards'
 require_relative 'datadog_backup/monitors'
 require_relative 'datadog_backup/synthetics'

data/release.config.js

@@ -12,6 +12,12 @@ module.exports = {
         "changelogFile": "CHANGELOG.md"
       }
     ],
+    [
+      "semantic-release-rubygem",
+      {
+        "gemFileDir": "."
+      }
+    ],
     [
       "@semantic-release/git",
       {

data/spec/datadog_backup/cli_spec.rb

@@ -29,16 +29,14 @@ describe DatadogBackup::Cli do
   describe '#backup' do
     context 'when dashboards are deleted in datadog' do
       let(:all_dashboards) do
-        [
-          200,
-          {},
+        respond_with200(
           {
             'dashboards' => [
               { 'id' => 'stillthere' },
               { 'id' => 'alsostillthere' }
             ]
           }
-        ]
+        )
       end
 
       before do
@@ -60,8 +58,14 @@ describe DatadogBackup::Cli do
 
   describe '#restore' do
     subject(:restore) { cli.restore }
+    let(:stdin) { class_double('STDIN') }
 
+    after(:all) do
+      $stdin = STDIN
+    end
+    
     before do
+      $stdin = stdin
       dashboards.write_file('{"text": "diff"}', "#{tempdir}/dashboards/diffs1.json")
       allow(dashboards).to receive(:get_by_id).and_return({ 'text' => 'diff2' })
       allow(dashboards).to receive(:write_file)
@@ -69,7 +73,7 @@ describe DatadogBackup::Cli do
     end
 
     example 'starts interactive restore' do
-      allow($stdin).to receive(:gets).and_return('q')
+      allow(stdin).to receive(:gets).and_return('q')
 
       expect { restore }.to(
         output(/\(r\)estore to Datadog, overwrite local changes and \(d\)ownload, \(s\)kip, or \(q\)uit\?/).to_stdout
@@ -79,7 +83,7 @@ describe DatadogBackup::Cli do
 
     context 'when the user chooses to restore' do
       before do
-        allow($stdin).to receive(:gets).and_return('r')
+        allow(stdin).to receive(:gets).and_return('r')
       end
 
       example 'it restores from disk to server' do
@@ -90,7 +94,7 @@ describe DatadogBackup::Cli do
 
     context 'when the user chooses to download' do
       before do
-        allow($stdin).to receive(:gets).and_return('d')
+        allow(stdin).to receive(:gets).and_return('d')
       end
 
       example 'it writes from server to disk' do
@@ -101,7 +105,7 @@ describe DatadogBackup::Cli do
 
     context 'when the user chooses to skip' do
       before do
-        allow($stdin).to receive(:gets).and_return('s')
+        allow(stdin).to receive(:gets).and_return('s')
       end
 
       example 'it does not write to disk' do
@@ -117,7 +121,7 @@ describe DatadogBackup::Cli do
 
     context 'when the user chooses to quit' do
       before do
-        allow($stdin).to receive(:gets).and_return('q')
+        allow(stdin).to receive(:gets).and_return('q')
       end
 
       example 'it exits' do
@@ -126,11 +130,13 @@ describe DatadogBackup::Cli do
 
       example 'it does not write to disk' do
         restore
+      rescue SystemExit
         expect(dashboards).not_to have_received(:write_file)
       end
 
       example 'it does not update the server' do
         restore
+      rescue SystemExit
         expect(dashboards).not_to have_received(:update)
       end
     end

data/spec/datadog_backup/core_spec.rb

@@ -2,28 +2,28 @@
 
 require 'spec_helper'
 
-describe DatadogBackup::Core do
+describe DatadogBackup::Resources do
   let(:stubs) { Faraday::Adapter::Test::Stubs.new }
   let(:api_client_double) { Faraday.new { |f| f.adapter :test, stubs } }
   let(:tempdir) { Dir.mktmpdir }
-  let(:core) do
-    core = described_class.new(
+  let(:resources) do
+    resources = described_class.new(
       action: 'backup',
       backup_dir: tempdir,
       diff_format: nil,
       resources: [],
       output_format: :json
     )
-    allow(core).to receive(:api_service).and_return(api_client_double)
-    return core
+    allow(resources).to receive(:api_service).and_return(api_client_double)
+    return resources
   end
 
   describe '#diff' do
-    subject(:diff) { core.diff('diff') }
+    subject(:diff) { resources.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")
+      allow(resources).to receive(:get_by_id).and_return({ 'text' => 'diff1', 'extra' => 'diff1' })
+      resources.write_file('{"text": "diff2", "extra": "diff2"}', "#{tempdir}/resources/diff.json")
     end
 
     it {
@@ -39,34 +39,34 @@ describe DatadogBackup::Core do
   end
 
   describe '#except' do
-    subject { core.except({ a: :b, b: :c }) }
+    subject { resources.except({ a: :b, b: :c }) }
 
     it { is_expected.to eq({ a: :b, b: :c }) }
   end
 
   describe '#initialize' do
-    subject(:mycore) { core }
+    subject(:myresources) { resources }
 
     it 'makes the subdirectories' do
       fileutils = class_double(FileUtils).as_stubbed_const
       allow(fileutils).to receive(:mkdir_p)
-      mycore
-      expect(fileutils).to have_received(:mkdir_p).with("#{tempdir}/core")
+      myresources
+      expect(fileutils).to have_received(:mkdir_p).with("#{tempdir}/resources")
     end
   end
 
   describe '#myclass' do
-    subject { core.myclass }
+    subject { resources.myclass }
 
-    it { is_expected.to eq 'core' }
+    it { is_expected.to eq 'resources' }
   end
 
   describe '#create' do
-    subject(:create) { core.create({ 'a' => 'b' }) }
+    subject(:create) { resources.create({ 'a' => 'b' }) }
 
     example 'it will post /api/v1/dashboard' do
-      allow(core).to receive(:api_version).and_return('v1')
-      allow(core).to receive(:api_resource_name).and_return('dashboard')
+      allow(resources).to receive(:api_version).and_return('v1')
+      allow(resources).to receive(:api_resource_name).and_return('dashboard')
       stubs.post('/api/v1/dashboard', { 'a' => 'b' }) {  respond_with200({ 'id' => 'whatever-id-abc' }) }
       create
       stubs.verify_stubbed_calls
@@ -74,11 +74,11 @@ describe DatadogBackup::Core do
   end
 
   describe '#update' do
-    subject(:update) { core.update('abc-123-def', { 'a' => 'b' }) }
+    subject(:update) { resources.update('abc-123-def', { 'a' => 'b' }) }
 
     example 'it puts /api/v1/dashboard' do
-      allow(core).to receive(:api_version).and_return('v1')
-      allow(core).to receive(:api_resource_name).and_return('dashboard')
+      allow(resources).to receive(:api_version).and_return('v1')
+      allow(resources).to receive(:api_resource_name).and_return('dashboard')
       stubs.put('/api/v1/dashboard/abc-123-def', { 'a' => 'b' }) { respond_with200({ 'id' => 'whatever-id-abc' }) }
       update
       stubs.verify_stubbed_calls
@@ -86,8 +86,8 @@ describe DatadogBackup::Core do
 
     context 'when the id is not found' do
       before do
-        allow(core).to receive(:api_version).and_return('v1')
-        allow(core).to receive(:api_resource_name).and_return('dashboard')
+        allow(resources).to receive(:api_version).and_return('v1')
+        allow(resources).to receive(:api_resource_name).and_return('dashboard')
         stubs.put('/api/v1/dashboard/abc-123-def', { 'a' => 'b' }) { [404, {}, { 'id' => 'whatever-id-abc' }] }
       end
 
@@ -99,32 +99,32 @@ describe DatadogBackup::Core do
 
   describe '#restore' do
     before do
-      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(resources).to receive(:api_version).and_return('api-version-string')
+      allow(resources).to receive(:api_resource_name).and_return('api-resource-name-string')
       stubs.get('/api/api-version-string/api-resource-name-string/abc-123-def') { respond_with200({ 'test' => 'ok' }) }
       stubs.get('/api/api-version-string/api-resource-name-string/bad-123-id') do
         [404, {}, { 'error' => 'blahblah_not_found' }]
       end
-      allow(core).to receive(:load_from_file_by_id).and_return({ 'load' => 'ok' })
+      allow(resources).to receive(:load_from_file_by_id).and_return({ 'load' => 'ok' })
     end
 
     context 'when id exists' do
-      subject(:restore) { core.restore('abc-123-def') }
+      subject(:restore) { resources.restore('abc-123-def') }
 
       example 'it calls out to update' do
-        allow(core).to receive(:update)
+        allow(resources).to receive(:update)
         restore
-        expect(core).to have_received(:update).with('abc-123-def', { 'load' => 'ok' })
+        expect(resources).to have_received(:update).with('abc-123-def', { 'load' => 'ok' })
       end
     end
 
     context 'when id does not exist on remote' do
-      subject(:restore_newly) { core.restore('bad-123-id') }
+      subject(:restore_newly) { resources.restore('bad-123-id') }
 
       let(:fileutils) { class_double(FileUtils).as_stubbed_const }
 
       before do
-        allow(core).to receive(:load_from_file_by_id).and_return({ 'load' => 'ok' })
+        allow(resources).to receive(:load_from_file_by_id).and_return({ 'load' => 'ok' })
         stubs.put('/api/api-version-string/api-resource-name-string/bad-123-id') do
           [404, {}, { 'error' => 'id not found' }]
         end
@@ -132,19 +132,19 @@ describe DatadogBackup::Core do
           respond_with200({ 'id' => 'my-new-id' })
         end
         allow(fileutils).to receive(:rm)
-        allow(core).to receive(:create).with({ 'load' => 'ok' }).and_return({ 'id' => 'my-new-id' })
-        allow(core).to receive(:get_and_write_file)
-        allow(core).to receive(:find_file_by_id).with('bad-123-id').and_return('/path/to/bad-123-id.json')
+        allow(resources).to receive(:create).with({ 'load' => 'ok' }).and_return({ 'id' => 'my-new-id' })
+        allow(resources).to receive(:get_and_write_file)
+        allow(resources).to receive(:find_file_by_id).with('bad-123-id').and_return('/path/to/bad-123-id.json')
       end
 
       example 'it calls out to create' do
         restore_newly
-        expect(core).to have_received(:create).with({ 'load' => 'ok' })
+        expect(resources).to have_received(:create).with({ 'load' => 'ok' })
       end
 
       example 'it saves the new file' do
         restore_newly
-        expect(core).to have_received(:get_and_write_file).with('my-new-id')
+        expect(resources).to have_received(:get_and_write_file).with('my-new-id')
       end
 
       example 'it deletes the old file' do

data/spec/datadog_backup/local_filesystem_spec.rb

@@ -4,16 +4,16 @@ require 'spec_helper'
 
 describe DatadogBackup::LocalFilesystem do
   let(:tempdir) { Dir.mktmpdir }
-  let(:core) do
-    DatadogBackup::Core.new(
+  let(:resources) do
+    DatadogBackup::Resources.new(
       action: 'backup',
       backup_dir: tempdir,
       resources: [DatadogBackup::Dashboards],
       output_format: :json
     )
   end
-  let(:core_yaml) do
-    DatadogBackup::Core.new(
+  let(:resources_yaml) do
+    DatadogBackup::Resources.new(
       action: 'backup',
       backup_dir: tempdir,
       resources: [],
@@ -22,7 +22,7 @@ describe DatadogBackup::LocalFilesystem do
   end
 
   describe '#all_files' do
-    subject { core.all_files }
+    subject { resources.all_files }
 
     before do
       File.new("#{tempdir}/all_files.json", 'w')
@@ -36,7 +36,7 @@ describe DatadogBackup::LocalFilesystem do
   end
 
   describe '#all_file_ids_for_selected_resources' do
-    subject { core.all_file_ids_for_selected_resources }
+    subject { resources.all_file_ids_for_selected_resources }
 
     before do
       Dir.mkdir("#{tempdir}/dashboards")
@@ -54,28 +54,28 @@ describe DatadogBackup::LocalFilesystem do
   end
 
   describe '#class_from_id' do
-    subject { core.class_from_id('abc-123-def') }
+    subject { resources.class_from_id('abc-123-def') }
 
     before do
-      core.write_file('abc', "#{tempdir}/core/abc-123-def.json")
+      resources.write_file('abc', "#{tempdir}/resources/abc-123-def.json")
     end
 
     after do
-      FileUtils.rm "#{tempdir}/core/abc-123-def.json"
+      FileUtils.rm "#{tempdir}/resources/abc-123-def.json"
     end
 
-    it { is_expected.to eq DatadogBackup::Core }
+    it { is_expected.to eq DatadogBackup::Resources }
   end
 
   describe '#dump' do
     context 'when mode is :json' do
-      subject { core.dump({ a: :b }) }
+      subject { resources.dump({ a: :b }) }
 
       it { is_expected.to eq(%({\n  "a": "b"\n})) }
     end
 
     context 'when mode is :yaml' do
-      subject { core_yaml.dump({ 'a' => 'b' }) }
+      subject { resources_yaml.dump({ 'a' => 'b' }) }
 
       it { is_expected.to eq(%(---\na: b\n)) }
     end
@@ -83,20 +83,20 @@ describe DatadogBackup::LocalFilesystem do
 
   describe '#filename' do
     context 'when mode is :json' do
-      subject { core.filename('abc-123-def') }
+      subject { resources.filename('abc-123-def') }
 
-      it { is_expected.to eq("#{tempdir}/core/abc-123-def.json") }
+      it { is_expected.to eq("#{tempdir}/resources/abc-123-def.json") }
     end
 
     context 'when mode is :yaml' do
-      subject { core_yaml.filename('abc-123-def') }
+      subject { resources_yaml.filename('abc-123-def') }
 
-      it { is_expected.to eq("#{tempdir}/core/abc-123-def.yaml") }
+      it { is_expected.to eq("#{tempdir}/resources/abc-123-def.yaml") }
     end
   end
 
   describe '#file_type' do
-    subject { core.file_type("#{tempdir}/file_type.json") }
+    subject { resources.file_type("#{tempdir}/file_type.json") }
 
     before do
       File.new("#{tempdir}/file_type.json", 'w')
@@ -110,7 +110,7 @@ describe DatadogBackup::LocalFilesystem do
   end
 
   describe '#find_file_by_id' do
-    subject { core.find_file_by_id('find_file') }
+    subject { resources.find_file_by_id('find_file') }
 
     before do
       File.new("#{tempdir}/find_file.json", 'w')
@@ -125,13 +125,13 @@ describe DatadogBackup::LocalFilesystem do
 
   describe '#load_from_file' do
     context 'when mode is :json' do
-      subject { core.load_from_file(%({\n  "a": "b"\n}), :json) }
+      subject { resources.load_from_file(%({\n  "a": "b"\n}), :json) }
 
       it { is_expected.to eq('a' => 'b') }
     end
 
     context 'when mode is :yaml' do
-      subject { core.load_from_file(%(---\na: b\n), :yaml) }
+      subject { resources.load_from_file(%(---\na: b\n), :yaml) }
 
       it { is_expected.to eq('a' => 'b') }
     end
@@ -139,44 +139,44 @@ describe DatadogBackup::LocalFilesystem do
 
   describe '#load_from_file_by_id' do
     context 'when the backup is in json but the mode is :yaml' do
-      subject { core_yaml.load_from_file_by_id('abc-123-def') }
+      subject { resources_yaml.load_from_file_by_id('abc-123-def') }
 
-      before { core.write_file(%({"a": "b"}), "#{tempdir}/core/abc-123-def.json") }
+      before { resources.write_file(%({"a": "b"}), "#{tempdir}/resources/abc-123-def.json") }
 
-      after { FileUtils.rm "#{tempdir}/core/abc-123-def.json" }
+      after { FileUtils.rm "#{tempdir}/resources/abc-123-def.json" }
 
       it { is_expected.to eq('a' => 'b') }
     end
 
     context 'when the backup is in yaml but the mode is :json' do
-      subject { core.load_from_file_by_id('abc-123-def') }
+      subject { resources.load_from_file_by_id('abc-123-def') }
 
-      before { core.write_file(%(---\na: b), "#{tempdir}/core/abc-123-def.yaml") }
+      before { resources.write_file(%(---\na: b), "#{tempdir}/resources/abc-123-def.yaml") }
 
-      after { FileUtils.rm "#{tempdir}/core/abc-123-def.yaml" }
+      after { FileUtils.rm "#{tempdir}/resources/abc-123-def.yaml" }
 
       it { is_expected.to eq('a' => 'b') }
     end
 
     context 'with Integer as parameter' do
-      subject { core.load_from_file_by_id(12_345) }
+      subject { resources.load_from_file_by_id(12_345) }
 
-      before { core.write_file(%(---\na: b), "#{tempdir}/core/12345.yaml") }
+      before { resources.write_file(%(---\na: b), "#{tempdir}/resources/12345.yaml") }
 
-      after { FileUtils.rm "#{tempdir}/core/12345.yaml" }
+      after { FileUtils.rm "#{tempdir}/resources/12345.yaml" }
 
       it { is_expected.to eq('a' => 'b') }
     end
   end
 
   describe '#write_file' do
-    subject(:write_file) { core.write_file('abc123', "#{tempdir}/core/abc-123-def.json") }
+    subject(:write_file) { resources.write_file('abc123', "#{tempdir}/resources/abc-123-def.json") }
 
     let(:file_like_object) { instance_double(File) }
 
     it 'writes a file to abc-123-def.json' do
       allow(File).to receive(:open).and_call_original
-      allow(File).to receive(:open).with("#{tempdir}/core/abc-123-def.json", 'w').and_return(file_like_object)
+      allow(File).to receive(:open).with("#{tempdir}/resources/abc-123-def.json", 'w').and_return(file_like_object)
       allow(file_like_object).to receive(:write)
       allow(file_like_object).to receive(:close)
 

data/spec/datadog_backup/synthetics_spec.rb

@@ -136,7 +136,7 @@ describe DatadogBackup::Synthetics do
     end
   end
 
-  describe '#diff' do # TODO: migrate to core_spec.rb, since #diff is not defined here.
+  describe '#diff' do # TODO: migrate to resources_spec.rb, since #diff is not defined here.
     subject { synthetics.diff('abc-123-def') }
 
     before do

data/spec/spec_helper.rb

@@ -15,16 +15,62 @@ SPEC_ROOT = __dir__
 WORK_ROOT = File.expand_path(File.join(SPEC_ROOT, '..'))
 
 RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
   config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
   config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
 
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Allows RSpec to persist some state between runs in order to support
+  # the `--only-failures` and `--next-failure` CLI options. We recommend
+  # you configure your source control system to ignore this file.
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  # https://relishapp.com/rspec/rspec-core/docs/configuration/zero-monkey-patching-mode
+  config.disable_monkey_patching!
 
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
   if config.files_to_run.one?
     # Use the documentation formatter for detailed output,
     # unless a formatter has already been configured
@@ -32,9 +78,25 @@ RSpec.configure do |config|
     config.default_formatter = 'doc'
   end
 
-  config.example_status_persistence_file_path = File.join(SPEC_ROOT, 'helpers', 'failures.txt')
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
 
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
   Kernel.srand config.seed
+
+  # Make RSpec available throughout the rspec unit test suite
+  config.expose_dsl_globally = true
 end
 
 def respond_with200(body)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog_backup
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Kamran Farhadi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -210,7 +210,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -224,12 +223,12 @@ files:
 - images/demo.yml
 - lib/datadog_backup.rb
 - lib/datadog_backup/cli.rb
-- lib/datadog_backup/core.rb
 - lib/datadog_backup/dashboards.rb
 - lib/datadog_backup/deprecations.rb
 - lib/datadog_backup/local_filesystem.rb
 - lib/datadog_backup/monitors.rb
 - lib/datadog_backup/options.rb
+- lib/datadog_backup/resources.rb
 - lib/datadog_backup/synthetics.rb
 - lib/datadog_backup/thread_pool.rb
 - lib/datadog_backup/version.rb

data/Gemfile.lock

@@ -1,118 +0,0 @@
-PATH
-  remote: .
-  specs:
-    datadog_backup (3.0.0)
-      amazing_print
-      concurrent-ruby
-      deepsort
-      diffy
-      faraday
-      faraday-retry
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    amazing_print (1.4.0)
-    ast (2.4.2)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    deepsort (0.4.5)
-    diff-lcs (1.5.0)
-    diffy (3.4.2)
-    faraday (2.5.2)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.0)
-    faraday-retry (2.0.0)
-      faraday (~> 2.0)
-    ffi (1.15.5)
-    formatador (1.1.0)
-    guard (2.18.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.13.0)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    json (2.6.2)
-    listen (3.7.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.8)
-    method_source (1.0.0)
-    nenv (0.3.0)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.22.1)
-    parser (3.1.2.1)
-      ast (~> 2.4.1)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    rainbow (3.1.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.35.1)
-      json (~> 2.3)
-      parallel (~> 1.10)
-      parser (>= 3.1.2.1)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    shellany (0.0.1)
-    thor (1.2.1)
-    unicode-display_width (2.2.0)
-
-PLATFORMS
-  ruby
-  x86_64-linux
-
-DEPENDENCIES
-  bundler
-  datadog_backup!
-  guard-rspec
-  pry
-  pry-byebug
-  rspec
-  rubocop
-  rubocop-rspec
-
-BUNDLED WITH
-   2.3.20