kennel 1.89.1 → 1.91.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba1d58935b541b89cb78318964470bb209933a491d9b81e23785de0fb6ab2654
-  data.tar.gz: aed4b13dc2c35ced80073e592fd0d2ba2afda8dfb763d2c6baa4b1f30851cf53
+  metadata.gz: 78b7b57805cf2c4730b6a1320342240fe03e9cf786f07380210bb558361b7192
+  data.tar.gz: e56d5211430862f20dc92e4d3538be0befdd630a401bf1605de064b6ab9468b8
 SHA512:
-  metadata.gz: d3595608df6e40ec4241bf2b758f1ed1b3fde0e63dff7f5a4fa393a358cf9cb9fa33bb0c5f72899b7df54817cb9482366d9c387e3c21a33249e35e3bcc4fc8ea
-  data.tar.gz: 745ec8c762acc885a9d0f2ae23fc9f43ca05f56b8c580501075e2b9237e7199a09499053cebb45e5bfa477aa0a187cabf5899e05f7bf6c361f952347ab6cac34
+  metadata.gz: 2631017430f4d33639317f56be0d639d1d60cf33e568f5b0b4f8031a4cc0d981ca2cc793a18864049cdfc7bb3cf9d852a8ca5f90e6a37779faa37a5cafdb3212
+  data.tar.gz: 9fa908dd061892c13b40e5cf1ab1de7d406ec7a99ed6a718c1cadee5ca5ecd17ec72e8c498c3b4bdf977542a51e1871fbb743e2b4296bcc5d0d071be6aba7d3c

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"
@@ -55,7 +56,7 @@ module Kennel
 
     def store(parts)
       Progress.progress "Storing" do
-        old = Dir["generated/**/*"]
+        old = Dir["generated/#{project_filter || "**"}/*"]
         used = []
 
         Utils.parallel(parts, max: 2) do |part|
@@ -83,7 +84,7 @@ module Kennel
     end
 
     def syncer
-      @syncer ||= Syncer.new(api, generated, project: ENV["PROJECT"])
+      @syncer ||= Syncer.new(api, generated, project: project_filter)
     end
 
     def api
@@ -94,9 +95,21 @@ module Kennel
       @generated ||= begin
         Progress.progress "Generating" do
           load_all
+          known = []
           parts = Models::Project.recursive_subclasses.flat_map do |project_class|
-            project_class.new.validated_parts
+            project = project_class.new
+            kennel_id = project.kennel_id
+            if project_filter
+              known << kennel_id
+              next [] if kennel_id != project_filter
+            end
+            project.validated_parts
           end
+
+          if project_filter && parts.empty?
+            raise "#{project_filter} does not match any projects, try any of these:\n#{known.uniq.sort.join("\n")}"
+          end
+
           parts.group_by(&:tracking_id).each do |tracking_id, same|
             next if same.size == 1
             raise <<~ERROR
@@ -109,6 +122,10 @@ module Kennel
       end
     end
 
+    def project_filter
+      ENV["PROJECT"]
+    end
+
     def load_all
       ["teams", "parts", "projects"].each do |folder|
         Dir["#{folder}/**/*.rb"].sort.each { |f| require "./#{f}" }

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

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
@@ -99,7 +106,6 @@ module Kennel
       actual = Progress.progress("Downloading definitions") { download_definitions }
 
       Progress.progress "Diffing" do
-        filter_expected_by_project! @expected
         populate_id_map @expected, actual
         filter_actual_by_project! actual
         resolve_linked_tracking_ids! @expected # resolve dependencies to avoid diff
@@ -244,16 +250,5 @@ module Kennel
         !tracking_id || tracking_id.start_with?("#{@project_filter}:")
       end
     end
-
-    def filter_expected_by_project!(expected)
-      return unless @project_filter
-      original = expected.dup
-      expected.select! { |e| e.project.kennel_id == @project_filter }
-
-      if expected.empty?
-        possible = original.map { |e| e.project.kennel_id }.uniq.sort
-        raise "#{@project_filter} does not match any projects, try any of these:\n#{possible.join("\n")}"
-      end
-    end
   end
 end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.89.1
+  version: 1.91.2
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-15 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