kennel 1.102.0 → 1.102.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 424978ab5e025d68c1b30adee8dcf9bbae531c34da1ce02abcc1a97165accb2f
-  data.tar.gz: 762d7b47d15937d0ea9b2bb7d9bb1c79d88b34828a0b455c05aa4d7498fd8f04
+  metadata.gz: a2bb74d0c3edadadde342a244ba9978b571da0a2306b8c5aacaafd60a745f431
+  data.tar.gz: abbb833ba16df03e64e2fea46c4094b7ad2aa07780c13e0cebe981f9c77e4753
 SHA512:
-  metadata.gz: 2079300fb176ffe4a3c363c56dfb2fed0901b4f3cfce7ff6fd1c656f8981e16a94628eaa660ffee6a53cc86c9df2d7b604ca877c6c34c61eeec13cbe4b0484ee
-  data.tar.gz: 0113a4f7a4edf4813d66cb15090909e63a47945cfaa4bce22cd9fe40203f3b6dd3705c2f62652df7e09be9e4b7a7d5de1de2092074e2baa524c8392a3bb9b462
+  metadata.gz: d0aea7c75a482f3a4a2d4996bca4c3b2990564f3720f027366749b5c287f50bc805e29782315e697a2711f5029f9aecbda05b4aae0b1f6204d371f6991e6e76b
+  data.tar.gz: 47037941ef3eedbefb74061545ea68c62d36367ec2b24a3acd3e6e2e08aaa9ef44f2735482012aa4af202aca5ee2cf2330af9df40ee717500d01c43940c9e436

data/lib/kennel/id_map.rb

@@ -15,10 +15,6 @@ module Kennel
       @map[type][tracking_id] = id
     end
 
-    def set_new(type, tracking_id)
-      @map[type][tracking_id] = NEW
-    end
-
     def new?(type, tracking_id)
       @map[type][tracking_id] == NEW
     end

data/lib/kennel/syncer.rb

@@ -254,15 +254,28 @@ module Kennel
     end
 
     def populate_id_map(expected, actual)
+      # mark everything as new
       expected.each do |e|
-        @id_map.set_new(e.class.api_resource, e.tracking_id)
+        @id_map.set(e.class.api_resource, e.tracking_id, IdMap::NEW)
+        if e.class.api_resource == "synthetics/tests"
+          @id_map.set(Kennel::Models::Monitor.api_resource, e.tracking_id, IdMap::NEW)
+        end
       end
 
+      # override resources that exist with their id
+      project_prefix = @project_filter && "#{@project_filter}:"
       actual.each do |a|
+        # ignore when not managed by kennel
         next unless tracking_id = a.fetch(:tracking_id)
-        next unless @id_map.get(a.fetch(:klass).api_resource, tracking_id)
 
-        @id_map.set(a.fetch(:klass).api_resource, tracking_id, a.fetch(:id))
+        # ignore when deleted from the codebase
+        # (when running with project filter we cannot see the other resources in the codebase)
+        api_resource = a.fetch(:klass).api_resource
+        next if
+          !@id_map.get(api_resource, tracking_id) &&
+          (!project_prefix || tracking_id.start_with?(project_prefix))
+
+        @id_map.set(api_resource, tracking_id, a.fetch(:id))
         if a[:klass].api_resource == "synthetics/tests"
           @id_map.set(Kennel::Models::Monitor.api_resource, tracking_id, a.fetch(:monitor_id))
         end

data/lib/kennel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.102.0
+  version: 1.102.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday