skull_island 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2206cb54181494145ba4f100050260a5905146be30d35941f44276e4876ff4
-  data.tar.gz: 1a6172feb18257fde3a828e8cc73368fab080ed50ca218903a03faa9cdcfc823
+  metadata.gz: dc8db328edd2fcbbbd0e6995c459f40bc873df854ddb1344eb9fd94ddfc09b1d
+  data.tar.gz: 7c2a4434195ebf368ed2b476bd892ab7c35d793c0668c8e4cbbaa3f9702d9151
 SHA512:
-  metadata.gz: fa9723446ca8c1a2c8fb4d96a03b6b9ec584c238ca6f0ca634553c457be6caf551fda6626207e884908f09eedf0087d3a7b66fcbd95f32d375a560e92ba46adf
-  data.tar.gz: 9554fd6c88d6fe8e9b41e68894e76282720c0c7ae6d68e67d2e8612d5f6d4c061540c42367c98c1c0821f54badd2fc00d4090717633e3b0f382fc3290b47087d
+  metadata.gz: 0b6392d9ba4f220853d3d45a8c330dd1fd7d280b8280f7474b39abeec44c217972ae3f3ae5e15761f63b4cac4dd0571587c86c4b994525b7c500a0909e56631b
+  data.tar.gz: 1e128a4734f194270466be4017ad3d6143bcd21ed7875e6721c55e8d32bb6b58db9770413ec68fda843ec57ab5d83e29908bbc5530d5c080827846722762acd1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (1.2.3)
+    skull_island (1.2.4)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)

data/lib/skull_island/resources/consumer.rb

@@ -59,17 +59,20 @@ module SkullIsland
 
           next unless project
 
-          BasicauthCredential.all.reject { |res| known_basic_auths.include?(res.id) }.map do |res|
+          basic_creds = BasicauthCredential.all.select { |c| c.consumer == resource }
+          basic_creds.reject { |res| known_basic_auths.include?(res.id) }.map do |res|
             puts "[WARN] ! Removing #{res.class.name} (#{res.id})"
             res.destroy
           end
 
-          JWTCredential.all.reject { |res| known_jwt_auths.include?(res.id) }.map do |res|
+          jwt_creds = JWTCredential.all.select { |c| c.consumer == resource }
+          jwt_creds.reject { |res| known_jwt_auths.include?(res.id) }.map do |res|
             puts "[WARN] ! Removing #{res.class.name} (#{res.id})"
             res.destroy
           end
 
-          KeyauthCredential.all.reject { |res| known_key_auths.include?(res.id) }.map do |res|
+          key_creds = KeyauthCredential.all.select { |c| c.consumer == resource }
+          key_creds.reject { |res| known_key_auths.include?(res.id) }.map do |res|
             puts "[WARN] ! Removing #{res.class.name} (#{res.id})"
             res.destroy
           end

data/lib/skull_island/resources/keyauth_credential.rb

@@ -59,6 +59,10 @@ module SkullIsland
         false
       end
 
+      def project
+        consumer ? consumer.project : nil
+      end
+
       private
 
       def postprocess_consumer(value)

data/lib/skull_island/version.rb

@@ -4,6 +4,6 @@ module SkullIsland
   VERSION = [
     1, # Major
     2, # Minor
-    3  # Patch
+    4  # Patch
   ].join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Jonathan Gnagy