highlight digest, manifest tag

Author: terrywbrady

app/lib/client/code/ecr_images.rb

@@ -157,37 +157,23 @@ def delete_image(tag, image)
 
     def retag_image(tag, newtag, image)
       ecracct = ENV.fetch('ECR_ACCOUNT', '')
-      if ecracct.empty?
-        resp = @client.batch_get_image(
-          repository_name: image,
-          image_ids: [
-            {
-              image_tag: tag
-            }
-          ]
-        )
-        @client.put_image(
-          repository_name: image,
-          image_manifest: resp.images[0].image_manifest,
-          image_tag: newtag
-        )
-      else
-        resp = @client.batch_get_image(
-          registry_id: ecracct,
-          repository_name: image,
-          image_ids: [
-            {
-              image_tag: tag
-            }
-          ]
-        )
-        @client.put_image(
-          registry_id: ecracct,
-          repository_name: image,
-          image_manifest: resp.images[0].image_manifest,
-          image_tag: newtag
-        )
-      end
+      options = {
+        repository_name: image,
+        image_ids: [
+          {
+            image_tag: tag
+          }
+        ]
+      }
+      options[:registry_id] = ecracct unless ecracct.empty?
+      resp = @client.batch_get_image(options)
+      options = {
+        repository_name: image,
+        image_manifest: resp.images[0].image_manifest,
+        image_tag: newtag
+      }
+      options[:registry_id] = ecracct unless ecracct.empty?
+      @client.put_image(options)
     end
 
     def untag_image(tag, image)
@@ -197,7 +183,9 @@ def untag_image(tag, image)
     def get_image_tags_by_digest(image, tag, digest)
       arr = []
       return arr unless enabled
-      return arr unless image =~ /^(mrt|merritt)-(dashboard|ingest|store|inventory|audit|replic|admin-sinatra|ops|opswrite)$/
+      unless image =~ /^(mrt|merritt)-(dashboard|ingest|store|inventory|audit|replic|admin-sinatra|ops|opswrite)$/
+        return arr
+      end
 
       begin
         options = {
@@ -210,9 +198,8 @@ def get_image_tags_by_digest(image, tag, digest)
         }
         options[:registry_id] = ENV.fetch('ECR_ACCOUNT', '') unless ENV.fetch('ECR_ACCOUNT', '').empty?
         resp = @client.describe_images(options)
-        if resp.image_details.nil?
-          return arr
-        end
+        return arr if resp.image_details.nil?
+
         resp.image_details.each do |img|
           next if img.image_tags.nil?
 

app/lib/client/resources/ecs.rb

@@ -77,7 +77,8 @@ def list_services_data
               created: date_format(dep.created_at, convert_timezone: true),
               updated: date_format(dep.updated_at, convert_timezone: true),
               image: [image, digest],
-              tags: @ecr_client.get_image_tags_by_digest(image_name, image_tag, digest)
+              tags: @ecr_client.get_image_tags_by_digest(image_name, image_tag, digest),
+              manifest_tag: UC3S3::ConfigObjectsClient.client.get_ecs_release_manifest_stack_tag(image_name)
             }
           end
         end
@@ -95,10 +96,10 @@ def list_services
           AdminUI::Column.new(:desired_count, header: 'Desired'),
           AdminUI::Column.new(:running_count, header: 'Running'),
           AdminUI::Column.new(:pending_count, header: 'Pending'),
-          AdminUI::Column.new(:created, header: 'Created'),
           AdminUI::Column.new(:updated, header: 'Updated'),
           AdminUI::Column.new(:image, header: 'Image'),
-          AdminUI::Column.new(:tags, header: 'Matching Tags')
+          AdminUI::Column.new(:tags, header: 'Matching Tags'),
+          AdminUI::Column.new(:manifest_tag, header: 'Manifest Tag')
         ]
       )
       return table unless enabled
@@ -281,10 +282,7 @@ def retag_and_redeploy_service(service)
 
       repo = service == 'ui' ? 'mrt-dashboard' : "mrt-#{service}"
 
-      tag = UC3S3::ConfigObjectsClient.client.get_ecs_release_manifest
-        .fetch('ecs-tagmap', {})
-        .fetch(repo, {})
-        .fetch(UC3::UC3Client.stack_name, '')
+      tag = UC3S3::ConfigObjectsClient.client.get_ecs_release_manifest_stack_tag(repo)
 
       UC3Code::SourceCodeClient.client.retag_image(tag, UC3::UC3Client.stack_name, repo) unless tag.empty?
 

app/lib/client/s3/config_objects.rb

@@ -317,6 +317,14 @@ def get_ecs_release_manifest_deploy_tags(reposhort)
       tags.uniq
     end
 
+    def get_ecs_release_manifest_repo_map(repo)
+      get_ecs_release_manifest.fetch('ecs-tagmap', {}).fetch(repo, {})
+    end
+
+    def get_ecs_release_manifest_stack_tag(repo)
+      get_ecs_release_manifest_repo_map(repo).fetch(UC3::UC3Client.stack_name, '')
+    end
+
     def get_ec2_release_manifest_deploy_tags(reposhort)
       tags = []
       %w[prd stg].each do |env|

app/public/admintool.css

@@ -152,6 +152,12 @@ div#controls {
 span.val {
   display: block;
 }
+
+td.image span.val:nth-of-type(2), td.digest {
+  max-width: 130px;
+  display: inline-block;
+  color: green;
+}
 span.inline {
   display: inline;
 }
@@ -182,6 +188,7 @@ td.images span.val {
   display: list-item;
 }
 
+td.image, th.image,
 td.object_count, th.object_count,
 td.total_files, th.total_files,
 td.num_colls, th.num_colls,