web47core 3.2.3.34 → 3.2.3.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2478fbae611a8c7a31fde7e583b7a70cabfe2e8454b7edd76441b937223c3874
-  data.tar.gz: 6d98241c34fbd65429987484c22450d4bcad11fb8a4353a6cc6ba2dfb5dd2d93
+  metadata.gz: 1c3106bd513997d40d9af68ad8640578c820d28031c045019123c33cff38984f
+  data.tar.gz: d8d6cb5a0f0c0ce213abd8ca89948dbc242bdd694521d822991b959f446b8b16
 SHA512:
-  metadata.gz: 340171b4a21e2f4ad5a0ff9066284b9f914d56e31cbe25e139ee1f2e5f0181eef8f3ee4545e4a1c54712619543304cf289d74ae1c327ef0229317cef9814aa7f
-  data.tar.gz: 37c38ebad9f33e6511309bc2d03a17bd3ca9ad0d727195029d1945af68bec45d147828bd7bfceec3ad0b1751a37e97b151d60d134da081a5b886c7e91b445f6f
+  metadata.gz: 5540f6e7610972cd51e79a377c111e46cce0bcf354fbe5dea7e0bfc2cb39ad889f77be55a131c04af555982f7989e3a1c60abce03a91a3c505aadab73be631aa
+  data.tar.gz: 89b9d953406a602fae976918bfd0244daf9242f1e6f11476bf97a413b3cab8829dd6d9c7d6392cdb7017613192096be98771a715b32f7a5ce5f4a36c649e4592

data/lib/app/models/concerns/aws_configuration.rb

@@ -12,29 +12,32 @@ module AwsConfiguration
       # Fields
       #
       field :aws_region, type: String
-      field :aws_access_key_id, type: String
-      field :aws_secret_access_key, type: String
       field :aws_bucket_name, type: String
       field :aws_min_worker_job_count, type: Integer, default: 1
-      field :aws_ecs_cluster_worker_name, type: String
-      field :aws_ecs_service_worker_name, type: String
 
       validates :aws_min_worker_job_count, numericality: { only_integer: true, greater_than: 0 }
     end
   end
 
   #
-  # Make sure the password doesn't get blanked out on an update
+  # ECS cluster the worker service runs in. Set on the task as ECS_CLUSTER_WORKER_NAME.
   #
-  def secure_fields
-    super + %i[aws_secret_access_key]
+  def aws_ecs_cluster_worker_name
+    ENV['ECS_CLUSTER_WORKER_NAME'].presence
+  end
+
+  #
+  # ECS service that runs the workers. Set on the task as ECS_SERVICE_WORKER_NAME.
+  #
+  def aws_ecs_service_worker_name
+    ENV['ECS_SERVICE_WORKER_NAME'].presence
   end
 
   #
   # Determine if AWS is configured
   #
   def aws_configured?
-    [aws_region.present?, aws_access_key_id.present?, aws_secret_access_key.present?].all?
+    aws_region.present?
   end
 
   #
@@ -45,42 +48,38 @@ module AwsConfiguration
   end
 
   # @abstract EC2 Client
-  # @return [Aws::EC2::Client]
-  def aws_ec2_client
+  # @param desired_region [String, nil] region to connect to; defaults to the configured aws_region
+  # @return [Aws::EC2::Client, nil]
+  def aws_ec2_client(desired_region: nil)
     return nil unless aws_configured?
 
-    @aws_ec2_client ||= Aws::EC2::Client.new(region: aws_region,
-                                             credentials: Aws::Credentials.new(aws_access_key_id,
-                                                                               aws_secret_access_key))
+    Aws::EC2::Client.new(region: desired_region.presence || aws_region)
   end
 
   # @abstract S3 Client
-  # @return [Aws::S3::Client]
-  def aws_s3_client
+  # @param desired_region [String, nil] region to connect to; defaults to the configured aws_region
+  # @return [Aws::S3::Client, nil]
+  def aws_s3_client(desired_region: nil)
     return nil unless aws_configured?
 
-    @aws_s3_client ||= Aws::S3::Client.new(region: aws_region,
-                                           access_key_id: aws_access_key_id,
-                                           secret_access_key: aws_secret_access_key)
+    Aws::S3::Client.new(region: desired_region.presence || aws_region)
   end
 
   # @abstract ECS Client
-  # @return [Aws::ECS::Client]
-  def aws_ecs_client
+  # @param desired_region [String, nil] region to connect to; defaults to the configured aws_region
+  # @return [Aws::ECS::Client, nil]
+  def aws_ecs_client(desired_region: nil)
     return nil unless aws_configured?
 
-    @aws_s3_client ||= Aws::ECS::Client.new(region: aws_region,
-                                            access_key_id: aws_access_key_id,
-                                            secret_access_key: aws_secret_access_key)
+    Aws::ECS::Client.new(region: desired_region.presence || aws_region)
   end
 
   # @abstract AutoScaling Client
-  # @return [Aws::AutoScaling::Client]
-  def aws_auto_scale_client
+  # @param desired_region [String, nil] region to connect to; defaults to the configured aws_region
+  # @return [Aws::AutoScaling::Client, nil]
+  def aws_auto_scale_client(desired_region: nil)
     return nil unless aws_configured?
 
-    @auto_scale_client ||= Aws::AutoScaling::Client.new(access_key_id: aws_access_key_id,
-                                                        secret_access_key: aws_secret_access_key,
-                                                        region: aws_region)
+    Aws::AutoScaling::Client.new(region: desired_region.presence || aws_region)
   end
 end

data/lib/app/models/concerns/cipher_able.rb

@@ -27,7 +27,7 @@ module CipherAble
   # Decrypt the given text
   #
   def decrypt(text)
-    cipher.decrypt_and_verify(text)
+    text.blank? ? nil : cipher.decrypt_and_verify(text)
   rescue StandardError => error
     App47Logger.log_warn("Unable to decrypt text for #{inspect}", error)
     nil

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.2.3.34'
+  VERSION = '3.2.3.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.34
+  version: 3.2.3.40
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-23 00:00:00.000000000 Z
+date: 2026-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel