datadog_backup 2.0.1 → 3.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dde2d1abab2ee528f325b7654246ac74e5af2237c2776d865cd5a937d15396e
-  data.tar.gz: 7a97f603ea64d4a5684c6c272f140c209e62d1c79e24eafd61b673b3829d6c1e
+  metadata.gz: 8ada6cc077ab1a7145bdbee5db768e9544a50a20f427c49bf86aabfe63ab2b74
+  data.tar.gz: 0e40617381ac33d1b4094cd277303dca2d0ece0372f7f13a3b4161eac304f34c
 SHA512:
-  metadata.gz: dc77dffd355537f3a88adf7c9a59cdb70fd3fc3ded6ee7c82c6d2db7055508da9f90a96ac8e8119126988708f81bdd54814656b38a20e9813016b2ffb0ea42ce
-  data.tar.gz: a8b36fdf7f5475421d19061b0d66ad21927d6c3a97ca690beaa08efd50d8598919871da46c0b1a4ba2209600e7a1174ecf069f35545c8b4f8b4b23a3c91b09ee
+  metadata.gz: 437faae8390ce834b7a20bfcf6f2097f94a8ab93a808aa0c5594e1972e0e8b9497e16838dda7b02f89349b8a41c721e4577ea552cf1b267ea923b016d00f77dc
+  data.tar.gz: 9a96702e3928e1768adc888dc206cdf13e4a7a3adb9b99a385dd487338b52ff62028de96e87220eb487b9959d73e58a1a02d12f125c906b8e62209ad6e65d94d

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+# [3.0.0-alpha.2](https://github.com/scribd/datadog_backup/compare/v3.0.0-alpha.1...v3.0.0-alpha.2) (2022-08-25)
+
+
+### Bug Fixes
+
+* remove development pry ([611d0a6](https://github.com/scribd/datadog_backup/commit/611d0a6dd5899b0046fc00233cf679834b275089))
+
+# [3.0.0-alpha.1](https://github.com/scribd/datadog_backup/compare/v2.0.2...v3.0.0-alpha.1) (2022-08-24)
+
+
+* feat!: release 3.0 ([d09d9e6](https://github.com/scribd/datadog_backup/commit/d09d9e6c845edb35c49cbb19ec6b35878304a078))
+
+
+### BREAKING CHANGES
+
+* DATADOG_API_KEY and DATADOG_APP_KEY are no longer the environment variables used to authenticate to Datadog. Instead, set the environment variables DD_API_KEY and DD_APP_KEY.
+* ruby 2.6 is no longer supported. Please upgrade to ruby 2.7 or higher.
+* The options `--ssh` and `--ssshh` are no longer supported. Instead, please use `--quiet` to supress logging. `--debug` remains supported.
+* The environment variable `DATADOG_HOST` is no longer supported. Instead, please use `DD_SITE_URL`.
+
+refactor: The legacy [dogapi-rb ](https://github.com/DataDog/dogapi-rb) gem is replaced with [faraday](https://lostisland.github.io/faraday/).  The [official client library](https://github.com/DataDog/datadog-api-client-ruby) was considered, but was not adopted as I had a hard time grok-ing it.
+
+## [2.0.2](https://github.com/scribd/datadog_backup/compare/v2.0.1...v2.0.2) (2022-08-11)
+
+
+### Bug Fixes
+
+* Deprecate Ruby 2.6 and Drop support for Ruby 2.5 ([#132](https://github.com/scribd/datadog_backup/issues/132)) ([432cb2c](https://github.com/scribd/datadog_backup/commit/432cb2c0d8b12d89aef81cf35597aa90f77407eb))
+
 ## [2.0.1](https://github.com/scribd/datadog_backup/compare/v2.0.0...v2.0.1) (2022-08-11)
 
 

data/Gemfile.lock

@@ -1,25 +1,31 @@
 PATH
   remote: .
   specs:
-    datadog_backup (0.6.0)
-      amazing_print (= 1.4.0)
-      concurrent-ruby (= 1.1.10)
-      deepsort (= 0.4.5)
-      diffy (= 3.4.2)
-      dogapi (= 1.45.0)
+    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)
-    dogapi (1.45.0)
-      multi_json
+    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)
@@ -42,7 +48,6 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    multi_json (1.15.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -53,6 +58,9 @@ GEM
     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)
@@ -72,14 +80,14 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.34.1)
+    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.0, < 2.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)
@@ -87,21 +95,24 @@ GEM
     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.19
+   2.3.20

data/README.md

@@ -11,6 +11,20 @@ Currently supports
 
 Additional features may be built out over time.
 
+# v3 Migration
+
+## Breaking Changes
+v3 is a backwards incompatible change.
+
+- [] DATADOG_API_KEY and DATADOG_APP_KEY are no longer the environment variables used to authenticate to Datadog. Instead, set the environment variables DD_API_KEY and DD_APP_KEY.
+- [ ] ruby 2.6 is no longer supported. Please upgrade to ruby 2.7 or higher.
+- [ ] The options `--ssh` and `--ssshh` are no longer supported. Instead, please use `--quiet` to supress logging. `--debug` remains supported.
+- [ ] The environment variable `DATADOG_HOST` is no longer supported. Instead, please use `DD_SITE_URL`.
+
+## Misc
+- [ ] The legacy [dogapi-rb ](https://github.com/DataDog/dogapi-rb) gem is replaced with [faraday](https://lostisland.github.io/faraday/).  The [official client library](https://github.com/DataDog/datadog-api-client-ruby) was considered, but was not adopted as I had a hard time grok-ing it.
+
+
 ## Installation
 
 ```
@@ -22,13 +36,13 @@ gem install datadog_backup
 ![demo](images/demo.gif)
 
 ```
-DATADOG_API_KEY=example123 DATADOG_APP_KEY=example123 datadog_backup <backup|diffs|restore> [--backup-dir /path/to/backups] [--debug] [--monitors-only] [--dashboards-only] [--diff-format color|html|html_simple] [--no-color] [--json]
+DD_API_KEY=example123 DD_APP_KEY=example123 datadog_backup <backup|diffs|restore> [--backup-dir /path/to/backups] [--debug] [--monitors-only] [--dashboards-only] [--diff-format color|html|html_simple] [--no-color] [--json]
 ```
 
 ```
 gem install datadog_backup
-export DATADOG_API_KEY=abc123
-export DATADOG_APP_KEY=abc123
+export DD_API_KEY=abc123
+export DD_APP_KEY=abc123
 
 # Perform backup to `./backup/` using YAML encoding
 datadog_backup backup
@@ -49,8 +63,7 @@ Supply the following parameters in order to customize datadog_backup:
 parameter            | description                                                                                                                   | default
 ---------------------|-------------------------------------------------------------------------------------------------------------------------------|--------------------------
 --debug              | log debug and above                                                                                                           | info
---shh                | log warnings and above                                                                                                        | info
---shhh               | log errors and above                                                                                                          | info
+--quiet              | only show errors and above                                                                                                    | info
 --backup-dir PATH    | path to the directory to backup to or restore from                                                                            | `./backup/`
 --monitors-only      | only backup monitors                                                                                                          | backup monitors and dashboards
 --dashboards-only    | only backup dashboards                                                                                                        | backup monitors and dashboards
@@ -66,10 +79,9 @@ The following environment variables can be set in order to further customize dat
 
 environment variable | description                                                                      | default
 ---------------------|--------------------------------------------------------------------------------|--------------------------
-DATADOG_HOST         | Describe the API endpoint to connect to (https://api.datadoghq.eu for example)   | https://api.datadoghq.com
-http_proxy           | Instruct Dogapi to connect via a differnt proxy address                          | none
-https_proxy          | Same as `http_proxy`                                                             | none
-dd_proxy_https       | Same as `http_proxy`                                                             | none
+DD_SITE_URL          | Describe the API endpoint to connect to (https://api.datadoghq.eu for example)   | https://api.datadoghq.com
+DD_API_KEY           | The API key for the Datadog account                                              | none
+DD_API_KEY           | The Application key for the Datadog account                                      | none
 
 
 ### Usage in a Github repo

data/bin/datadog_backup

@@ -5,23 +5,21 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
 
 require 'logger'
 require 'optparse'
-
-require 'datadog_backup'
-require 'dogapi'
-
 $stdout.sync = $stderr.sync = true
 LOGGER = Logger.new($stderr) unless defined?(LOGGER)
 LOGGER.level = Logger::INFO
 
+require 'datadog_backup'
+
+
 def fatal(message)
   LOGGER.fatal(message)
   exit 1
 end
 
 def options_valid?(options)
-  %w[backup diffs restore].include?(options[:action]) &&
-    options[:datadog_api_key] &&
-    options[:datadog_app_key]
+  %w[backup diffs restore].include?(options[:action])
+  %w[DD_API_KEY DD_APP_KEY].all? { |key| ENV[key] }
 end
 
 def prereqs(defaults)
@@ -30,7 +28,7 @@ def prereqs(defaults)
   result = defaults.dup
 
   options = OptionParser.new do |opts|
-    opts.banner = "Usage: DATADOG_API_KEY=abc123 DATADOG_APP_KEY=abc123 #{File.basename($PROGRAM_NAME)} <backup|diffs|restore>"
+    opts.banner = "Usage: DD_API_KEY=abc123 DD_APP_KEY=abc123 #{File.basename($PROGRAM_NAME)} <backup|diffs|restore>"
     opts.separator ''
     opts.on_tail('-h', '--help', 'Show this message') do
       puts opts
@@ -39,10 +37,7 @@ def prereqs(defaults)
     opts.on('--debug', 'log debug and above') do
       LOGGER.level = Logger::DEBUG
     end
-    opts.on('--shh', 'log warnings and above') do
-      LOGGER.level = Logger::WARN
-    end
-    opts.on('--shhh', 'log errors and above') do
+    opts.on('--quiet', 'log errors and above') do
       LOGGER.level = Logger::ERROR
     end
     opts.on('--backup-dir PATH', '`backup` by default') do |path|
@@ -73,7 +68,7 @@ def prereqs(defaults)
   options.parse!
 
   result[:action] = ARGV.first
-  fatal(options) unless options_valid?(result)
+  fatal(options.banner) unless options_valid?(result)
   result
 end
 
@@ -81,14 +76,11 @@ end
 # Default parameters
 defaults = {
   action: nil,
-  datadog_api_key: ENV.fetch('DATADOG_API_KEY', nil),
-  datadog_app_key: ENV.fetch('DATADOG_APP_KEY', nil),
   backup_dir: File.join(ENV.fetch('PWD'), 'backup'),
   diff_format: :color,
   resources: [DatadogBackup::Dashboards, DatadogBackup::Monitors],
   output_format: :yaml,
-  force_restore: false,
-  logger: LOGGER
+  force_restore: false
 }
 
-DatadogBackup::Cli.new(prereqs(defaults)).run!
+DatadogBackup::Cli.new(prereqs(defaults)).run!

data/datadog_backup.gemspec

@@ -19,16 +19,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = ['>= 2.5']
+  spec.required_ruby_version = ['>= 2.7']
+
+  spec.add_dependency 'amazing_print'
+  spec.add_dependency 'concurrent-ruby'
+  spec.add_dependency 'deepsort'
+  spec.add_dependency 'diffy'
+  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday-retry'
 
-  spec.add_dependency 'amazing_print', '1.4.0'
-  spec.add_dependency 'concurrent-ruby', '1.1.10'
-  spec.add_dependency 'deepsort', '0.4.5'
-  spec.add_dependency 'diffy', '3.4.2'
-  spec.add_dependency 'dogapi', '1.45.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'

data/example/.github/workflows/backup.yml

@@ -17,8 +17,8 @@ jobs:
         ruby-version: 2.7.1
     - name: perform backup
       env:
-        DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
-        DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }}
+        DD_API_KEY: ${{ secrets.DD_API_KEY }}
+        DD_APP_KEY: ${{ secrets.DD_APP_KEY }}
       run: |
           gem install --no-document bundler
           bundle install --jobs 4 --retry 3

data/lib/datadog_backup/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require 'logger'
 require 'amazing_print'
 
 module DatadogBackup
@@ -9,7 +8,7 @@ module DatadogBackup
     include ::DatadogBackup::Options
 
     def all_diff_futures
-      logger.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
+      LOGGER.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
       any_resource_instance
         .all_file_ids_for_selected_resources
         .map do |id|
@@ -29,20 +28,13 @@ module DatadogBackup
       any_resource_instance.all_files
     end
 
-    def initialize_client
-      @options[:client] ||= Dogapi::Client.new(
-        datadog_api_key,
-        datadog_app_key
-      )
-    end
-
     def definitive_resource_instance(id)
       matching_resource_instance(any_resource_instance.class_from_id(id))
     end
 
     def diffs
       futures = all_diff_futures
-      ::DatadogBackup::ThreadPool.watcher(logger).join
+      ::DatadogBackup::ThreadPool.watcher.join
 
       format_diff_output(
         Concurrent::Promises
@@ -87,7 +79,6 @@ module DatadogBackup
 
     def initialize(options)
       @options = options
-      initialize_client
     end
 
     def matching_resource_instance(klass)
@@ -102,7 +93,7 @@ module DatadogBackup
 
     def restore
       futures = all_diff_futures
-      watcher = ::DatadogBackup::ThreadPool.watcher(logger)
+      watcher = ::DatadogBackup::ThreadPool.watcher
 
       futures.each do |future|
         id, diff = *future.value!
@@ -138,7 +129,7 @@ module DatadogBackup
     def run!
       puts(send(action.to_sym))
     rescue SystemExit, Interrupt
-      ::DatadogBackup::ThreadPool.shutdown(logger)
+      ::DatadogBackup::ThreadPool.shutdown
     end
   end
 end

data/lib/datadog_backup/core.rb

@@ -2,14 +2,45 @@
 
 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
-      raise 'subclass is expected to implement #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
@@ -30,7 +61,7 @@ module DatadogBackup
       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}")
+      LOGGER.debug("Compared ID #{id} and found #{result}")
       result
     end
 
@@ -44,19 +75,17 @@ module DatadogBackup
     end
 
     def get(id)
-      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
+      params = {}
+      headers = {}
+      response = api_service.get("/api/#{api_version}/#{api_resource_name}/#{id}", params, headers)
+      body_with_2xx(response)
     end
 
     def get_all
-      with_200 do
-        api_service.request(Net::HTTP::Get, "/api/#{api_version}/#{api_resource_name}", nil, nil, false)
-      end
+      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)
@@ -79,20 +108,20 @@ module DatadogBackup
 
     # 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
+      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)
-      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
+      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)
@@ -100,7 +129,7 @@ module DatadogBackup
       begin
         update(id, body)
       rescue RuntimeError => e
-        if e.message.include?('Request failed with error ["404"')
+        if e.message.include?('update failed with error 404')
           new_id = create(body).fetch('id')
 
           FileUtils.rm(find_file_by_id(id))
@@ -111,21 +140,9 @@ module DatadogBackup
       end
     end
 
-    def with_200
-      max_retries = 6
-      retries ||= 0
-
-      response = yield
-      raise "Request 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 "Net::OpenTimeout: #{e.message}"
-      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/lib/datadog_backup/dashboards.rb

@@ -2,14 +2,6 @@
 
 module DatadogBackup
   class Dashboards < Core
-    def all_boards
-      get_all.fetch('dashboards')
-    end
-
-    def api_service
-      # The underlying class from Dogapi that talks to datadog
-      client.instance_variable_get(:@dashboard_service)
-    end
 
     def api_version
       'v1'
@@ -20,21 +12,25 @@ module DatadogBackup
     end
 
     def backup
-      logger.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
+      LOGGER.info("Starting diffs on #{::DatadogBackup::ThreadPool::TPOOL.max_length} threads")
 
-      futures = all_boards.map do |board|
+      futures = all_dashboards.map do |board|
         Concurrent::Promises.future_on(::DatadogBackup::ThreadPool::TPOOL, board) do |board|
           id = board['id']
           get_and_write_file(id)
         end
       end
 
-      watcher = ::DatadogBackup::ThreadPool.watcher(logger)
+      watcher = ::DatadogBackup::ThreadPool.watcher
       watcher.join if watcher.status
 
       Concurrent::Promises.zip(*futures).value!
     end
 
+    def all_dashboards
+      get_all.fetch('dashboards')
+    end
+
     def initialize(options)
       super(options)
       @banlist = %w[modified_at url].freeze

data/lib/datadog_backup/deprecations.rb

@@ -0,0 +1,11 @@
+
+
+module DatadogBackup
+  module Deprecations
+    def self.check
+      if RUBY_VERSION < '2.7'
+        LOGGER.warn "ruby-#{RUBY_VERSION} is deprecated. Ruby 2.7 or higher will be required to use this gem after datadog_backup@v3"
+      end
+    end
+  end
+end

data/lib/datadog_backup/local_filesystem.rb

@@ -78,7 +78,7 @@ module DatadogBackup
     end
 
     def write_file(data, filename)
-      logger.info "Backing up #{filename}"
+      LOGGER.info "Backing up #{filename}"
       file = ::File.open(filename, 'w')
       file.write(data)
     ensure

data/lib/datadog_backup/monitors.rb

@@ -6,11 +6,6 @@ module DatadogBackup
       @all_monitors ||= get_all
     end
 
-    def api_service
-      # The underlying class from Dogapi that talks to datadog
-      client.instance_variable_get(:@monitor_svc)
-    end
-
     def api_version
       'v1'
     end

data/lib/datadog_backup/options.rb

@@ -10,30 +10,14 @@ module DatadogBackup
       @options[:backup_dir]
     end
 
-    def client
-      @options[:client]
-    end
-
     def concurrency_limit
       @options[:concurrency_limit] | 2
     end
 
-    def datadog_api_key
-      @options[:datadog_api_key]
-    end
-
-    def datadog_app_key
-      @options[:datadog_app_key]
-    end
-
     def diff_format
       @options[:diff_format]
     end
 
-    def logger
-      @options[:logger]
-    end
-
     # Either :json or :yaml
     def output_format
       @options[:output_format]

data/lib/datadog_backup/thread_pool.rb

@@ -8,21 +8,21 @@ module DatadogBackup
       fallback_policy: :abort
     )
 
-    def self.watcher(logger)
+    def self.watcher
       Thread.new(TPOOL) do |pool|
         while pool.queue_length.positive?
           sleep 2
-          logger.info("#{pool.queue_length} tasks remaining for execution.")
+          LOGGER.info("#{pool.queue_length} tasks remaining for execution.")
         end
       end
     end
 
-    def self.shutdown(logger)
-      logger.fatal 'Shutdown signal caught. Performing orderly shut down of thread pool. Press Ctrl+C again to forcibly shut down, but be warned, DATA LOSS MAY OCCUR.'
+    def self.shutdown
+      LOGGER.fatal 'Shutdown signal caught. Performing orderly shut down of thread pool. Press Ctrl+C again to forcibly shut down, but be warned, DATA LOSS MAY OCCUR.'
       TPOOL.shutdown
       TPOOL.wait_for_termination
     rescue SystemExit, Interrupt
-      logger.fatal 'OK Nuking, DATA LOSS MAY OCCUR.'
+      LOGGER.fatal 'OK Nuking, DATA LOSS MAY OCCUR.'
       TPOOL.kill
     end
   end