datadog_backup 0.11.0 → 1.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cfe289fb044024544f602c71cf219df872f7a624d5400cdfa38fca04a063cc4
-  data.tar.gz: 1f646899a202ea0ddc5516135d9c9ffdb01f13e4b99a5f2a4d72222d9fb43169
+  metadata.gz: 5db8a5e804f30996a50247c24352e3fc1075971d141e37a2093987c510e9c9f1
+  data.tar.gz: 41c6f43d1c15c7e789aabe5a5b9bd34d45e5f5712d4ada557fb32edaeac4dd11
 SHA512:
-  metadata.gz: a6fbcc8eb4385edd4ad17a3f4f29b26d15e33d1696337b7d9f7f74fb877627a1214f425f3aa2294206017757f77eb67b113da30a25b6c5446ecbe46bceb381a4
-  data.tar.gz: f6576125ca22711b2f0102798f46cae7fd896cb006736a5c32ef75f76a720d663aa6970a87c67854461dafe0c64ebbcb489b1fc0eda6ac21750893420f479962
+  metadata.gz: f34c936e1a48773a4e0d600cfb23414c07b7197d7e72f9e1f7c3e1efd27c6b25b2ec9ab8643228b6b6d055f1b9c83762cf62e743418708ca8a02046405f256f7
+  data.tar.gz: e3f2a91bf80a2ea6c265766b55e07b01ac885a002a4be41f3f6dc7dc9574bdd394a158c1258887814b387290915f9843dc5a07759dc74d5c9d5c491c155b4ffe

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.0.0-alpha.1](https://github.com/scribd/datadog_backup/compare/v0.11.0...v1.0.0-alpha.1) (2021-01-17)
+
+
+### Features
+
+* If resource doesn't exist in Datadog, the resource is recreated. ([95d9699](https://github.com/scribd/datadog_backup/commit/95d9699e3fe6a6ecae0d6690dce225680f1d6a8a))
+
+
+### BREAKING CHANGES
+
+* `datadog-backup` used to exit with an error if a resource
+wasn't found in Datadog.
+
 # [0.11.0](https://github.com/scribd/datadog_backup/compare/v0.10.3...v0.11.0) (2021-01-12)
 
 

data/bin/datadog_backup

@@ -55,7 +55,8 @@ 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

data/lib/datadog_backup/cli.rb

@@ -109,7 +109,7 @@ module DatadogBackup
         next unless diff
 
         if @options[:force_restore]
-          definitive_resource_instance(id).update(id, definitive_resource_instance(id).load_from_file_by_id(id))
+          definitive_resource_instance(id).restore(id)
         else
           puts '--------------------------------------------------------------------------------'
           puts format_diff_output([id, diff])
@@ -120,7 +120,7 @@ module DatadogBackup
             exit
           when 'r'
             puts "Restoring #{id} to Datadog."
-            definitive_resource_instance(id).update(id, definitive_resource_instance(id).load_from_file_by_id(id))
+            definitive_resource_instance(id).restore(id)
           when 'd'
             puts "Downloading #{id} from Datadog."
             definitive_resource_instance(id).get_and_write_file(id)

data/lib/datadog_backup/core.rb

@@ -73,12 +73,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')
+
+          get_and_write_file(new_id)
+          FileUtils.rm(find_file_by_id(id))
+        else
+          raise e.message
+        end
+      end
     end
 
     def with_200
@@ -94,9 +120,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

data/lib/datadog_backup/version.rb

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

data/spec/datadog_backup/cli_spec.rb

@@ -45,9 +45,12 @@ describe DatadogBackup::Cli do
         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

data/spec/datadog_backup/core_spec.rb

@@ -26,13 +26,13 @@ describe DatadogBackup::Core do
 
   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)
@@ -76,15 +76,92 @@ describe DatadogBackup::Core do
     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' => 'whataver-man-thats-like-your-opinion' }])
       subject
     end
   end
+
+  describe '#restore' do
+    before(:each) 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
+      before(:each) 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
+
+      subject { core.restore('bad-123-id') }
+      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

@@ -61,8 +61,10 @@ describe DatadogBackup::Dashboards do
   end
   before(:example) 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,7 +102,7 @@ describe DatadogBackup::Dashboards do
         -title: example dashboard
         +a: b
       EOF
-    )
+                                                  )
     end
   end
 

data/spec/datadog_backup/monitors_spec.rb

@@ -51,8 +51,10 @@ describe DatadogBackup::Monitors do
 
   before(:example) 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog_backup
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.0.alpha.1
 platform: ruby
 authors:
 - Kamran Farhadi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -183,9 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: