kennel 1.145.0 → 1.146.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed091ba0fa4fda310e5444a6e01fd21cf03f2b19dee5c7d4b0988a61855ca28e
-  data.tar.gz: 8a720d21972b01c5863722bf56834eccbcaf91ebcd949512142239afa364ec77
+  metadata.gz: 135900ecb21e1299d4b8fb044235e58363e94b19739d782eb13a3b37f3ebec01
+  data.tar.gz: 9333524bd316ca81abbf42eb678d7c6fb9558bc7ad03e61534eb268e8a7d487e
 SHA512:
-  metadata.gz: e478b0fea488349ef09f1402f146d5d1383849f292b34fd9575378abdb547d1de00124f9063a0e4dab5f80749470013d22416198db912723cd23e2588ffdf2dc
-  data.tar.gz: f64c88e17f5b1e016c8e8503b9e098bdaf56167b5d9084c4245199bad52fd142253b9f672647597fb24c0dd4b798c1382f9b45eeaaf1cdc76c4cc04fdeb70956
+  metadata.gz: 6d935709f003f87021baae50e8dbc5701bdf98abb9a1b34562669a953ca768e1bcc6354d8eb2f006b0b16514091a550b23bef855b194027bc0179a070354be80
+  data.tar.gz: e4fce646569437007d027fbacfd0086a909f382a861f5c90c938251822b8fd0a1f0072af799d1cfcb1f5d8d570d0ec895a3e3d9ba5c1375ddf5ef6c9f7c29f85

data/Readme.md

@@ -171,7 +171,7 @@ for simple constants you may prefer to use the plain syntax (`critical: 5.0`).
  - `cp .env.example .env`
  - open [Datadog API Settings](https://app.datadoghq.com/account/settings#api)
  - create a `API Key` or get an existing one from an admin, then add it to `.env` as `DATADOG_API_KEY`
- - open [Datadog API Settings](https://app.datadoghq.com/access/application-keys) and create a new key, then add it to `.env` as `DATADOG_APP_KEY=`
+ - open [Datadog API Settings](https://app.datadoghq.com/personal-settings/application-keys) and create a new key, then add it to `.env` as `DATADOG_APP_KEY=`
  - if you have a custom subdomain, change the `DATADOG_SUBDOMAIN=app` in `.env`
  - verify it works by running `rake plan`, it might show some diff, but should not crash
 -->

data/lib/kennel/syncer.rb

@@ -62,22 +62,28 @@ module Kennel
         Kennel.out.puts "#{LINE_UP}Deleted #{message}"
       end
 
-      resolver.each_resolved internal_plan.creates do |item|
-        message = "#{item.api_resource} #{item.tracking_id}"
-        Kennel.out.puts "Creating #{message}"
-        reply = @api.create item.api_resource, item.expected.as_json
-        id = reply.fetch(:id)
-        changes << item.change(id)
-        resolver.add_actual [reply] # allow resolving ids we could previously not resolve
-        Kennel.out.puts "#{LINE_UP}Created #{message} #{item.url(id)}"
-      end
-
-      resolver.each_resolved internal_plan.updates do |item|
-        message = "#{item.api_resource} #{item.tracking_id} #{item.url}"
-        Kennel.out.puts "Updating #{message}"
-        @api.update item.api_resource, item.id, item.expected.as_json
-        changes << item.change
-        Kennel.out.puts "#{LINE_UP}Updated #{message}"
+      planned_actions = internal_plan.creates + internal_plan.updates
+
+      # slos need to be updated first in case their timeframes changed
+      # because datadog validates that update+create of slo alerts match an existing timeframe
+      planned_actions.sort_by! { |item| item.expected.is_a?(Models::Slo) ? 0 : 1 }
+
+      resolver.each_resolved(planned_actions) do |item|
+        if item.is_a?(Types::PlannedCreate)
+          message = "#{item.api_resource} #{item.tracking_id}"
+          Kennel.out.puts "Creating #{message}"
+          reply = @api.create item.api_resource, item.expected.as_json
+          id = reply.fetch(:id)
+          changes << item.change(id)
+          resolver.add_actual [reply] # allow resolving ids we could previously not resolve
+          Kennel.out.puts "#{LINE_UP}Created #{message} #{item.url(id)}"
+        else
+          message = "#{item.api_resource} #{item.tracking_id} #{item.url}"
+          Kennel.out.puts "Updating #{message}"
+          @api.update item.api_resource, item.id, item.expected.as_json
+          changes << item.change
+          Kennel.out.puts "#{LINE_UP}Updated #{message}"
+        end
       end
 
       Plan.new(changes: changes)

data/lib/kennel/version.rb

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

data/template/Readme.md

@@ -154,7 +154,7 @@ for simple constants you may prefer to use the plain syntax (`critical: 5.0`).
  - `cp .env.example .env`
  - open [Datadog API Settings](https://app.datadoghq.com/account/settings#api)
  - create a `API Key` or get an existing one from an admin, then add it to `.env` as `DATADOG_API_KEY`
- - open [Datadog API Settings](https://app.datadoghq.com/access/application-keys) and create a new key, then add it to `.env` as `DATADOG_APP_KEY=`
+ - open [Datadog API Settings](https://app.datadoghq.com/personal-settings/application-keys) and create a new key, then add it to `.env` as `DATADOG_APP_KEY=`
  - if you have a custom subdomain, change the `DATADOG_SUBDOMAIN=app` in `.env`
  - verify it works by running `rake plan`, it might show some diff, but should not crash
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.145.0
+  version: 1.146.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs