web47core 3.2.3.35 → 3.2.3.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b301807f895cdf8d0341108e128d6c0f7ec5eb6f5b351252e49cfc011572caa
-  data.tar.gz: 39b41771fd6754daf7fb748c080263c19767aa4e7dae2ab5459424514d969dc2
+  metadata.gz: 5167f51146e44ae39a5cb3411634be0fcef03e696859bb7eabf9fe7222ad65a0
+  data.tar.gz: 4a7c22205a6b2033c41cccce824db4cf6be86e11fec06578165fab0c367aff20
 SHA512:
-  metadata.gz: f7cb600b09be33c7b5629207b7634a88c620e81b49bde3ce8a210ed15e666cfbd11d70ea26d1d467e415e731bf2e5a7eea7ef904b085efcdbb2cf0eace28c3c3
-  data.tar.gz: b1c13de3cbf056523ba01857f2a46636470d15c08881cf18f6ab9490b72bcb89b6330b763df71e8ff7f52de167420de52ae04358256c00cb36d3b45863349ed6
+  metadata.gz: fc25f298a11e9bb9d70feba03cdc92f4bf61918f740e7f40d6eb1fce5bb0d0613933c18e248877bf0fdc3b10cc58711fff64e501eba95c7435830906639e9a1e
+  data.tar.gz: 9602c563c2118543ab4cc6858ba668854f599f85342cbf08a08f639d7e2e95093203fafc6e57760c8e93e32e08043c340744e684dd89cfceede3f4a64c5e625f

data/app/controllers/status_controller.rb

@@ -13,7 +13,8 @@ class StatusController < ActionController::Base
                    redis: redis_status,
                    jobs: delayed_jobs_status,
                    cron_job_servers: cron_job_servers_status,
-                   workers: workers_status }
+                   workers: workers_status,
+                   version: version_status }
 
     respond_to do |format|
       format.html { render :index, locals: { components: ui_decorators(components) }, layout: false }
@@ -105,18 +106,13 @@ class StatusController < ActionController::Base
   end
 
   #
-  # Cron job primary status
+  # Cron job primary status. Up or down only. Host, pid, and check-in time stay on the admin page.
   #
   def cron_job_servers_status
     server = cron_job_server
-    raise 'No primary server' if server.blank?
+    raise 'Down' if server.blank? || server.dead?
 
-    server_info = "#{server.host_name}(#{server.pid}), last check in #{server.last_check_in_at}"
-    raise "Primary Server is DEAD: #{server_info}" if server.dead?
-
-    report_success "Primary Server is alive: #{server_info}",
-                   primary_count: 1,
-                   total_count: Cron::Server.count
+    report_success 'Up', primary_count: 1, total_count: Cron::Server.count
   rescue StandardError => error
     report_error(error, primary_count: 0, total_count: Cron::Server.count)
   end
@@ -138,4 +134,22 @@ class StatusController < ActionController::Base
   def cron_job_server
     @cron_job_server ||= Cron::Server.primary_server
   end
+
+  #
+  # Deployed image identity. GIT_SHA and BUILT_AT are injected at image build time.
+  # Missing values stay successful so an older task does not fail the health check.
+  #
+  def version_status
+    built_at = ENV['BUILT_AT'].presence
+    git_sha = ENV['GIT_SHA'].presence
+    report_success(version_message(built_at, git_sha), built_at: built_at, git_sha: git_sha)
+  end
+
+  def version_message(built_at, git_sha)
+    return 'Version not set' if built_at.blank? && git_sha.blank?
+    return built_at if git_sha.blank?
+    return git_sha if built_at.blank?
+
+    "#{built_at} #{git_sha}"
+  end
 end

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/web47core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.3.35
+  version: 3.2.3.41
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-22 00:00:00.000000000 Z
+date: 2026-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel