uffizzi_core 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b888a8d1591e641bb45316b744f8c7b71352104761401b3388590edb75a1cfee
-  data.tar.gz: efec514c14a589b68da1bb42fe28e7bbdf7569ab6bfc1b4ea22ba8b2b4f14b88
+  metadata.gz: 7022668d1f77cf69c6d793ec22992f029947adad2ec8e735e6c319e632a7f745
+  data.tar.gz: 56bcce7234c9a6e8d194195624b621322d5aa18630dbd1c29ecb16987b6e9cc6
 SHA512:
-  metadata.gz: 30dc824b604d9c770645a86853f96dd251826d1ddb0e4429b14697fc16a56e891854eac9ac20eeaea12f6aae76f9921ebb2e203517281585a6326eba93483b30
-  data.tar.gz: c732982588d01d53a65cbb090acfd244b5b8c6c5dcf272ad80a3bc37e02797dcf2d5d06df252ffbc2b5e982ff1a165d1b44ba527d95fc38c411103eee41d265e
+  metadata.gz: e6ae611e6ec7dc0dd3f20fbc465ff03f7d2504a18e950145b8ef9925ccffff4f8477e1ecaf3f6ccfdc7150d848669e5a884b26bd2ddbfb904c5deeb377a8b96e
+  data.tar.gz: f4d09c156e135e44e56c79ae94d906e876767a330f7d09576b511637e8d8d264db104846b3cc3ca0a101ec2ca45dcaab68335a13e3c7e442bf5be21390b31f71

data/app/controllers/uffizzi_core/api/cli/v1/account/credentials_controller.rb

@@ -40,6 +40,27 @@ class UffizziCore::Api::Cli::V1::Account::CredentialsController < UffizziCore::A
     respond_with credential_form
   end
 
+  # Update existing credential of the given type
+  #
+  # @path [PUT] /api/cli/v1/account/credentials/{type}
+  #
+  # @parameter type(required,path) [string] Credential type
+  # @parameter credential(required,body) [object<type:string>]
+  # @response [object<id:integer, registry_url:string, username:string, password:string>] 200 OK
+  # @response [object<errors>] 422 Unprocessable entity
+  def update
+    credential = resource_account.credentials.find_by!(type: params[:type])
+    credential_form = credential.becomes(UffizziCore::Api::Cli::V1::Account::Credential::UpdateForm)
+    credential_form.assign_attributes(credential_params)
+
+    if credential_form.save
+      UffizziCore::Account::UpdateCredentialJob.perform_async(credential_form.id)
+      respond_with credential_form
+    else
+      respond_with credential_form, status: :unprocessable_entity
+    end
+  end
+
   # Check if credential of the type already exists in the account
   #
   # @path [GET] /api/cli/v1/account/credentials/{type}/check_credential

data/app/forms/uffizzi_core/api/cli/v1/account/credential/check_credential_form.rb

@@ -11,6 +11,6 @@ class UffizziCore::Api::Cli::V1::Account::Credential::CheckCredentialForm
   private
 
   def credential_exists?
-    errors.add(:type, 'Credential of that type already exist.') if account.credentials.by_type(type).exists?
+    errors.add(:type, :exist) if account.credentials.by_type(type).exists?
   end
 end

data/app/forms/uffizzi_core/api/cli/v1/account/credential/update_form.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class UffizziCore::Api::Cli::V1::Account::Credential::UpdateForm < UffizziCore::Credential
+  include UffizziCore::ApplicationForm
+
+  permit :registry_url, :username, :password
+
+  validates :password, presence: { message: :password_blank }
+  validate :check_registry_url, if: -> { errors[:password].empty? }
+  validate :check_credential_correctness, if: -> { errors[:password].empty? }
+
+  private
+
+  def check_registry_url
+    errors.add(:registry_url, :invalid_scheme) if URI.parse(registry_url).scheme.nil?
+  end
+
+  def check_credential_correctness
+    errors.add(:username, :incorrect) unless UffizziCore::CredentialService.correct_credentials?(self)
+  end
+end

data/app/jobs/uffizzi_core/account/update_credential_job.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class UffizziCore::Account::UpdateCredentialJob < UffizziCore::ApplicationJob
+  sidekiq_options queue: :accounts, retry: 5
+
+  def perform(id)
+    credential = UffizziCore::Credential.find(id)
+    UffizziCore::AccountService.update_credential(credential)
+  end
+end

data/app/jobs/uffizzi_core/deployment/update_credential_job.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class UffizziCore::Deployment::UpdateCredentialJob < UffizziCore::ApplicationJob
+  sidekiq_options queue: :deployments, retry: Settings.controller.resource_update_retry_count
+
+  sidekiq_retry_in do |count, exception|
+    case exception
+    when UffizziCore::DeploymentNotFoundError
+      Rails.logger.info("DEPLOYMENT_PROCESS UpdateCredentialJob retry deployment_id=#{exception.deployment_id} count=#{count}")
+      Settings.controller.resource_update_retry_time
+    end
+  end
+
+  def perform(deployment_id, credential_id)
+    Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment_id} UpdateCredentialJob(cred_id:#{credential_id})")
+
+    deployment = UffizziCore::Deployment.find(deployment_id)
+    credential = UffizziCore::Credential.find(credential_id)
+
+    if deployment.disabled?
+      Rails.logger.info("DEPLOYMENT_PROCESS deployment_id=#{deployment.id} deployment was disabled. Stop updating credential")
+      return
+    end
+
+    unless UffizziCore::ControllerService.deployment_exists?(deployment)
+      raise UffizziCore::DeploymentNotFoundError,
+            deployment_id
+    end
+
+    UffizziCore::ControllerService.apply_credential(deployment, credential)
+  end
+end

data/app/policies/uffizzi_core/api/cli/v1/account/credentials_policy.rb

@@ -9,6 +9,10 @@ class UffizziCore::Api::Cli::V1::Account::CredentialsPolicy < UffizziCore::Appli
     context.user_access_module.admin_access_to_account?(context.user, context.account)
   end
 
+  def update?
+    context.user_access_module.admin_access_to_account?(context.user, context.account)
+  end
+
   def check_credential?
     context.user_access_module.admin_access_to_account?(context.user, context.account)
   end

data/app/repositories/uffizzi_core/deployment_repo.rb

@@ -9,5 +9,8 @@ module UffizziCore::DeploymentRepo
     }
     scope :with_amazon_repos, -> { includes(containers: [:repo]).where(containers: { repos: { type: UffizziCore::Repo::Amazon.name } }) }
     scope :existed, -> { where(state: [:active, :failed]) }
+    scope :active_for_credential_id, ->(credential_id) {
+      active.joins(project: :credentials).merge(UffizziCore::Project.active).where(credentials: { id: credential_id })
+    }
   end
 end

data/app/services/uffizzi_core/account_service.rb

@@ -3,18 +3,20 @@
 class UffizziCore::AccountService
   class << self
     def create_credential(credential)
-      credential.account.projects.active.each do |project|
-        project.deployments.active.each do |deployment|
-          UffizziCore::Deployment::CreateCredentialJob.perform_async(deployment.id, credential.id)
-        end
+      UffizziCore::Deployment.active_for_credential_id(credential.id).pluck(:id).each do |deployment_id|
+        UffizziCore::Deployment::CreateCredentialJob.perform_async(deployment_id, credential.id)
+      end
+    end
+
+    def update_credential(credential)
+      UffizziCore::Deployment.active_for_credential_id(credential.id).pluck(:id).each do |deployment_id|
+        UffizziCore::Deployment::UpdateCredentialJob.perform_async(deployment_id, credential.id)
       end
     end
 
     def delete_credential(credential)
-      credential.account.projects.active.each do |project|
-        project.deployments.active.each do |deployment|
-          UffizziCore::Deployment::DeleteCredentialJob.perform_async(deployment.id, credential.id)
-        end
+      UffizziCore::Deployment.active_for_credential_id(credential.id).pluck(:id).each do |deployment_id|
+        UffizziCore::Deployment::DeleteCredentialJob.perform_async(deployment_id, credential.id)
       end
     end
   end

data/app/services/uffizzi_core/credential_service.rb

@@ -19,8 +19,7 @@ class UffizziCore::CredentialService
       end
 
       if credential.persisted? && credential.active? && !status
-        Rails.logger.warn("broken credentials, credential_correct? credential_id=#{credential.id}")
-        credential.unauthorize!
+        Rails.logger.warn("Wrong credential: credential_correct? credential_id=#{credential.id}")
       end
 
       status

data/config/routes.rb

@@ -46,7 +46,7 @@ UffizziCore::Engine.routes.draw do
 
         resource :account, only: [] do
           scope module: :account do
-            resources :credentials, only: ['index', 'create', 'destroy'], param: :type do
+            resources :credentials, only: ['index', 'create', 'update', 'destroy'], param: :type do
               member do
                 get :check_credential
               end

data/lib/uffizzi_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UffizziCore
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/swagger/v1/swagger.json

@@ -122,12 +122,12 @@
         "x-action": "create"
       }
     },
