uffizzi_core 2.1.4 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/controller_modules/uffizzi_core/api/cli/v1/projects/deployments_controller_module.rb +5 -1
  3. data/app/controller_modules/uffizzi_core/api/cli/v1/projects_controller_module.rb +7 -0
  4. data/app/controllers/uffizzi_core/api/cli/v1/application_controller.rb +8 -0
  5. data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments_controller.rb +2 -1
  6. data/app/controllers/uffizzi_core/api/cli/v1/projects_controller.rb +5 -5
  7. data/lib/uffizzi_core/version.rb +1 -1
  8. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 31b523abfb135f26506fe25a9e6a74a90906f8fdb715ed167613d88869c1da7c
4
- data.tar.gz: 387de06335635d9830d4120636100b75042fedd59221c16688c5f219c5a5a396
3
+ metadata.gz: 5ee784d18da14d2c52e81eb198cf5618e13be8922a87d8eb83a5d981d8e4d1d1
4
+ data.tar.gz: b269cb27d6b2f4a7d74ae56ef412a1adf394b14dcc9c6b41db245cca31d20d6d
5
5
  SHA512:
6
- metadata.gz: 92172c981d9c5883dd1ab8f6dc6f7c708a6a73e94c6dcba9193dd5f95ef1daf894db88172a1eed229a319baba70c8cb5a1058072209e821f884a6505ee116b69
7
- data.tar.gz: 938c57b21171b791af729fb02eff4e964836329f4ec218a5b0bf00c208a8ac53e016e9a99b9ffbdf1ffcaa58a7b7e8b4345df1dee6113fa053e5a13f1257f032
6
+ metadata.gz: a3927916bb55e90af147c152f7bb86065f0eadbb75ec677e0a1aa69fb395e5c4b1f9d3764e57e9aea3ebb3006d7cf2365f8c444e84561f122670ba3ff72c978a
7
+ data.tar.gz: be4cc536ed1bd57888096be85723eb56446f24d760c387baa3f13e6891972f47fd641f41fcd14048465184be13241cea0473b65a79a60d4662464e59fc1bb71b
data/app/controller_modules/uffizzi_core/api/cli/v1/projects/deployments_controller_module.rb CHANGED
@@ -1,5 +1,9 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module UffizziCore::Api::Cli::V1::Projects::DeploymentsControllerModule
4
- def check_account_state; end
4
+ private
5
+
6
+ def stop_if_deployment_forbidden; end
7
+
8
+ def update_show_trial_quota_exceeded_warning; end
5
9
  end
data/app/controller_modules/uffizzi_core/api/cli/v1/projects_controller_module.rb ADDED
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ module UffizziCore::Api::Cli::V1::ProjectsControllerModule
4
+ private
5
+
6
+ def update_show_trial_quota_exceeded_warning; end
7
+ end
data/app/controllers/uffizzi_core/api/cli/v1/application_controller.rb CHANGED
@@ -2,4 +2,12 @@
2
2
 
3
3
  class UffizziCore::Api::Cli::V1::ApplicationController < UffizziCore::ApplicationController
4
4
  before_action :authenticate_request!
5
+
6
+ def resource_project
7
+ @resource_project ||= current_user.projects.find_by!(slug: params[:slug])
8
+ end
9
+
10
+ def resource_account
11
+ @resource_account ||= resource_project.account
12
+ end
5
13
  end
data/app/controllers/uffizzi_core/api/cli/v1/projects/deployments_controller.rb CHANGED
@@ -6,7 +6,8 @@ class UffizziCore::Api::Cli::V1::Projects::DeploymentsController < UffizziCore::
6
6
  include UffizziCore::Api::Cli::V1::Projects::DeploymentsControllerModule
7
7
 
8
8
  before_action :authorize_uffizzi_core_api_cli_v1_projects_deployments
9
- before_action :check_account_state, only: [:create, :update]
9
+ before_action :stop_if_deployment_forbidden, only: :create
10
+ after_action :update_show_trial_quota_exceeded_warning, only: :destroy
10
11
 
11
12
  # Get a list of active deployements for a project
12
13
  #
data/app/controllers/uffizzi_core/api/cli/v1/projects_controller.rb CHANGED
@@ -3,7 +3,10 @@
3
3
  # @resource Project
4
4
 
5
5
  class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1::ApplicationController
6
+ include UffizziCore::Api::Cli::V1::ProjectsControllerModule
7
+
6
8
  before_action :authorize_uffizzi_core_api_cli_v1_projects
9
+ after_action :update_show_trial_quota_exceeded_warning, only: :destroy
7
10
 
8
11
  # Get projects of current user
9
12
  #
@@ -48,12 +51,9 @@ class UffizziCore::Api::Cli::V1::ProjectsController < UffizziCore::Api::Cli::V1:
48
51
  params.require(:project)
49
52
  end
50
53
 
51
- def resource_project
52
- @resource_project ||= current_user.projects.find_by(slug: params[:slug])
53
- end
54
-
55
54
  def policy_context
56
- account = resource_project&.account || current_user.default_account
55
+ current_project = current_user.projects.find_by(slug: params[:slug])
56
+ account = current_project&.account || current_user.default_account
57
57
 
58
58
  UffizziCore::AccountContext.new(current_user, user_access_module, account, params)
59
59
  end
data/lib/uffizzi_core/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module UffizziCore
4
- VERSION = '2.1.4'
4
+ VERSION = '2.1.5'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: uffizzi_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.4
4
+ version: 2.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Thurman
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2023-02-09 00:00:00.000000000 Z
12
+ date: 2023-02-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: aasm
@@ -749,6 +749,7 @@ files:
749
749
  - app/contexts/uffizzi_core/project_context.rb
750
750
  - app/contexts/uffizzi_core/webhooks_context.rb
751
751
  - app/controller_modules/uffizzi_core/api/cli/v1/projects/deployments_controller_module.rb
752
+ - app/controller_modules/uffizzi_core/api/cli/v1/projects_controller_module.rb
752
753
  - app/controllers/concerns/uffizzi_core/auth_management.rb
753
754
  - app/controllers/concerns/uffizzi_core/authorization_concern.rb
754
755
  - app/controllers/concerns/uffizzi_core/dependency_injection_concern.rb