piculet 0.2.9.beta4 → 0.2.9.beta5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bfc46f2da55cae61322c2f70aabcb18e3a6659ce
4
- data.tar.gz: 233c325a1f5dc964a39a5c9b3ffc00b1ba76df84
3
+ metadata.gz: 94112a96a7bd236576390bcf81e5f7f3258d7bc9
4
+ data.tar.gz: 5ae8449df9dc11f2b8175d4d74a315e106b22b06
5
5
  SHA512:
6
- metadata.gz: 49b6fb416f11301d492e3eb8d07aaf5049186e2f8850a10d48001ac42503d1f9d6cc1625710189ab4a11e47cef79278d5edf84cff5743bc710892ab3c7b473cf
7
- data.tar.gz: 29d9ef5ed8c0d4c9eea22014ac9f4454b37df763d0cbe15122d36a2c1f68b1f3f4c19db5296014fde62f945a6f77d439d1c189bbe7a5a2051b7fddceabf1c91c
6
+ metadata.gz: 620fc478fc6321a97d1a9358da9cff62bd9d67cdd1d3e71e2edc044efa8fc9bc8333ccc82a43aa964a760bf47c228a6ca9648fcc9eb5858d1a50189ab323bb3c
7
+ data.tar.gz: 16b98dc5bb8abf3b9feb7427691fcaa347b8edbc50cd61a76de1c867ec867e61ebd6fed8b504ac1d86f1f17e052526c8384ea63ce3f93a2aa990c86b87c0854c
@@ -1,3 +1,3 @@
1
1
  module Piculet
2
- VERSION = "0.2.9.beta4"
2
+ VERSION = "0.2.9.beta5"
3
3
  end
@@ -39,7 +39,7 @@ module Piculet
39
39
  def delete
40
40
  log(:info, 'Delete Permission', :red, log_id)
41
41
 
42
- self_ip_ranges, self_groups = normalize_self_attrs
42
+ self_ip_ranges, self_groups = normalize_self_attrs([])
43
43
 
44
44
  unless (self_ip_ranges + self_groups).empty?
45
45
  @collection.revoke(protocol, port_range, (self_ip_ranges + self_groups), :log_color => :red)
@@ -74,15 +74,19 @@ module Piculet
74
74
  end
75
75
  }.sort
76
76
 
77
- self_ip_ranges, self_groups = normalize_self_attrs
77
+ self_ip_ranges, self_groups = normalize_self_attrs(dsl_groups.map { |g| g[1] })
78
78
 
79
79
  [dsl_ip_ranges, dsl_groups, self_ip_ranges, self_groups]
80
80
  end
81
81
 
82
- def normalize_self_attrs
82
+ def normalize_self_attrs(dsl_group_names)
83
83
  self_ip_ranges = (@permission.ip_ranges || []).sort
84
84
  self_groups = (@permission.groups || []).map {|i|
85
- [i.owner_id, i.name]
85
+ if dsl_group_names.include?(i.security_group_id)
86
+ [i.owner_id, i.security_group_id]
87
+ else
88
+ [i.owner_id, i.name]
89
+ end
86
90
  }.sort
87
91
 
88
92
  [self_ip_ranges, self_groups]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: piculet
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.9.beta4
4
+ version: 0.2.9.beta5
5
5
  platform: ruby
6
6
  authors:
7
7
  - winebarrel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-01-20 00:00:00.000000000 Z
11
+ date: 2016-03-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-v1