terraorg 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dcc3e713e1ec4a3166adfd99ecb9cccb52efd37f489fc18ff2393be0b79ac1a
-  data.tar.gz: 0d12305ad0d7f2aa129336010f719f0d1361c0d28b2fa9466c2c1205d280830b
+  metadata.gz: 7bd7aab93499335ed6575acc6c9e1df72dbac83e57b1086703ac950b2d440107
+  data.tar.gz: 4feba8047e97d182a3187d94cacb9fd229811499fe7195afc62550482dc7a3de
 SHA512:
-  metadata.gz: 19df8bcc655abfe6eb89a7d5e8d50d7f76298a492b14cb2f37369b17b2f396822897d264d6f861f215faabd0e74af0dc72a23756cac1e319c34d36a60c915783
-  data.tar.gz: c3b93acbeaa7f18f6f64c4343944649acf2630a99823b53fce3789c20fb1fa8a5be8bebf9159c2a48ae39eb96b5d4af1c669b23d879087a38104f36d330aeb09
+  metadata.gz: 168ba8345625402fe6de06dbba2ab30b7223127a2dfed994cf8fbba94beb977bf9d82efc35c88e71bc62d1b5c0f1580d1f843408c9bedd91be8e4f3fd318bb5f
+  data.tar.gz: 9f600fa6d33aa1de8db082826122f3bafc788d382ccd564ccd19904a5bc1a077f6520944db3c3fdc3621a633e240a1a59ceefd9ecd98582c092c9855193ba9d7

data/lib/terraorg/model/org.rb

@@ -15,7 +15,8 @@
 require 'terraorg/model/util'
 
 class Org
-  MAX_SQUADS_PER_PERSON = 2
+  MAX_MEMBER_SQUADS_PER_PERSON = 1
+  MAX_ASSOCIATE_SQUADS_PER_PERSON = 3
   SCHEMA_VERSION = 'v1'.freeze
 
   def initialize(parsed_data, platoons, squads, people, gsuite_domain)
@@ -81,17 +82,31 @@ class Org
       raise "Squads are part of more than one platoon: #{more_than_one_platoon}"
     end
 
-    # Validate that a squad member belongs to at most two squads in the entire org
+    # Validate that a squad member belongs to some maximum number of squads
+    # across the entire org. A person can be an associate of other squads
+    # at a different count. See top of file for defined limits.
     squad_count = {}
     all_squads.map(&:teams).flatten.map(&:values).flatten.map(&:members).flatten.each do |member|
       squad_count[member.id] = squad_count.fetch(member.id, 0) + 1
     end
     more_than_max_squads = squad_count.select do |member, count|
-      count > MAX_SQUADS_PER_PERSON
+      count > MAX_MEMBER_SQUADS_PER_PERSON
     end
     if !more_than_max_squads.empty?
-      # TODO(joshk): Enforce after consulting with Sean
-      $stderr.puts "WARNING: Members are part of more than #{MAX_SQUADS_PER_PERSON} squads: #{more_than_max_squads}"
+      # 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}"
+    end
+
+    associate_count = {}
+    all_squads.map(&:teams).flatten.map(&:values).flatten.map(&:associates).flatten.each do |assoc|
+      associate_count[assoc.id] = associate_count.fetch(assoc.id, 0) + 1
+    end
+    more_than_max_squads = associate_count.select do |_, count|
+      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}"
     end
 
     # Validate that a squad member is not also an org exception

data/lib/terraorg/model/platoon.rb

@@ -99,9 +99,9 @@ EOF
   # - Sort the squad ids lexically
   # - Sort the exceptions lexically
   def to_h
-    obj = { 'id' => @id, 'name' => @name, 'manager' => @manager.id, 'squads' => @member_squads.map(&:id) }
+    obj = { 'id' => @id, 'name' => @name, 'manager' => @manager.id, 'squads' => @member_squads.map(&:id).sort }
     unless @member_exceptions.empty?
-      obj['exceptions'] = @member_exceptions.map(&:id)
+      obj['exceptions'] = @member_exceptions.map(&:id).sort
     end
     unless @metadata.empty?
       obj['metadata'] = @metadata

data/lib/terraorg/model/squad.rb

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'countries'
+
 require 'terraorg/model/people'
 require 'terraorg/model/util'
 
@@ -19,23 +21,54 @@ class Squad
   attr_accessor :id, :name, :metadata, :teams
 
   class Team
