chore: Refactor enum definitions to Rails 8 format

ClarifiedSecurity · Oct 31, 2024 · 93a2838 · 93a2838
1 parent 3586b34
commit 93a2838
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 52 deletions.
diff --git a/app/models/actor.rb b/app/models/actor.rb
@@ -6,10 +6,7 @@ class Actor < ApplicationRecord
   has_ancestry
 
   attribute :default_visibility, :integer # rails bug during migrations
-  enum default_visibility: {
-    public: 1,
-    actor_only: 2
-  }, _prefix: :default_visibility
+  enum :default_visibility, { public: 1, actor_only: 2  }, prefix: :default_visibility
 
   belongs_to :exercise, touch: true
 

diff --git a/app/models/address.rb b/app/models/address.rb
@@ -11,7 +11,7 @@ class Address < ApplicationRecord
 
   delegate :exercise, to: :network
 
-  enum mode: {
+  enum :mode, {
     ipv4_static: 1,
     ipv4_dhcp: 2,
     ipv6_static: 3,
@@ -21,7 +21,7 @@ class Address < ApplicationRecord
     ipv6_uniqlocal: 7,
     ipv4_vip: 8,
     ipv6_vip: 9
-  }, _prefix: :mode, _default: 'ipv4_static'
+  }, prefix: :mode, default: 'ipv4_static'
 
   scope :all_ip_objects, -> {
     includes(:virtual_machine, :network)

diff --git a/app/models/address_pool.rb b/app/models/address_pool.rb
@@ -9,16 +9,8 @@ class AddressPool < ApplicationRecord
   has_one :exercise, through: :network
   has_many :addresses
 
-  enum ip_family: {
-    v4: 1,
-    v6: 2,
-  }, _prefix: :ip, _default: 'v4'
-
-  enum scope: {
-    default: 1,
-    mgmt: 2,
-    other: 999,
-  }, _prefix: :scope, _default: 'default'
+  enum :ip_family, { v4: 1, v6: 2 }, prefix: :ip, default: 'v4'
+  enum :scope, { default: 1, mgmt: 2, other: 999 }, prefix: :scope, default: 'default'
 
   validates :name, :ip_family, :scope, presence: true
   validates :network_address, format: {

diff --git a/app/models/check.rb b/app/models/check.rb
@@ -10,18 +10,9 @@ class Check < ApplicationRecord
   belongs_to :destination, polymorphic: true
   has_one :exercise, through: :service
 
-  enum protocol: Protocols.to_enum_hash, _prefix: :protocol
-
-  enum ip_family: {
-    v4v6: 0,
-    v4: 1,
-    v6: 2
-  }, _prefix: :ip_family
-
-  enum check_mode: {
-    network: 1,
-    special: 2
-  }, _prefix: :check_mode
+  enum :protocol, Protocols.to_enum_hash, prefix: :protocol
+  enum :ip_family, { v4v6: 0, v4: 1, v6: 2  }, prefix: :ip_family
+  enum :check_mode, { network: 1, special: 2 }, prefix: :check_mode
 
   def self.to_icon
     'fa-flask'

diff --git a/app/models/customization_spec.rb b/app/models/customization_spec.rb
@@ -10,10 +10,7 @@ class CustomizationSpec < ApplicationRecord
 
   friendly_id :api_id, use: [:slugged, :scoped], scope: :virtual_machine
 
-  enum mode: {
-    host: 1,
-    container: 2
-  }, _prefix: :mode, _default: 'host'
+  enum :mode, { host: 1, container: 2 }, prefix: :mode, default: 'host'
 
   scope :for_api, -> {
     includes(

diff --git a/app/models/exercise.rb b/app/models/exercise.rb
@@ -5,10 +5,7 @@ class Exercise < ApplicationRecord
   friendly_id :abbreviation, use: :slugged
   has_paper_trail
 
-  enum mode: {
-    exercise: 1,
-    infra: 2
-  }, _prefix: :mode
+  enum :mode, { exercise: 1, infra: 2 }, prefix: :mode
 
   has_many :actors, dependent: :destroy
   has_many :role_bindings, dependent: :destroy

diff --git a/app/models/network.rb b/app/models/network.rb
@@ -6,10 +6,7 @@ class Network < ApplicationRecord
   friendly_id :slug_candidates, use: [:slugged, :scoped], scope: :exercise
   has_paper_trail
 
-  enum visibility: {
-    public: 1,
-    actor_only: 2
-  }, _prefix: :visibility
+  enum :visibility, { public: 1, actor_only: 2 }, prefix: :visibility
 
   belongs_to :exercise
   belongs_to :actor

diff --git a/app/models/role_binding.rb b/app/models/role_binding.rb
@@ -4,14 +4,14 @@ class RoleBinding < ApplicationRecord
   belongs_to :exercise
   belongs_to :actor, optional: true
 
-  enum role: {
+  enum :role, {
     environment_member: 1,
     environment_net_dev: 2,
     environment_service_dev: 3,
     environment_admin: 4,
     actor_readonly: 5,
     actor_dev: 6
-  }, _prefix: :role
+  }, prefix: :role
 
   scope :for_user, ->(user) {
     where(user_email: user.email)

diff --git a/app/models/virtual_machine.rb b/app/models/virtual_machine.rb
@@ -6,16 +6,7 @@ class VirtualMachine < ApplicationRecord
   include SpecCacheUpdateBeforeDestroy
   has_paper_trail
 
-  # TO BE REMOVED
-  enum deploy_mode: {
-    single: 0,
-    bt: 1
-  }, _prefix: :deploy_mode
-
-  enum visibility: {
-    public: 1,
-    actor_only: 2
-  }, _prefix: :visibility
+  enum :visibility, { public: 1, actor_only: 2  }, prefix: :visibility
 
   belongs_to :exercise
   belongs_to :actor