Merge pull request #272 from DEFRA/258060-sort-out-deployments-part-VI

remove title
DEFRA · Jan 23, 2024 · e20f562 · e20f562
2 parents 831c545 + f81009e
commit e20f562
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 38 deletions.
diff --git a/src/__fixtures__/deployment-stopped.js b/src/__fixtures__/deployment-stopped.js
@@ -30,12 +30,12 @@ const deploymentStoppedFixture = [
     dockerImage:
       '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-portal-backend:0.105.0',
     taskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-backend:121',
+      'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-backend:121',
     ecsSvcDeploymentId: 'ecs-svc/2729145637959376974',
     cpu: '2048',
     memory: '4096',
     instanceTaskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
+      'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
     instanceCount: 1
   },
   {
@@ -50,12 +50,12 @@ const deploymentStoppedFixture = [
     dockerImage:
       '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-portal-backend:0.105.0',
     taskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-backend:121',
+      'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-backend:121',
     ecsSvcDeploymentId: 'ecs-svc/2729145637959376974',
     cpu: '2048',
     memory: '4096',
     instanceTaskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
+      'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
     instanceCount: 1
   },
   {
@@ -70,12 +70,12 @@ const deploymentStoppedFixture = [
     dockerImage:
       '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-portal-backend:0.105.0',
     taskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-backend:121',
+      'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-backend:121',
     ecsSvcDeploymentId: 'ecs-svc/2729145637959376974',
     cpu: '2048',
     memory: '4096',
     instanceTaskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
+      'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
     instanceCount: 1
   },
   {
@@ -90,12 +90,12 @@ const deploymentStoppedFixture = [
     dockerImage:
       '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-portal-backend:0.105.0',
     taskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-backend:121',
+      'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-backend:121',
     ecsSvcDeploymentId: 'ecs-svc/2729145637959376974',
     cpu: '2048',
     memory: '4096',
     instanceTaskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
+      'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
     instanceCount: 1
   },
   {
@@ -110,12 +110,12 @@ const deploymentStoppedFixture = [
     dockerImage:
       '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-portal-backend:0.105.0',
     taskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-backend:121',
+      'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-backend:121',
     ecsSvcDeploymentId: 'ecs-svc/2729145637959376974',
     cpu: '2048',
     memory: '4096',
     instanceTaskId:
-      'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
+      'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
     instanceCount: 1
   }
 ]

diff --git a/src/__fixtures__/deployments.js b/src/__fixtures__/deployments.js
@@ -15,12 +15,12 @@ const deploymentsFixture = {
       dockerImage:
         '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-self-service-ops:0.133.0',
       taskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-self-service-ops:77',
+        'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-self-service-ops:77',
       ecsSvcDeploymentId: 'ecs-svc/0104156151283823124',
       cpu: '1024',
       memory: '2048',
       instanceTaskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/c401cfebbac648839c60206d0ce9cbcb',
+        'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/c401cfebbac648839c60206d0ce9cbcb',
       instanceCount: 1
     },
     {
@@ -36,12 +36,12 @@ const deploymentsFixture = {
       dockerImage:
         '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-user-service-backend:0.54.0',
       taskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-user-service-backend:42',
+        'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-user-service-backend:42',
       ecsSvcDeploymentId: 'ecs-svc/3014741994541337123',
       cpu: '1024',
       memory: '2048',
       instanceTaskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/45483810f6c443c19ffbc0bd875dd51e',
+        'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/45483810f6c443c19ffbc0bd875dd51e',
       instanceCount: 1
     },
     {
@@ -57,12 +57,12 @@ const deploymentsFixture = {
       dockerImage:
         '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-portal-backend:0.94.0',
       taskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-backend:104',
+        'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-backend:104',
       ecsSvcDeploymentId: 'ecs-svc/1704294635461875969',
       cpu: '2048',
       memory: '4096',
       instanceTaskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d6aa24e0d4fe4299b8a3f4fd0c05eba6',
+        'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d6aa24e0d4fe4299b8a3f4fd0c05eba6',
       instanceCount: 1
     },
     {
@@ -78,12 +78,12 @@ const deploymentsFixture = {
       dockerImage:
         '123456789.dkr.ecr.eu-west-2.amazonaws.com/cdp-portal-frontend:0.211.0',
       taskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-frontend:138',
+        'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-frontend:138',
       ecsSvcDeploymentId: 'ecs-svc/6234389216168804118',
       cpu: '1024',
       memory: '2048',
       instanceTaskId:
-        'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-public/593080e9348c432686c35c9cb57e24a2',
+        'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-public/593080e9348c432686c35c9cb57e24a2',
       instanceCount: 2
     }
   ],

diff --git a/src/server/common/components/icons/instance-failed-icon/template.njk b/src/server/common/components/icons/instance-failed-icon/template.njk
@@ -1,6 +1,6 @@
-<svg class="app-icon-medium app-instance-failed{% if params.classes %} {{ params.classes }}{% endif %}" xmlns="http://www.w3.org/2000/svg"
+<svg class="app-icon-medium app-instance-failed{% if params.classes %} {{ params.classes }}{% endif %}"
+     xmlns="http://www.w3.org/2000/svg"
      width="39" height="43" viewBox="0 0 39 43">
-  {% if params.title %}<title>{{ params.title }}</title>{% endif %}
   <path
     d="M16.85.8c.7377-.4 1.4888-.6 2.2533-.6.7644667 0 1.5300333.2 2.2967.6l14.5 8.4c.775.44753333 1.3604167 1.0226333 1.75625 1.7253.3958333.7026667.59375 1.4442333.59375 2.2247v8.75c-.6517333-.6802-1.3646667-1.2669167-2.1388-1.76015-.7741333-.4932333-1.5945333-.8774-2.4612-1.1525V15.35L28.5 18.4c-2.6.1333333-4.9083333.9333333-6.925 2.4-2.0166667 1.4666667-3.5416667 3.3-4.575 5.5v-3.8L4.6 15.35v14.2252L17.15 36.8c.3077 1.2377333.81475 2.3495167 1.52115 3.33535.7064.9858333 1.54935 1.82405 2.52885 2.51465-.7666667.2-1.5166667.2416667-2.25.125-.7333333-.1166667-1.4333333-.3916667-2.1-.825l-14.5-8.4c-.80833333-.4475333-1.39375-1.02205-1.75625-1.72355C.23125 31.1249167.05 30.3994333.05 29.65v-16.5c0-.7804667.18125-1.5220333.54375-2.2247.3625-.7026667.94791667-1.27776667 1.75625-1.7253L16.85.8Zm2.25 3.95-12.25 7.1L19.1 19l12.25-7.15-12.25-7.1ZM29.29805 40.9c-2.5653667 0-4.7647167-.9089833-6.59805-2.72695-1.8333333-1.818-2.75-3.999-2.75-6.543 0-2.5848667.9173167-4.7944333 2.75195-6.6287 1.8346333-1.8342333 4.0263-2.75135 6.575-2.75135 2.5153667 0 4.7063833.9151 6.57305 2.7453 1.8666667 1.8302333 2.8 4.0407833 2.8 6.63165 0 2.5632-.9324 4.7495-2.7972 6.5589C33.988 39.9952833 31.8030833 40.9 29.29805 40.9Zm-.03735-3.15c.4262 0 .7976333-.1523833 1.1143-.45715.3166667-.3047667.475-.6714333.475-1.1 0-.4285667-.1588167-.8011833-.47645-1.11785-.3176-.3166667-.6826-.475-1.095-.475-.4523667 0-.8202167.1607167-1.10355.48215-.2833333.3214333-.425.6964333-.425 1.125 0 .4285667.1452333.79285.4357 1.09285.2905.3.6488333.45 1.075.45ZM28.1 32.45h2.35V25.5H28.1v6.95Z" />
 </svg>
diff --git a/src/server/common/components/icons/instance-pending-icon/template.njk b/src/server/common/components/icons/instance-pending-icon/template.njk
@@ -1,7 +1,6 @@
 <svg class="app-icon-medium app-instance-pending{% if params.classes %} {{ params.classes }}{% endif %}"
      xmlns="http://www.w3.org/2000/svg"
      width="39" height="43" viewBox="0 0 39 43">
-  {% if params.title %}<title>{{ params.title }}</title>{% endif %}
   <path
     d="M16.8.6c.7519-.4 1.50655-.6 2.26395-.6.7573667 0 1.5193833.2 2.28605.6L35.85 9c.775.44753333 1.3604167 1.01775 1.75625 1.71065.3958333.6929.59375 1.43935.59375 2.23935v8.75c-.6517333-.6802-1.3646667-1.2669167-2.1388-1.76015-.7741333-.4932333-1.5945333-.8731833-2.4612-1.13985v-3.65l-5.15 3.05c-2.6.1333333-4.9083333.9333333-6.925 2.4-2.0166667 1.4666667-3.5416667 3.3-4.575 5.5v-3.8l-12.4-7.15V29.4l12.55 7.2c.3 1.2333333.8083333 2.3416667 1.525 3.325.7166667.9833333 1.5583333 1.825 2.525 2.525-.7666667.2-1.5166667.2416667-2.25.125-.7333333-.1166667-1.4333333-.3916667-2.1-.825l-14.5-8.4c-.80833333-.4475333-1.39375-1.0171667-1.75625-1.7089C.18125 30.9493333 0 30.2189667 0 29.45v-16.5c0-.8.18125-1.54645.54375-2.23935C.90625 10.01775 1.49166667 9.44753333 2.3 9L16.8.6Zm2.25 3.95L6.8 11.65l12.25 7.15 12.25-7.15-12.25-7.1ZM29.24805 40.7c-2.5653667 0-4.7647167-.9105667-6.59805-2.7317-1.8333333-1.8211667-2.75-4.0005833-2.75-6.53825 0-2.5848667.9173167-4.7944333 2.75195-6.6287 1.8346333-1.8342333 4.0346333-2.75135 6.6-2.75135 2.4987 0 4.6813833.9151 6.54805 2.7453 1.8666667 1.8302333 2.8 4.0491167 2.8 6.65665 0 2.5465333-.9339833 4.7245-2.80195 6.5339-1.8679667 1.8094333-4.0513 2.71415-6.55 2.71415ZM30.35 31.19085V24.9h-2.6v7.0888l5.2 4.8612 1.7-1.8-4.3-3.85915Z" />
 </svg>
diff --git a/src/server/common/components/icons/instance-stopped-icon/template.njk b/src/server/common/components/icons/instance-stopped-icon/template.njk
@@ -1,7 +1,6 @@
 <svg class="app-icon-medium app-instance-stopped{% if params.classes %} {{ params.classes }}{% endif %}"
      xmlns="http://www.w3.org/2000/svg"
      width="39" height="43" viewBox="0 0 39 43">
-  {% if params.title %}<title>{{ params.title }}</title>{% endif %}
   <path fill-rule="nonzero"
         d="M19.0533 0c.7644667 0 1.5300333.2 2.2967.6L35.85 9c.775.44753333 1.3604167 1.0226333 1.75625 1.7253.3958333.7026667.59375 1.4442333.59375 2.2247v8.75c-.6517333-.6802-1.3646667-1.2669167-2.1388-1.76015-.7741333-.4932333-1.5945333-.8774-2.4612-1.1525V15.15l-5.15 3.05c-2.6.1333333-4.9083333.9333333-6.925 2.4-2.0166667 1.4666667-3.5416667 3.3-4.575 5.5v-3.8l-12.4-7.15v14.2252L17.1 36.6c.3077 1.2377333.81475 2.3495167 1.52115 3.33535.7064.9858333 1.54935 1.82405 2.52885 2.51465-.7666667.2-1.5166667.2416667-2.25.125-.7333333-.1166667-1.4333333-.3916667-2.1-.825l-14.5-8.4c-.80833333-.4475333-1.39375-1.02205-1.75625-1.72355C.18125 30.9249167 0 30.1994333 0 29.45v-16.5c0-.7804667.18125-1.5220333.54375-2.2247C.90625 10.0226333 1.49166667 9.44753333 2.3 9L16.8.6c.7377-.4 1.4888-.6 2.2533-.6Zm10.1708794 22.05c1.2947291 0 2.5135861.2422361 3.6565709.7267084 1.14297.4844871 2.1380038 1.1504226 2.9851012 1.9978066.8470974.847384 1.5145669 1.839418 2.0024084 2.976102.4878267 1.1366839.7317401 2.3524958.7317401 3.6474356 0 1.2792321-.2434623 2.4852802-.730387 3.6181442-.4869098 1.1328492-1.1560799 2.1224939-2.0075104 2.968934-.8514156.8464401-1.8455473 1.510532-2.9823949 1.9922757-1.1368328.481729-2.352806.7225935-3.6479197.7225935-1.2765245 0-2.4865602-.2404368-3.630107-.7213103-1.1435615-.4808588-2.1386544-1.1434685-2.9852786-1.987829-.8466242-.8443605-1.5110103-1.836741-1.9931583-2.9771417C20.1410814 33.8733331 19.9 32.6651316 19.9 31.3891147c0-1.2892024.2415102-2.5006413.7245307-3.6343164.4830353-1.1336752 1.1488263-2.1250823 1.997373-2.9742215.8485319-.8491539 1.8423973-1.5165348 2.9815963-2.0021428 1.1391842-.4856227 2.3460773-.728434 3.6206794-.728434Zm4.0668654 4-3.9074627 3.9402985L25.4761194 26.05 23.9 27.6589552l3.9074627 3.9074627L23.9 35.4738806 25.4761194 37.05l3.9074627-3.9074627L33.2910448 37.05 34.9 35.4738806l-3.9402985-3.9074627L34.9 27.6589552 33.2910448 26.05ZM19.05 4.55 6.8 11.65l12.25 7.15 12.25-7.15-12.25-7.1Z" />
 </svg>
diff --git a/src/server/common/components/icons/instance-success-icon/template.njk b/src/server/common/components/icons/instance-success-icon/template.njk
@@ -1,7 +1,6 @@
 <svg class="app-icon-medium app-instance-success{% if params.classes %} {{ params.classes }}{% endif %}"
      xmlns="http://www.w3.org/2000/svg"
      width="39" height="43" viewBox="0 0 39 43">
-  {% if params.title %}<title>{{ params.title }}</title>{% endif %}
   <path fill-rule="nonzero"
         d="M19.1033.2c.7644667 0 1.5300333.2 2.2967.6l14.5 8.4c.775.44753333 1.3604167 1.0226333 1.75625 1.7253.3958333.7026667.59375 1.4442333.59375 2.2247v8.75c-.6517333-.6802-1.3646667-1.2669167-2.1388-1.76015-.7741333-.4932333-1.5945333-.8774-2.4612-1.1525V15.35L28.5 18.4c-2.6.1333333-4.9083333.9333333-6.925 2.4-2.0166667 1.4666667-3.5416667 3.3-4.575 5.5v-3.8L4.6 15.35v14.2252L17.15 36.8c.3077 1.2377333.81475 2.3495167 1.52115 3.33535.7064.9858333 1.54935 1.82405 2.52885 2.51465-.7666667.2-1.5166667.2416667-2.25.125-.7333333-.1166667-1.4333333-.3916667-2.1-.825l-14.5-8.4c-.80833333-.4475333-1.39375-1.02205-1.75625-1.72355C.23125 31.1249167.05 30.3994333.05 29.65v-16.5c0-.7804667.18125-1.5220333.54375-2.2247.3625-.7026667.94791667-1.27776667 1.75625-1.7253L16.85.8c.7377-.4 1.4888-.6 2.2533-.6Zm10.1708794 22.05c1.2947291 0 2.5135861.2422361 3.6565709.7267084 1.14297.4844871 2.1380038 1.1504226 2.9851012 1.9978066.8470974.847384 1.5145669 1.839418 2.0024084 2.976102.4878267 1.1366839.7317401 2.3524958.7317401 3.6474356 0 1.2792321-.2434623 2.4852802-.730387 3.6181442-.4869098 1.1328492-1.1560799 2.1224939-2.0075104 2.968934-.8514156.8464401-1.8455473 1.510532-2.9823949 1.9922757-1.1368328.481729-2.352806.7225935-3.6479197.7225935-1.2765245 0-2.4865602-.2404368-3.630107-.7213103-1.1435615-.4808588-2.1386544-1.1434685-2.9852786-1.987829-.8466242-.8443605-1.5110103-1.836741-1.9931583-2.9771417C20.1910814 34.0733331 19.95 32.8651316 19.95 31.5891147c0-1.2892024.2415102-2.5006413.7245307-3.6343164.4830353-1.1336752 1.1488263-2.1250823 1.997373-2.9742215.8485319-.8491539 1.8423973-1.5165348 2.9815963-2.0021428 1.1391842-.4856227 2.3460773-.728434 3.6206794-.728434Zm4.8921194 4.8157895-5.883871 6.4044944-2.8645161-3.1179776-1.6258064 1.7977528 4.4903225 4.9157304 7.5096775-8.2022472-1.6258065-1.7977528ZM19.1 4.75l-12.25 7.1L19.1 19l12.25-7.15-12.25-7.1Z" />
 </svg>
diff --git a/src/server/deployments/transformers/transform-deployment.test.js b/src/server/deployments/transformers/transform-deployment.test.js
@@ -324,7 +324,7 @@ describe('#transformDeployment', () => {
           text: 'stopped'
         },
         tasks: {
-          'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa':
+          'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa':
             {
               cpu: '2048',
               deployedAt: '2024-01-22T09:53:04Z',
@@ -335,7 +335,7 @@ describe('#transformDeployment', () => {
               environment: 'infra-dev',
               instanceCount: 1,
               instanceTaskId:
-                'arn:aws:ecs:eu-west-2:506190012364:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
+                'arn:aws:ecs:eu-west-2:123412341234:task/infra-dev-ecs-protected/d74cdc42ff1b44f49fe007e858567bfa',
               memory: '4096',
               service: 'cdp-portal-backend',
               status: {
@@ -344,7 +344,7 @@ describe('#transformDeployment', () => {
                 text: 'stopped'
               },
               taskId:
-                'arn:aws:ecs:eu-west-2:506190012364:task-definition/cdp-portal-backend:121',
+                'arn:aws:ecs:eu-west-2:123412341234:task-definition/cdp-portal-backend:121',
               user: 'RoboCop',
               userId: '1398fa86-98a2-4ee8-84bb-2468cc71d0ec',
               version: '0.105.0'

diff --git a/src/server/deployments/views/deployment.njk b/src/server/deployments/views/deployment.njk
@@ -99,21 +99,13 @@
 
                   <div class="govuk-!-margin-right-2">
                     {% if task.status.text == 'deployed' %}
-                      {{ appInstanceSuccessIcon({
-                        title: task.instanceTaskId
-                      }) }}
+                      {{ appInstanceSuccessIcon() }}
                     {% elseif task.status.text == 'stopped' %}
-                      {{ appInstanceStoppedIcon({
-                        title: task.instanceTaskId
-                      }) }}
+                      {{ appInstanceStoppedIcon() }}
                     {% elseif task.status.text == 'pending' %}
-                      {{ appInstancePendingIcon({
-                        title: task.instanceTaskId
-                      }) }}
+                      {{ appInstancePendingIcon() }}
                     {% elseif task.status.text == 'failed' %}
-                      {{ appInstanceFailedIcon({
-                        title: task.instanceTaskId
-                      }) }}
+                      {{ appInstanceFailedIcon() }}
                     {% endif %}
                   </div>