-    "/api/cli/v1/account/credentials/{type}/check_credential": {
-      "get": {
+    "/api/cli/v1/account/credentials/{type}": {
+      "put": {
         "tags": [
           "Account/Credential"
         ],
-        "operationId": "Account/Credential-check_credential",
+        "operationId": "Account/Credential-update",
         "parameters": [
           {
             "name": "credential",
@@ -145,27 +145,48 @@
           },
           {
             "name": "type",
-            "description": "Scope response to type",
+            "description": "Credential type",
             "required": true,
             "in": "path",
             "type": "string"
           }
         ],
         "responses": {
-          "422": {
-            "description": "Unprocessable entity"
-          },
           "200": {
-            "description": "OK"
+            "description": "OK",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "id": {
+                  "type": "integer"
+                },
+                "registry_url": {
+                  "type": "string"
+                },
+                "username": {
+                  "type": "string"
+                },
+                "password": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "422": {
+            "description": "Unprocessable entity",
+            "schema": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "errors"
+              }
+            }
           }
         },
-        "description": "Check if credential of the type already exists in the account",
-        "summary": "Check if credential of the type already exists in the account",
+        "description": "Update existing credential of the given type",
+        "summary": "Update existing credential of the given type",
         "x-controller": "uffizzi_core/api/cli/v1/account/credentials",
-        "x-action": "check_credential"
-      }
-    },
-    "/api/cli/v1/account/credentials/{type}": {
+        "x-action": "update"
+      },
       "delete": {
         "tags": [
           "Account/Credential"
@@ -210,6 +231,49 @@
         "x-action": "destroy"
       }
     },
+    "/api/cli/v1/account/credentials/{type}/check_credential": {
+      "get": {
+        "tags": [
+          "Account/Credential"
+        ],
+        "operationId": "Account/Credential-check_credential",
+        "parameters": [
+          {
+            "name": "credential",
+            "description": "credential",
+            "required": true,
+            "in": "body",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          {
+            "name": "type",
+            "description": "Scope response to type",
+            "required": true,
+            "in": "path",
+            "type": "string"
+          }
+        ],
+        "responses": {
+          "422": {
+            "description": "Unprocessable entity"
+          },
+          "200": {
+            "description": "OK"
+          }
+        },
+        "description": "Check if credential of the type already exists in the account",
+        "summary": "Check if credential of the type already exists in the account",
+        "x-controller": "uffizzi_core/api/cli/v1/account/credentials",
+        "x-action": "check_credential"
+      }
+    },
     "/api/cli/v1/projects/{project_slug}/compose_file": {
       "get": {
         "tags": [
@@ -1237,8 +1301,16 @@
           }
         ],
         "responses": {
-          "204": {
-            "description": "No content"
+          "200": {
+            "description": "OK",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "project": {
+                  "$ref": "#/definitions/Project"
+                }
+              }
+            }
           },
           "404": {
             "description": "Not Found"
@@ -1267,16 +1339,8 @@
           }
         ],
         "responses": {
-          "200": {
-            "description": "OK",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "project": {
-                  "$ref": "#/definitions/Project"
-                }
-              }
-            }
+          "204": {
+            "description": "No content"
           },
           "404": {
             "description": "Not Found"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-25 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -729,6 +729,7 @@ files:
 - app/errors/uffizzi_core/deployment_not_found_error.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/check_credential_form.rb
 - app/forms/uffizzi_core/api/cli/v1/account/credential/create_form.rb
+- app/forms/uffizzi_core/api/cli/v1/account/credential/update_form.rb
 - app/forms/uffizzi_core/api/cli/v1/compose_file/check_credentials_form.rb
 - app/forms/uffizzi_core/api/cli/v1/compose_file/cli_form.rb
 - app/forms/uffizzi_core/api/cli/v1/compose_file/create_form.rb
@@ -747,6 +748,7 @@ files:
 - app/forms/uffizzi_core/mass_assignment_control_concern.rb
 - app/helpers/uffizzi_core/application_helper.rb
 - app/jobs/uffizzi_core/account/create_credential_job.rb
+- app/jobs/uffizzi_core/account/update_credential_job.rb
 - app/jobs/uffizzi_core/activity_item/docker/update_digest_job.rb
 - app/jobs/uffizzi_core/application_job.rb
 - app/jobs/uffizzi_core/config_file/apply_job.rb
@@ -759,6 +761,7 @@ files:
 - app/jobs/uffizzi_core/deployment/delete_job.rb
 - app/jobs/uffizzi_core/deployment/deploy_containers_job.rb
 - app/jobs/uffizzi_core/deployment/manage_deploy_activity_item_job.rb
+- app/jobs/uffizzi_core/deployment/update_credential_job.rb
 - app/lib/uffizzi_core/concerns/models/account.rb
 - app/lib/uffizzi_core/concerns/models/activity_item.rb
 - app/lib/uffizzi_core/concerns/models/build.rb