terraorg 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e495604f197ced6264c00cea8607d7c846fd65179e024eaeabcf4ea3e28fb7
-  data.tar.gz: b24f650f9f48b5707b10f2cf4422e7cca438f257a57b0f5276abb90d34f5115c
+  metadata.gz: ce81d4e08d1d925fbf0cc419b5012725e33190563592d8ad491bf52a39df2920
+  data.tar.gz: 1854959244ef5576f9c39f3079ae73e7af243f591c972e3f79ecfb9729a87445
 SHA512:
-  metadata.gz: 634029af22269e47401fa78d47f11aa34dbe0cff1343459db6d344a9c496a02ba9d2ed97c3d2bae5dc95a4a01e44cbdb794160459a7ffb23d33c9c360f96acd0
-  data.tar.gz: 51d2f8ddebbe751e2e935ce30d68c111b090a500fa35edf61f4ed9011d63ccb388f2d4e04b719c2eb31b6012f871cafba4088bbab3eb9f97662d3751e62ccc39
+  metadata.gz: 498d390c6eb73ff5761ccc40e8a0918d8c0e1ec8ac21d2d5862a9d9b0c7da514e574849a853cb9fce4b8516625bcb72ef6bcc39b2de52e80cbf13fef6e62a5a8
+  data.tar.gz: 72575c047b7565108453002e809fa2c76346e6a8998f04ff52750c065ecb48eb1b9235f0d0a6cd2e967b81292e30a668d91339b9d1bc26e7fc520669a47a750f

data/bin/terraorg

@@ -31,6 +31,7 @@ ACTIONS = [
   'validate'
 ].freeze
 
+STRICT_VALIDATION = ENV.fetch('TERRAORG_STRICT_VALIDATION', 'true')
 SQUADS_FILE = ENV.fetch('TERRAORG_SQUADS', 'squads.json')
 PLATOONS_FILE = ENV.fetch('TERRAORG_PLATOONS', 'platoons.json')
 ORG_FILE = ENV.fetch('TERRAORG_ROOT', 'org.json')
@@ -95,7 +96,8 @@ platoons = Platoons.new(JSON.parse(platoons_data), squads, people, GSUITE_DOMAIN
 org_data = File.read(ORG_FILE)
 org = Org.new(JSON.parse(org_data), platoons, squads, people, GSUITE_DOMAIN)
 
-org.validate!
+strict = (STRICT_VALIDATION == 'true')
+org.validate!(strict: strict)
 
 case action
 when 'generate-squads-md'

data/lib/terraorg/model/org.rb

@@ -49,23 +49,33 @@ class Org
     @squads = squads
   end
 
-  def validate!
+  def validate!(strict: true)
+    failure = false
+
     # Do not allow the JSON files to contain any people who have left.
-    raise "Users have left the company: #{@people.inactive.map(&:id).join(', ')}" unless @people.inactive.empty?
+    unless @people.inactive.empty?
+      $stderr.puts "ERROR: Users have left the company: #{@people.inactive.map(&:id).join(', ')}"
+      failure = true
+    end
 
     # Do not allow the org to be totally empty.
-    raise 'Org has no platoons or exception squads' if @member_platoons.size + @member_exception_squads.size == 0
+    if @member_platoons.size + @member_exception_squads.size == 0
+      $stderr.puts 'ERROR: Org has no platoons or exception squads'
+      failure = true
+    end
 
     # Require all platoons to be part of the org.
     platoon_diff = Set.new(@platoons.all_names) - Set.new(@member_platoon_names)
     unless platoon_diff.empty?
-      raise "Platoons are not used in the org: #{platoon_diff.to_a.sort}"
+      $stderr.puts "ERROR: Platoons are not used in the org: #{platoon_diff.to_a.sort}"
+      failure = true
     end
 
     # Require all squads to be used in the org.
     squad_diff = Set.new(@squads.all_names) - Set.new(@platoons.all_squad_names) - Set.new(@member_exception_squad_names)
     unless squad_diff.empty?
-      raise "Squad(s) are not used in the org: #{squad_diff.to_a.sort}"
+      $stderr.puts "ERROR: Squad(s) are not used in the org: #{squad_diff.to_a.sort}"
+      failure = true
     end
 
     all_squads = (@member_platoons.map(&:member_squads) + @member_exception_squads).flatten
@@ -79,7 +89,8 @@ class Org
       count > 1
     end
     if !more_than_one_platoon.empty?
-      raise "Squads are part of more than one platoon: #{more_than_one_platoon}"
+      $stderr.puts "ERROR: Squads are part of more than one platoon: #{more_than_one_platoon}"
+      failure = true
     end
 
     # Validate that a squad member belongs to some maximum number of squads
@@ -93,8 +104,8 @@ class Org
       count > MAX_MEMBER_SQUADS_PER_PERSON
     end
     if !more_than_max_squads.empty?
-      # TODO(joshk): Enforce after April 17th
-      $stderr.puts "WARNING: Members are part of more than #{MAX_MEMBER_SQUADS_PER_PERSON} squads: #{more_than_max_squads}"
+      $stderr.puts "ERROR: People are members of more than #{MAX_MEMBER_SQUADS_PER_PERSON} squads: #{more_than_max_squads}"
+      failure = true
     end
 
     associate_count = {}
@@ -105,8 +116,8 @@ class Org
       count > MAX_ASSOCIATE_SQUADS_PER_PERSON
     end
     if !more_than_max_squads.empty?
-      # TODO(joshk): Enforce after April 17th
-      $stderr.puts "WARNING: People associated with more than #{MAX_ASSOCIATE_SQUADS_PER_PERSON} squads: #{more_than_max_squads}"
+      $stderr.puts "ERROR: People are associates of more than #{MAX_ASSOCIATE_SQUADS_PER_PERSON} squads: #{more_than_max_squads}"
+      failure = true
     end
 
     # Validate that a squad member is not also an org exception
@@ -115,8 +126,11 @@ class Org
       exceptions.member? member
     end
     if !exception_and_squad_member.empty?
-      raise "Exception members are also squad members: #{exception_and_squad_member}"
+      $stderr.puts "ERROR: Exception members are also squad members: #{exception_and_squad_member}"
+      failure = true
     end
+
+    raise "CRITICAL: Validation failed due to at least one error above" if failure && strict
   end
 
   def members

data/lib/terraorg/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module Terraorg
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraorg
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Joshua Kwan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries