lex-onboard 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945d2252b6dec50ef82d5ff441ef39099c146b0a1dbd7300e1eb9a10238f9bc3
-  data.tar.gz: 4213f845c3c1211175427ab0f98381c11832640da13556fbc30dcf7264723867
+  metadata.gz: 734d7a7131177c63cfa8f5ed51952c7b615ca3dcbae983656dd2e513ba6c0ff3
+  data.tar.gz: 0b13588fe6aab4675e595be3b4bcf185aacca1d31670f7727eb407a37b20399b
 SHA512:
-  metadata.gz: 966c8d189ef9f44a6c77c44b65eedcf582f4ac9dfca8dd2a6fc61223d48d29c7057aad5633095e08ad5d1bd94d5a3657dc225b5c13110ef36ae247eca3937946
-  data.tar.gz: 63bece2311db70ff269547be69007c130d302f5c415e1792aeea6e55ef905d77108bd1a2af880ae4b5bda5e67c7b92e1595c5662a0e64ea0eb6c17facd0b46f6
+  metadata.gz: 222dfc7792f88731d91cdf2816d43b55b6ace9ac6fefabddfdad3bf7ff6b3ef1434b0d7bf8c850b4542d536811e855c78cb3bcae8a3e3aa2fc1fc6cfe34061e2
+  data.tar.gz: 44e0ce419d40ee89ba7f887bcc890550b8f8a557a84d1812751d4d17bd2ccc497a08484625ad9b3b3155bb6662b894071b2ab4d0ebc68e5ec679445c2a08503b

data/lib/legion/extensions/onboard/runners/provision.rb

@@ -5,12 +5,13 @@ module Legion
     module Onboard
       module Runners
         module Provision
+          extend self
           include Validator
 
           ROLLBACK_ACTIONS = {
-            vault_namespace: ->(client, askid) { client.delete_namespace(name: askid) },
+            vault_namespace:  ->(client, askid) { client.delete_namespace(name: askid) },
             consul_partition: ->(client, askid) { client.delete_partition(name: askid) },
-            tfe_project: ->(client, askid) { client.delete_project(name: askid) }
+            tfe_project:      ->(client, askid) { client.delete_project(name: askid) }
           }.freeze
 
           def provision(askid:, tfe_organization: 'terraform.uhg.com', requester_slack_webhook: nil, **)
@@ -18,9 +19,7 @@ module Legion
             return { status: 'rejected', askid: askid, reason: validation[:reason] } unless validation[:valid]
 
             conflicts = check_conflicts(askid: askid)
-            unless conflicts[:conflicts].empty?
-              return { status: 'rejected', askid: askid, reason: "conflict in: #{conflicts[:conflicts].join(', ')}" }
-            end
+            return { status: 'rejected', askid: askid, reason: "conflict in: #{conflicts[:conflicts].join(', ')}" } unless conflicts[:conflicts].empty?
 
             completed_steps = []
             steps = []
@@ -52,7 +51,7 @@ module Legion
           end
 
           def rollback(completed_steps, askid:)
-            completed_steps.reverse.map do |step_name|
+            completed_steps.reverse.filter_map do |step_name|
               action = ROLLBACK_ACTIONS[step_name]
               next unless action
 
@@ -60,7 +59,7 @@ module Legion
               { step: step_name, status: 'rolled_back' }
             rescue StandardError => e
               { step: step_name, status: 'rollback_failed', error: e.message }
-            end.compact
+            end
           end
 
           def client_for_step(step_name)
@@ -72,9 +71,7 @@ module Legion
           end
 
           def vault_namespace(askid:)
-            unless defined?(Legion::Extensions::Vault::Client)
-              return { step: :vault_namespace, status: 'skipped', reason: 'vault unavailable' }
-            end
+            return { step: :vault_namespace, status: 'skipped', reason: 'vault unavailable' } unless defined?(Legion::Extensions::Vault::Client)
             return { step: :vault_namespace, status: 'skipped', reason: 'already exists' } if vault_exists?(askid)
 
             vault_client.create_namespace(name: askid)
@@ -84,9 +81,7 @@ module Legion
           end
 
           def consul_partition(askid:)
-            unless defined?(Legion::Extensions::Consul::Client)
-              return { step: :consul_partition, status: 'skipped', reason: 'consul unavailable' }
-            end
+            return { step: :consul_partition, status: 'skipped', reason: 'consul unavailable' } unless defined?(Legion::Extensions::Consul::Client)
             return { step: :consul_partition, status: 'skipped', reason: 'already exists' } if consul_exists?(askid)
 
             consul_client.create_partition(name: askid)
@@ -96,9 +91,7 @@ module Legion
           end
 
           def tfe_project(askid:, organization:)
-            unless defined?(Legion::Extensions::Tfe::Client)
-              return { step: :tfe_project, status: 'skipped', reason: 'tfe unavailable' }
-            end
+            return { step: :tfe_project, status: 'skipped', reason: 'tfe unavailable' } unless defined?(Legion::Extensions::Tfe::Client)
             return { step: :tfe_project, status: 'skipped', reason: 'already exists' } if tfe_exists?(askid)
 
             tfe_client.create_project(organization: organization, name: askid)
@@ -120,12 +113,12 @@ module Legion
           end
 
           def notify_requester(askid:, webhook: nil)
-            return true unless webhook && defined?(Legion::Extensions::Slack::Client)
+            return true unless webhook && defined?(Legion::Extensions::Slack::Client) # rubocop:disable Legion/Extension/RunnerReturnHash
 
             Legion::Extensions::Slack::Client.new.send_webhook(
               webhook: webhook, message: "Onboarding complete for #{askid}"
             )
-          rescue StandardError
+          rescue StandardError => _e
             true
           end
         end

data/lib/legion/extensions/onboard/runners/validator.rb

@@ -5,6 +5,8 @@ module Legion
     module Onboard
       module Runners
         module Validator
+          extend self
+
           ASKID_PATTERN = /\A[a-z0-9]([a-z0-9-]*[a-z0-9])?\z/
           MAX_ASKID_LENGTH = 63
 
@@ -13,7 +15,7 @@ module Legion
             return { valid: false, reason: "askid exceeds #{MAX_ASKID_LENGTH} characters" } if askid.length > MAX_ASKID_LENGTH
 
             unless askid.match?(ASKID_PATTERN)
-              return { valid: false,
+              return { valid:  false,
                        reason: 'askid format invalid — must be lowercase alphanumeric with hyphens' }
             end
 
@@ -32,26 +34,26 @@ module Legion
           private
 
           def vault_exists?(askid)
-            return false unless defined?(Legion::Extensions::Vault::Client)
+            return false unless defined?(Legion::Extensions::Vault::Client) # rubocop:disable Legion/Extension/RunnerReturnHash
 
             Legion::Extensions::Vault::Client.new.list_namespaces[:namespaces]&.include?(askid)
-          rescue StandardError
+          rescue StandardError => _e
             false
           end
 
           def consul_exists?(askid)
-            return false unless defined?(Legion::Extensions::Consul::Client)
+            return false unless defined?(Legion::Extensions::Consul::Client) # rubocop:disable Legion/Extension/RunnerReturnHash
 
             Legion::Extensions::Consul::Client.new.list_partitions[:partitions]&.any? { |p| p[:name] == askid }
-          rescue StandardError
+          rescue StandardError => _e
             false
           end
 
           def tfe_exists?(askid)
-            return false unless defined?(Legion::Extensions::Tfe::Client)
+            return false unless defined?(Legion::Extensions::Tfe::Client) # rubocop:disable Legion/Extension/RunnerReturnHash
 
             Legion::Extensions::Tfe::Client.new.list_projects[:projects]&.any? { |p| p[:name] == askid }
-          rescue StandardError
+          rescue StandardError => _e
             false
           end
         end

data/lib/legion/extensions/onboard/version.rb

@@ -3,7 +3,7 @@
 module Legion
   module Extensions
     module Onboard
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lex-onboard
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Esity