-    attr_accessor :location, :members
+    attr_accessor :location, :members, :associates
 
     def initialize(parsed_data, people)
-      @location = parsed_data.fetch('location')
+      location = parsed_data.fetch('location')
+      country = ISO3166::Country.new(location)
+      raise "Location is invalid: #{location}" unless country
+      @location = country.alpha2
       @members = parsed_data.fetch('members', []).map do |n|
         people.get_or_create!(n)
       end
+      @associates = parsed_data.fetch('associates', []).map do |n|
+        people.get_or_create!(n)
+      end
+    end
+
+    def validate!
+      raise 'Subteam has no full time members' if @members.size == 0
+      # location validation done at initialize time
+      # associates can be empty
+
+      # associates and members must have zero intersection
+      associate_set = Set.new(@associates.map(&:id))
+      member_set = Set.new(@members.map(&:id))
+      raise 'A member cannot also be an associate of the same team' if associate_set.intersection(member_set)
     end
 
     # Output a canonical (sorted, formatted) version of this Team.
     # - Sort the members in each team
+    # - Only add an associates field if it's present
     def to_h
-      { 'location' => @location, 'members' => @members.map(&:id).sort }
+      rv = {
+        'location' => @location,
+        'members' => @members.map(&:id).sort,
+      }
+
+      if @associates.size > 0
+        rv['associates'] = @associates.map(&:id).sort
+      end
+
+      rv
+    end
+
+    def everyone
+      @associates + @members
     end
 
     def to_md
-      "**#{@location}**: #{@members.map(&:name).sort.join(', ')}"
+      "**#{@location}**: #{@members.map(&:name).sort.join(', ')}, #{@associates.map { |m| "_#{m.name}_" }.sort.join(', ')}"
     end
   end
 
@@ -53,10 +86,18 @@ class Squad
     @teams = Hash[teams_arr.map { |t| [t.location, t] }]
   end
 
-  def members(location: nil)
+  # Everyone including associates on all subteams in the squad.
+  def everyone(location: nil)
     @teams.select { |l, t|
       location == nil || l == location
-    }.map { |l, t|
+    }.map { |_, t|
+      t.everyone
+    }.flatten
+  end
+
+  # Full-time members of all subteams in this squad
+  def members
+    @teams.map { |_, t|
       t.members
     }.flatten
   end
@@ -64,11 +105,11 @@ class Squad
   def get_acl_groups(org_id)
     # each geographically located subteam
     groups = Hash[@teams.map { |location, team|
-      [unique_name(org_id, location), {'name' => "#{@name} squad members based in #{location}", 'members' => team.members}]
+      [unique_name(org_id, location), {'name' => "#{@name} squad members based in #{location}", 'members' => team.everyone}]
     }]
 
     # combination of all subteams
-    groups[unique_name(org_id, nil)] = {'name' => "#{@name} squad worldwide members", 'members' => members}
+    groups[unique_name(org_id, nil)] = {'name' => "#{@name} squad worldwide members", 'members' => everyone}
 
     groups
   end
@@ -82,7 +123,7 @@ class Squad
   end
 
   def validate!
-    raise 'Squad has no members' if members.size == 0
+    @teams.each(&:validate!)
   end
 
   def to_md(platoon_name, org_id)
@@ -94,11 +135,6 @@ class Squad
       sme = @people.get_or_create!(sme).name
     end
 
-    epo = @metadata.fetch('epo', '')
-    if !epo.empty?
-      epo = @people.get_or_create!(epo).name
-    end
-
     manager = @metadata.fetch('manager', '')
     if !manager.empty?
       manager = @people.get_or_create!(manager).name
@@ -110,8 +146,8 @@ class Squad
     if slack
       slack = "[#{slack}](https://#{@slack_domain}/app_redirect?channel=#{slack.gsub(/^#/, '')})"
     end
-    # platoon name, squad name, PM, email list, SME, slack, # people, squad manager, eng product owner, members
-    "|#{platoon_name}|#{@name}|#{pm}|[#{email}](#{email})|#{sme}|#{slack}|#{members.size}|#{manager}|#{epo}|#{subteam_members}|"
+    # platoon name, squad name, PM, email list, SME, slack, # full time members, squad manager, members
+    "|#{platoon_name}|#{@name}|#{pm}|[#{email}](#{email})|#{sme}|#{slack}|#{members.size}|#{manager}|#{subteam_members}|"
   end
 
   def generate_tf(org_id)

data/lib/terraorg/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: terraorg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joshua Kwan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: countries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement