kennel 1.90.0 → 1.91.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 861edba684922b252c0af4cbbdecbe258e28fc0dcba9a31f8c77e14ea3391110
-  data.tar.gz: fc11becb68eb696db030e517d99e12191eae10024c74ca852c7c308646517ef4
+  metadata.gz: 7a85c311024f48c14e9e346eb863a47fbb67239f5d83cd82eddea6f53742ec74
+  data.tar.gz: 672ef53f76ee577f9f976ee9432f06f1e56d426bef74020d50850863e851635a
 SHA512:
-  metadata.gz: 660e66d7a1ae02a0f67d723ddd1beccddea63d9bf62658b4327ec2622ba32f161a6c9336b86a1295b8037195ed513c4514c0c1759e6eb71764665d11feeb19fe
-  data.tar.gz: a2f479c8579e94a7a796e59ea6be3433c795f1db35892a5ce57a345ac7449c87a344632ad8c35fd27256da70d5c49eb227dd70f89c7566ea4084085277f25e94
+  metadata.gz: 8407d6564013f12ce1e00e1394eb742b7f721fe9302396d821c8c3441c62e4e30781b9681f430dcedb96e3c757a740b9604a2c56194afabdabd69ed52f8c1a27
+  data.tar.gz: efceaa72bc4ff084e1d8bd54ed79dbcaa021d6a95897fa66465dbec686b0712f05a153198b3c882029df08812b93353ed3061c34c5f4c5f1303b826bc3d17711

data/lib/kennel.rb

@@ -23,6 +23,7 @@ require "kennel/models/record"
 require "kennel/models/dashboard"
 require "kennel/models/monitor"
 require "kennel/models/slo"
+require "kennel/models/synthetic_test"
 
 # settings
 require "kennel/models/project"

data/lib/kennel/api.rb

@@ -14,6 +14,7 @@ module Kennel
     def show(api_resource, id, params = {})
       response = request :get, "/api/v1/#{api_resource}/#{id}", params: params
       response = response.fetch(:data) if api_resource == "slo"
+      response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
       response
     end
 
@@ -22,6 +23,14 @@ module Kennel
         response = request :get, "/api/v1/#{api_resource}", params: paginated_params
         response = response.fetch(:dashboards) if api_resource == "dashboard"
         response = response.fetch(:data) if api_resource == "slo"
+        if api_resource == "synthetics/tests"
+          response = response.fetch(:tests)
+          response.each { |r| r[:id] = r.delete(:public_id) }
+        end
+
+        # ignore monitor synthetics create and that inherit the kennel_id, we do not directly manage them
+        response.reject! { |m| m[:type] == "synthetics alert" } if api_resource == "monitor"
+
         response
       end
     end
@@ -29,18 +38,26 @@ module Kennel
     def create(api_resource, attributes)
       response = request :post, "/api/v1/#{api_resource}", body: attributes
       response = response.fetch(:data).first if api_resource == "slo"
+      response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
       response
     end
 
     def update(api_resource, id, attributes)
-      request :put, "/api/v1/#{api_resource}/#{id}", body: attributes
+      response = request :put, "/api/v1/#{api_resource}/#{id}", body: attributes
+      response[:id] = response.delete(:public_id) if api_resource == "synthetics/tests"
+      response
     end
 
     # - force=true to not dead-lock on dependent monitors+slos
     #   external dependency on kennel managed resources is their problem, we don't block on it
     #   (?force=true did not work, force for dashboard is not documented but does not blow up)
     def delete(api_resource, id)
-      request :delete, "/api/v1/#{api_resource}/#{id}", params: { force: "true" }, ignore_404: true
+      if api_resource == "synthetics/tests"
+        # https://docs.datadoghq.com/api/latest/synthetics/#delete-tests
+        request :post, "/api/v1/#{api_resource}/delete", body: { public_ids: [id] }, ignore_404: true
+      else
+        request :delete, "/api/v1/#{api_resource}/#{id}", params: { force: "true" }, ignore_404: true
+      end
     end
 
     def fill_details!(api_resource, list)

data/lib/kennel/importer.rb

@@ -15,11 +15,8 @@ module Kennel
       end
 
       model =
-        begin
-          Kennel::Models.const_get(resource.capitalize)
-        rescue NameError
-          raise ArgumentError, "#{resource} is not supported"
-        end
+        Kennel::Models::Record.subclasses.detect { |c| c.api_resource == resource } ||
+        raise(ArgumentError, "#{resource} is not supported")
 
       data = @api.show(model.api_resource, id)
       id = data.fetch(:id) # keep native value
@@ -70,6 +67,8 @@ module Kennel
           dry_up_widget_metadata!(widget)
           (widget.dig(:definition, :markers) || []).each { |m| m[:label]&.delete! " " }
         end
+      when "synthetics/tests"
+        data[:locations] = :all if data[:locations].sort == Kennel::Models::SyntheticTest::LOCATIONS.sort
       else
         # noop
       end
@@ -107,10 +106,11 @@ module Kennel
     end
 
     # new api format is very verbose, so use old dry format when possible
+    # dd randomly chooses query0 or query1
     def convert_widget_to_compact_format!(widget)
       (widget.dig(:definition, :requests) || []).each do |request|
         next unless request.is_a?(Hash)
-        next if request[:formulas] && request[:formulas] != [{ formula: "query1" }]
+        next if request[:formulas] && ![[{ formula: "query1" }], [{ formula: "query0" }]].include?(request[:formulas])
         next if request[:queries]&.size != 1
         next if request[:queries].any? { |q| q[:data_source] != "metrics" }
         next if widget.dig(:definition, :type) != request[:response_format]

data/lib/kennel/models/synthetic_test.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+module Kennel
+  module Models
+    class SyntheticTest < Record
+      TRACKING_FIELD = :message
+      DEFAULTS = {
+      }.freeze
+      READONLY_ATTRIBUTES = superclass::READONLY_ATTRIBUTES + [:status, :monitor_id]
+      LOCATIONS = ["aws:ca-central-1", "aws:eu-north-1", "aws:eu-west-1", "aws:eu-west-3", "aws:eu-west-2", "aws:ap-south-1", "aws:us-west-2", "aws:us-west-1", "aws:sa-east-1", "aws:us-east-2", "aws:ap-northeast-1", "aws:ap-northeast-2", "aws:eu-central-1", "aws:ap-southeast-2", "aws:ap-southeast-1"].freeze
+
+      settings :tags, :config, :message, :subtype, :type, :name, :locations, :options
+
+      defaults(
+        id: -> { nil },
+        tags: -> { @project.tags },
+        message: -> { "\n\n#{project.mention}" }
+      )
+
+      def as_json
+        return @as_json if @as_json
+        locations = locations()
+        data = {
+          message: message,
+          tags: tags,
+          config: config,
+          type: type,
+          subtype: subtype,
+          options: options,
+          name: name,
+          locations: locations == :all ? LOCATIONS : locations
+        }
+
+        if v = id
+          data[:id] = v
+        end
+
+        @as_json = data
+      end
+
+      def self.api_resource
+        "synthetics/tests"
+      end
+
+      def self.url(id)
+        Utils.path_to_url "/synthetics/details/#{id}"
+      end
+
+      def self.parse_url(url)
+        url[/\/synthetics\/details\/([a-z\d-]{11,})/, 1] # id format is 1ab-2ab-3ab
+      end
+
+      def self.normalize(expected, actual)
+        super
+
+        # tags come in a semi-random order and order is never updated
+        expected[:tags]&.sort!
+        actual[:tags].sort!
+
+        ignore_default(expected, actual, DEFAULTS)
+      end
+    end
+  end
+end

data/lib/kennel/syncer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Kennel
   class Syncer
-    DELETE_ORDER = ["dashboard", "slo", "monitor"].freeze # dashboards references monitors + slos, slos reference monitors
+    DELETE_ORDER = ["dashboard", "slo", "monitor", "synthetics/tests"].freeze # dashboards references monitors + slos, slos reference monitors
     LINE_UP = "\e[1A\033[K" # go up and clear
 
     def initialize(api, expected, project: nil)
@@ -24,7 +24,14 @@ module Kennel
     end
 
     def confirm
-      ENV["CI"] || !STDIN.tty? || Utils.ask("Execute Plan ?") unless noop?
+      return false if noop?
+      return true if ENV["CI"] || !STDIN.tty?
+      if @delete.any? && @project_filter
+        Kennel.out.puts(
+          Utils.color(:red, "WARNING: deleting resources that had `id: -> { ...` breaks master branch")
+        )
+      end
+      Utils.ask("Execute Plan ?")
     end
 
     def update

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.90.0"
+  VERSION = "1.91.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.90.0
+  version: 1.91.3
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -70,6 +70,7 @@ files:
 - lib/kennel/models/project.rb
 - lib/kennel/models/record.rb
 - lib/kennel/models/slo.rb
+- lib/kennel/models/synthetic_test.rb
 - lib/kennel/models/team.rb
 - lib/kennel/optional_validations.rb
 - lib/kennel/progress.rb