datadog_backup 3.0.0.alpha.2 → 3.1.1

data/spec/datadog_backup_bin_spec.rb

@@ -3,20 +3,15 @@
 require 'open3'
 require 'timeout'
 
-describe 'bin/datadog_backup' do
+describe 'bin/datadog_backup' do # rubocop:disable RSpec/DescribeClass
   # Contract Or[nil,String] => self
-  def run_bin(args = '', input = nil)
+  def run_bin(env = {}, args = '')
     status = nil
     output = ''
     cmd = "bin/datadog_backup #{args}"
-    Open3.popen2e(cmd) do |i, oe, t|
+    Open3.popen2e(env, cmd) do |_i, oe, t|
       pid = t.pid
 
-      if input
-        i.puts input
-        i.close
-      end
-
       Timeout.timeout(4.0) do
         oe.each do |v|
           output += v
@@ -43,16 +38,23 @@ describe 'bin/datadog_backup' do
 
   required_vars.map do |v|
     it "dies unless given ENV[#{v}]" do
-      stub_const('ENV', env.dup.tap { |h| h.delete(v) })
-      _, status = run_bin('backup')
+      myenv = env.dup.tap { |h| h.delete(v) }
+      _, status = run_bin(myenv, 'backup')
       expect(status).not_to be_success
     end
   end
 
-  it 'supplies help' do
-    stub_const('ENV', env)
-    out_err, status = run_bin('--help')
-    expect(out_err).to match(/Usage: DD_API_KEY=/)
-    expect(status).to be_success
+  describe 'help' do
+    subject(:bin) { run_bin(env, '--help') }
+
+    it 'prints usage' do
+      out_err, _status = bin
+      expect(out_err).to match(/Usage: DD_API_KEY=/)
+    end
+
+    it 'exits cleanly' do
+      _out_err, status = bin
+      expect(status).to be_success
+    end
   end
 end

data/spec/spec_helper.rb

@@ -11,22 +11,66 @@ $stdout = File.new('/dev/null', 'w+')
 require 'tmpdir'
 require 'datadog_backup'
 
-
-
 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
@@ -34,7 +78,27 @@ 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)
+  [200, {}, body]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog_backup
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.2
+  version: 3.1.1
 platform: ruby
 authors:
 - Kamran Farhadi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -110,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +138,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -210,7 +210,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -224,12 +223,13 @@ 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
 - release.config.js
@@ -239,13 +239,14 @@ files:
 - spec/datadog_backup/deprecations_spec.rb
 - spec/datadog_backup/local_filesystem_spec.rb
 - spec/datadog_backup/monitors_spec.rb
+- spec/datadog_backup/synthetics_spec.rb
 - spec/datadog_backup_bin_spec.rb
-- spec/datadog_backup_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/scribd/datadog_backup
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -257,21 +258,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A utility to backup and restore Datadog accounts
-test_files:
-- spec/datadog_backup/cli_spec.rb
-- spec/datadog_backup/core_spec.rb
-- spec/datadog_backup/dashboards_spec.rb
-- spec/datadog_backup/deprecations_spec.rb
-- spec/datadog_backup/local_filesystem_spec.rb
-- spec/datadog_backup/monitors_spec.rb
-- spec/datadog_backup_bin_spec.rb
-- spec/datadog_backup_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/Gemfile.lock

@@ -1,118 +0,0 @@
-PATH
-  remote: .
-  specs:
-    datadog_backup (3.0.0.alpha.1)
-      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.1)
-    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

data/lib/datadog_backup/core.rb

@@ -1,148 +0,0 @@
-# frozen_string_literal: true
-
-require 'diffy'
-require 'deepsort'
-require 'faraday'
-require 'faraday/retry'
-
-
-
-module DatadogBackup
-  class Core
-    include ::DatadogBackup::LocalFilesystem
-    include ::DatadogBackup::Options
-
-    @@retry_options = {
-      max: 5,
-      interval: 0.05,
-      interval_randomness: 0.5,
-      backoff_factor: 2
-    }
-
-    def api_service
-      conn ||= 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
-
-    def backup
-      raise 'subclass is expected to implement #backup'
-    end
-
-    # Returns the diffy diff.
-    # Optionally, supply an array of keys to remove from comparison
-    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)
-      hash.tap do # tap returns self
-        @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)
-      params = {}
-      headers = {}
-      response = api_service.get("/api/#{api_version}/#{api_resource_name}/#{id}", params, headers)
-      body_with_2xx(response)
-    end
-
-    def get_all
-      params = {}
-      headers = {}
-      response = api_service.get("/api/#{api_version}/#{api_resource_name}", params, headers)
-      body_with_2xx(response)
-    end
-
-    def get_and_write_file(id)
-      write_file(dump(get_by_id(id)), filename(id))
-    end
-
-    def get_by_id(id)
-      except(get(id))
-    end
-
-    def initialize(options)
-      @options = options
-      @banlist = []
-      ::FileUtils.mkdir_p(mydir)
-    end
-
-    def myclass
-      self.class.to_s.split(':').last.downcase
-    end
-
-    # Calls out to Datadog and checks for a '200' response
-    def create(body)
-      headers = {}
-      response =  api_service.post("/api/#{api_version}/#{api_resource_name}", body, headers)
-      body = body_with_2xx(response)
-      LOGGER.warn "Successfully created #{body.fetch('id')} in datadog."
-      body
-    end
-
-    # Calls out to Datadog and checks for a '200' response
-    def update(id, body)
-      headers = {}
-      response = api_service.put("/api/#{api_version}/#{api_resource_name}/#{id}", body, headers)
-      body = body_with_2xx(response)
-      LOGGER.warn 'Successfully restored #{id} to datadog.'
-      body
-    end
-
-    def restore(id)
-      body = load_from_file_by_id(id)
-      begin
-        update(id, body)
-      rescue RuntimeError => e
-        if e.message.include?('update 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 body_with_2xx(response)
-      raise "#{caller_locations(1,1)[0].label} failed with error #{response.status}" unless response.status.to_s =~ /^2/
-      response.body
-    end
-  end
-end

data/spec/datadog_backup_spec.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe DatadogBackup do
-end