uffizzi_core 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e55dc8e6b2d5e6cde4394b3f3f526a82e8a0ddc7d0d5ce6aa9e42ad407783c9
-  data.tar.gz: 44fdd5695f09b5a93b146370ebc1076278bc55e89f22029e6f30d07cfa3f2d66
+  metadata.gz: dc9d18f96d6809d2ff9ba942eb283d7b54e876e05bcb31cfc991ba3bbec9c241
+  data.tar.gz: 01601aec07efaf6fe0cd292968ce9480efed6b1d1f0aaaac8a50bc9cd4bb5792
 SHA512:
-  metadata.gz: dbd3510abe5c9919eba8f9abcf35cf9b49b03952d84da0dbe43e12d5615544b1ceaea9125fc877694d56c878d8b372f5777912006c9b361800ed3b02543a5be1
-  data.tar.gz: 2b37022d8b1d9142ab4d9977bbe1adc5e03ae7d5492a60a27df2975ba0d0c7808a3f6c1b7542a8bd4f8f7214a6b753a25036bbbbd836b7dc94a59262aaaa9779
+  metadata.gz: c9cb8d9bc0d2ba8f6d759936a5a3137ba6a1db2ca87283e8ce35bc09bfd19204d477f054be4f0b695b4f877fb705af9b2377f04fd329f80bee97052c6559763b
+  data.tar.gz: bc0d50ccaf1b9c17ab607452152522924f0a32567952907d035ae3167680ca1e03784a96f7cb4cc43f93cb3c3ce47d8a282fbc19acdf9a9a0bde90b9b4ffff46

data/app/services/uffizzi_core/compose_file_service.rb

@@ -66,12 +66,28 @@ class UffizziCore::ComposeFileService
     end
 
     def update_secret!(compose_file, secret)
-      compose_file.template.payload['containers_attributes'].map do |container|
-        if UffizziCore::ComposeFile::ContainerService.has_secret?(container, secret)
-          container = UffizziCore::ComposeFile::ContainerService.update_secret(container, secret)
+      compose_file.template.payload['containers_attributes'].each do |container|
+        next unless UffizziCore::ComposeFile::ContainerService.has_secret?(container, secret)
+
+        UffizziCore::ComposeFile::ContainerService.update_secret(container, secret)
+        next if compose_file.payload['errors'].blank?
+
+        compose_file_errors = compose_file.payload['errors'].presence
+        secrets_errors = compose_file_errors[UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY].presence
+        new_secrets_errors = secrets_errors.reject { |secret_errors| secret_errors.include?(secret.name) }
+
+        if new_secrets_errors.present?
+          new_errors = { UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY => new_secrets_errors }
+          UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file,
+                                                                         compose_file_errors.merge(new_errors),
+                                                                         compose_file.content)
+          next
         end
 
-        container
+        compose_file_errors.delete(['secret_variables'])
+        next UffizziCore::ComposeFile::ErrorsService.reset_compose_errors!(compose_file) if compose_file_errors.empty?
+
+        UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file, compose_file_errors, compose_file.content)
       end
 
       compose_file.template.save!

data/app/services/uffizzi_core/project_service.rb

@@ -27,10 +27,11 @@ class UffizziCore::ProjectService
       return unless UffizziCore::ComposeFileService.has_secret?(compose_file, secret)
 
       error_message = I18n.t('compose.project_secret_not_found', secret: secret['name'])
-      error = { UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY => [error_message] }
-
-      existing_errors = compose_file.payload['errors'].presence || {}
-      new_errors = existing_errors.merge(error)
+      compose_file_errors = compose_file.payload['errors'] || {}
+      secrets_errors = compose_file_errors[UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY].presence || []
+      new_secrets_errors = secrets_errors.append(error_message).uniq
+      error = { UffizziCore::ComposeFile::ErrorsService::SECRETS_ERROR_KEY => new_secrets_errors }
+      new_errors = compose_file_errors.merge(error)
 
       UffizziCore::ComposeFile::ErrorsService.update_compose_errors!(compose_file, new_errors, compose_file.content)
     end

data/lib/uffizzi_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uffizzi_core
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Josh Thurman
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm