seira 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb319292b2073d2caa5a7d526f70b7f6a707dfa8a7e8b7eba014d488c1ce50ee
-  data.tar.gz: b6dfc7dd336518acc1d510177d8eff2f02252351cece68e57c68d9019272d674
+  metadata.gz: 0cedfa6841e5eaab7d04673e58182a6eeed7309999ebca2571fba54a2da8379e
+  data.tar.gz: ac45a36439ed8e56e856f6ecf917d848606b14b85752e034bacd86def1a90241
 SHA512:
-  metadata.gz: 137620c27df4b7fb22580bb33249d8c6ea6b087f2203205b73f844eef456b20342af2f9c753264439e390ec9c82ad1e47dcda719885cd57ba2a980dbe9803ad9
-  data.tar.gz: f40b95e33ab48142deb3673b804507f7f9bf91e37b7a66827e92feb5afbdfaadf59032d6ea3d1848be956037037cd2f4e5d9910a8b442e0b86d34ff2a7b58cfe
+  metadata.gz: '0946ca82098b4c329f04d91a6b8aefd831baa887ba638712e8779ded8494aac3883c9a09e79c49aa916102a758fab822e89ef42a0ed53a36cf0cb7b1f70bc10b'
+  data.tar.gz: 9fd9290e4778264498de98cdf37a55fe8bb67cd431c76410c6cc25fe0ea5fef120415a9dad4101fecb6828c1816daab254142b183c47cc41fc135b24a7ef1891

data/.github/workflows/ruby.yml

@@ -5,18 +5,16 @@ on: push
 jobs:
   test:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        ruby-version: ['2.6.3', '2.7.2']
+        ruby-version: ['2.6.3', '2.7.4']
 
     steps:
-      # Pin to this commit: v2
-      - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      - uses: actions/checkout@v3.5.3
       - name: Set up Ruby
-        # Pin to this commit, v1.82.0
-        uses: ruby/setup-ruby@5e4f0a10bfc39c97cd5358121291e27e5d97e09b
+        uses: ruby/setup-ruby@v1.152.0
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - bin/**/*
 
-  TargetRubyVersion: 2.5.3
+  TargetRubyVersion: 2.7.7
 
 Rails:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+2.7.7

data/lib/seira/teleport/request.rb

@@ -1,8 +1,8 @@
 module Seira
   module Teleport
     class Request
-      def initialize(role, reviewer: nil, context: nil)
-        @role = role
+      def initialize(roles, reviewer: nil, context: nil)
+        @roles = roles.kind_of?(Array) ? roles.join(",") : roles
         @reviewer = reviewer
         @context = context
       end
@@ -12,7 +12,7 @@ module Seira
       end
       
       def cmd
-        cmd = "request create --roles '#{@role}'"
+        cmd = "request create --roles '#{@roles}'"
         cmd += " --reason '#{reason}'"
         cmd += " --reviewers #{@reviewer}" unless @reviewer.nil?
         

data/lib/seira/teleport/role_requirements.rb

@@ -3,13 +3,13 @@ module Seira
     class RoleRequirement
       include Comparable
 
-      attr_reader :commands, :category, :role
+      attr_reader :commands, :category, :roles
 
       def initialize(requirement)
         @requirement = requirement
         @category = requirement['category']
         @commands = requirement['commands']
-        @role = requirement['role']
+        @roles = requirement['roles']
       end
 
       def matches?(category, command)

data/lib/seira/teleport/status.rb

@@ -50,7 +50,7 @@ module Seira
         if out == ''
           {}
         else  
-          JSON.parse(cmd.invoke(clean_output: true, return_output: true))
+          JSON.parse(out)
         end
       end
     end

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.8.1".freeze
+  VERSION = "0.8.2".freeze
 end

data/lib/seira.rb

@@ -121,11 +121,13 @@ module Seira
 
       if settings.use_teleport?(cluster)
         role_requirements = settings.teleport_role_requirements(cluster)
-        required_role = role_requirements.filter { |rr| rr.matches?(category, action) }.sort.first&.role
+        filtered_requirements = role_requirements.filter { |rr| rr.matches?(category, action) }
+        required_roles = filtered_requirements.map(&:roles).reduce([]) { |a, b| a + b }.uniq
+
         status = Seira::Teleport::Status.new
 
-        unless required_role.nil? || status.has_role?(required_role)
-          Seira::Teleport::Request.new(required_role, reviewer: ENV['TELEPORT_REVIEWER'], context: passed_context).invoke
+        unless required_roles.empty? || required_roles.any? { |r| status.has_role?(r) }
+          Seira::Teleport::Request.new(required_roles, reviewer: ENV['TELEPORT_REVIEWER'], context: passed_context).invoke
         end
       end
 

data/seira.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "colorize"
 
   spec.add_development_dependency "bundler", "~> 2"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "0.54.0"
-end
+  spec.add_development_dependency "rubocop", "0.93.1"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.93.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.54.0
+        version: 0.93.1
 description: An opinionated library for building applications on Kubernetes.
 email:
 - scott@joinhandshake.com
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: An opinionated library for building applications on Kubernetes.