seira 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cedfa6841e5eaab7d04673e58182a6eeed7309999ebca2571fba54a2da8379e
-  data.tar.gz: ac45a36439ed8e56e856f6ecf917d848606b14b85752e034bacd86def1a90241
+  metadata.gz: 5308da7fa9f186ee201c09b028df22b1b55adf32908bff5b01af79cbebb5ebb9
+  data.tar.gz: 0b51dbcc1ea03797265ec75cae09eeef3a530a4d0822236087fc134c57944d8b
 SHA512:
-  metadata.gz: '0946ca82098b4c329f04d91a6b8aefd831baa887ba638712e8779ded8494aac3883c9a09e79c49aa916102a758fab822e89ef42a0ed53a36cf0cb7b1f70bc10b'
-  data.tar.gz: 9fd9290e4778264498de98cdf37a55fe8bb67cd431c76410c6cc25fe0ea5fef120415a9dad4101fecb6828c1816daab254142b183c47cc41fc135b24a7ef1891
+  metadata.gz: 32920e089d26ca317373a577827393fc5ec276b80546cae3cb306606b9f531c51cb9aec818caebe7dfbcbf0d2ede6e71059d5cfaeb127a22d2eef06377c8c493
+  data.tar.gz: cba266956e025a7fea94a634f049215304788f3e09ba6880b810fb391653d508fe166249e9a45b97a4567c096386e1d48eb74fc80ef19b3b397418d8bf0f37cd

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/.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/pods.rb

@@ -70,7 +70,6 @@ module Seira
       pod_name = pod_name
       dedicated = false
       command = 'sh'
-
       args.each do |arg|
         if arg.start_with? '--tier='
           tier = arg.split('=')[1]
@@ -181,7 +180,7 @@ module Seira
 
     def connect_to_pod(name, command = 'sh')
       puts "Connecting to #{name}..."
-      system("kubectl exec -ti #{name} --namespace=#{app} -- #{command}")
+      system("kubectl exec -ti #{name} --namespace=#{app} -- #{context[:settings].terminal_prefix(app, context[:cluster])} #{command}")
     end
   end
 end

data/lib/seira/settings.rb

@@ -94,6 +94,17 @@ module Seira
       requirements.map { |r| Seira::Teleport::RoleRequirement.new(r) }
     end
 
+    def terminal_prefix(application, cluster)
+      settings['seira']['applications'].each do |app|
+        if app['name'] == application
+          return app.fetch('terminal_prefix', '') if app['terminal_prefix_envs'].nil? 
+          return app.fetch('terminal_prefix', '') if app['terminal_prefix_envs'].include? cluster
+
+          return '' 
+        end
+      end
+    end
+
     private
 
     def parse_settings

data/lib/seira/version.rb

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

data/lib/seira.rb

@@ -127,7 +127,14 @@ module Seira
         status = Seira::Teleport::Status.new
 
         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
+          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
 
@@ -180,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -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