seira 0.8.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb319292b2073d2caa5a7d526f70b7f6a707dfa8a7e8b7eba014d488c1ce50ee
-  data.tar.gz: b6dfc7dd336518acc1d510177d8eff2f02252351cece68e57c68d9019272d674
+  metadata.gz: e10cda9c969f7e1401f200a538d380f397c1061f4040bef400961a9b74b28b93
+  data.tar.gz: 66f4790fa1d7fb8b5ea58d7bb798206cb375d2329b12a029714003f45633e9af
 SHA512:
-  metadata.gz: 137620c27df4b7fb22580bb33249d8c6ea6b087f2203205b73f844eef456b20342af2f9c753264439e390ec9c82ad1e47dcda719885cd57ba2a980dbe9803ad9
-  data.tar.gz: f40b95e33ab48142deb3673b804507f7f9bf91e37b7a66827e92feb5afbdfaadf59032d6ea3d1848be956037037cd2f4e5d9910a8b442e0b86d34ff2a7b58cfe
+  metadata.gz: f0534e0ab281bdd9667f8bae85a72464dadc042d3bed0a79f784251df7a3e15b2fd76809efd19fd1edcee5b78697ff8392245a347a98ee2bd451c6d7d19a341d
+  data.tar.gz: e85b638eeef614999f8c67dc40933f43ce61e2180fe020fb81cc22e79c67a1a2de6b57c1904062c57fb80c3c7c57264c129d1d75a333876b423fab629d355a81

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/.github/workflows/trunk.yml

@@ -0,0 +1,21 @@
+name: Trunk Check
+on: [pull_request]
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions: read-all
+
+jobs:
+  trunk_check:
+    runs-on: ubuntu-latest
+    permissions:
+      checks: write # For trunk to post annotations
+      contents: read # For repo checkout
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Trunk Check
+        uses: trunk-io/trunk-action@v1.1.7

data/.ruby-version

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

data/.trunk/.gitignore

@@ -0,0 +1,8 @@
+*out
+*logs
+*actions
+*notifications
+*tools
+plugins
+user_trunk.yaml
+user.yaml

data/.trunk/configs/.markdownlint.yaml

@@ -0,0 +1,10 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: false
+bullet: false
+html: false
+indentation: false
+line_length: false
+spaces: false
+url: false
+whitespace: false

data/.trunk/configs/.shellcheckrc

@@ -0,0 +1,7 @@
+enable=all
+source-path=SCRIPTDIR
+disable=SC2154
+
+# If you're having issues with shellcheck following source, disable the errors via:
+# disable=SC1090
+# disable=SC1091

data/.trunk/configs/.yamllint.yaml

@@ -0,0 +1,10 @@
+rules:
+  quoted-strings:
+    required: only-when-needed
+    extra-allowed: ["{|}"]
+  empty-values:
+    forbid-in-block-mappings: true
+    forbid-in-flow-mappings: true
+  key-duplicates: {}
+  octal-values:
+    forbid-implicit-octal: true

data/.trunk/trunk.yaml

@@ -0,0 +1,34 @@
+version: 0.1
+cli:
+  version: 1.14.1
+plugins:
+  sources:
+    - id: trunk
+      ref: v1.2.1
+      uri: https://github.com/trunk-io/plugins
+runtimes:
+  enabled:
+    - go@1.19.5
+    - node@18.12.1
+    - python@3.10.8
+    - ruby@3.1.4
+lint:
+  enabled:
+    - actionlint@1.6.25
+    - checkov@2.4.6
+    - git-diff-check
+    - markdownlint@0.35.0
+    - prettier@3.0.2
+    - shellcheck@0.9.0
+    - shfmt@3.6.0
+    - trivy@0.44.1
+    - trufflehog@3.48.0
+    - yamllint@1.32.0
+  disabled:
+    - rubocop@1.39.0
+actions:
+  enabled:
+    - trunk-announce
+    - trunk-check-pre-push
+    - trunk-fmt-pre-commit
+    - trunk-upgrade-available

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.3".freeze
 end

data/lib/seira.rb

@@ -121,11 +121,20 @@ 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) }
+          reviewer = ENV['TELEPORT_REVIEWER']
+          args.each do |arg|
+            if arg.start_with? '--reviewer='
+              reviewer = arg.split('=')[1]
+            end
+          end
+
+          Seira::Teleport::Request.new(required_roles, reviewer: reviewer, context: passed_context).invoke
         end
       end
 
@@ -178,7 +187,9 @@ module Seira
 
       # The first arg must always be the cluster. This ensures commands are not run by
       # accident on the wrong kubernetes cluster or gcloud project.
-      exit(1) unless Seira::Cluster.new(action: nil, args: nil, context: nil, settings: settings).switch(target_cluster: cluster, verbose: false)
+      exit(1) unless Seira::Cluster.new(action: nil, args: nil, context: nil, settings: settings).switch(
+        target_cluster: cluster, verbose: false
+      )
       exit(0) if simple_cluster_change?
     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.3
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-23 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
@@ -102,13 +102,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".default-rubocop.yml"
 - ".github/workflows/ruby.yml"
+- ".github/workflows/trunk.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
-- ".rubocop.yml"
 - ".ruby-version"
+- ".trunk/.gitignore"
+- ".trunk/configs/.markdownlint.yaml"
+- ".trunk/configs/.shellcheckrc"
+- ".trunk/configs/.yamllint.yaml"
+- ".trunk/trunk.yaml"
 - Gemfile
 - LICENSE
 - README.md
@@ -163,7 +167,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.