From 18dcd341c73f6dc383338d28bd8a50add0e3a9b2 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Mon, 14 Feb 2022 11:21:14 -0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20remove=20duplicate=20type?=
 =?UTF-8?q?s=20from=20host/host-set?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/core/translations/resources/en-us.yaml | 20 -------------------
 .../components/form/host-set/aws/index.hbs    |  2 +-
 .../components/form/host-set/azure/index.hbs  |  2 +-
 .../app/components/form/host/aws/index.hbs    |  2 +-
 .../app/components/form/host/azure/index.hbs  |  2 +-
 .../form/target/add-host-sets/index.hbs       |  2 +-
 .../host-catalog/host-sets/host-set/hosts.hbs | 12 +++++++++--
 .../host-catalog/host-sets/index.hbs          |  8 ++++++--
 .../host-catalog/hosts/index.hbs              |  8 ++++++--
 .../scope/targets/target/host-sources.hbs     |  2 +-
 10 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 63387fdf1..8d4a00641 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -121,16 +121,6 @@ host-set:
       add-none:
         title: No Hosts Available
         description: No hosts available for selection.
-  types:
-    static:
-      label: Static
-      help: Provide a list of hosts and host sets with static addresses
-    unknown:
-      label: Unknown
-    aws:
-      label: AWS
-    azure:
-      label: Azure
 host:
   title: Host
   title_plural: Hosts
@@ -148,16 +138,6 @@ host:
     add: Add Host
     create: New Host
     delete: Delete Host
-  types:
-    static:
-      label: Static
-      help: Provide a list of hosts and host sets with static addresses
-    unknown:
-      label: Unknown
-    aws:
-      label: AWS
-    azure:
-      label: Azure
 session:
   title: Session
   title_plural: Sessions
diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
index 6e2529a60..d61cdc0de 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -65,7 +65,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host-set.types.aws.label'}}
+          @label={{t 'resources.host-catalog.types.aws.label'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon='flight-icons/svg/aws-color-16'
diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs
index d9492eedd..9150d5e7f 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -65,7 +65,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host-set.types.azure.label'}}
+          @label={{t 'resources.host-catalog.types.azure.label'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon='flight-icons/svg/azure-color-16'
diff --git a/ui/admin/app/components/form/host/aws/index.hbs b/ui/admin/app/components/form/host/aws/index.hbs
index 9f6351ab7..3c9dc3fd8 100644
--- a/ui/admin/app/components/form/host/aws/index.hbs
+++ b/ui/admin/app/components/form/host/aws/index.hbs
@@ -63,7 +63,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host.types.aws.label'}}
+          @label={{t 'resources.host-catalog.types.aws.label'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon={{concat 'flight-icons/svg/' @model.compositeType '-color-16'}}
diff --git a/ui/admin/app/components/form/host/azure/index.hbs b/ui/admin/app/components/form/host/azure/index.hbs
index e509f0458..a04c79aa7 100644
--- a/ui/admin/app/components/form/host/azure/index.hbs
+++ b/ui/admin/app/components/form/host/azure/index.hbs
@@ -63,7 +63,7 @@
         as |radioGroup|
       >
         <radioGroup.card
-          @label={{t 'resources.host.types.azure.label'}}
+          @label={{t 'resources.host-catalog.types.azure.label'}}
           @value={{@model.compositeType}}
           @layout='tile'
           @icon={{concat 'flight-icons/svg/' @model.compositeType '-color-16'}}
diff --git a/ui/admin/app/components/form/target/add-host-sets/index.hbs b/ui/admin/app/components/form/target/add-host-sets/index.hbs
index ca5c7a3e4..f80b4c673 100644
--- a/ui/admin/app/components/form/target/add-host-sets/index.hbs
+++ b/ui/admin/app/components/form/target/add-host-sets/index.hbs
@@ -35,7 +35,7 @@
             <row.cell>{{hostSet.name}}</row.cell>
             <row.cell>
               <Rose::Badge>{{t
-                  (concat 'resources.host-set.types.' hostSet.type)
+                  (concat 'resources.host-catalog.types.' hostSet.type)
                 }}</Rose::Badge>
             </row.cell>
             <row.cell>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
index bc3251dfd..f854d86e0 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
@@ -28,7 +28,11 @@
           <row.cell>
             {{#if host.isStatic}}
               <Rose::Badge>
-                {{t (concat 'resources.host.types.' host.compositeType)}}
+                {{t
+                  (concat
+                    'resources.host-catalog.types.' host.compositeType '.label'
+                  )
+                }}
               </Rose::Badge>
             {{else}}
               <Rose::Badge
@@ -38,7 +42,11 @@
                   '-color-16'
                 }}
               >
-                {{t (concat 'resources.host.types.' host.compositeType)}}
+                {{t
+                  (concat
+                    'resources.host-catalog.types.' host.compositeType '.label'
+                  )
+                }}
               </Rose::Badge>
             {{/if}}
           </row.cell>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs
index 50188d665..8a949544c 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs
@@ -29,7 +29,9 @@
               <Rose::Badge>
                 {{t
                   (concat
-                    'resources.host-set.types.' hostSet.compositeType '.label'
+                    'resources.host-catalog.types.'
+                    hostSet.compositeType
+                    '.label'
                   )
                 }}
               </Rose::Badge>
@@ -43,7 +45,9 @@
               >
                 {{t
                   (concat
-                    'resources.host-set.types.' hostSet.compositeType '.label'
+                    'resources.host-catalog.types.'
+                    hostSet.compositeType
+                    '.label'
                   )
                 }}
               </Rose::Badge>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs
index ee8f060cd..8877b6ea1 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs
@@ -30,7 +30,9 @@
             {{#if host.isStatic}}
               <Rose::Badge>
                 {{t
-                  (concat 'resources.host.types.' host.compositeType '.label')
+                  (concat
+                    'resources.host-catalog.types.' host.compositeType '.label'
+                  )
                 }}
               </Rose::Badge>
             {{else}}
@@ -42,7 +44,9 @@
                 }}
               >
                 {{t
-                  (concat 'resources.host.types.' host.compositeType '.label')
+                  (concat
+                    'resources.host-catalog.types.' host.compositeType '.label'
+                  )
                 }}
               </Rose::Badge>
             {{/if}}
diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
index 9a7c0ce5b..eefbb0e64 100644
--- a/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
+++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sources.hbs
@@ -39,7 +39,7 @@
               </row.headerCell>
               <row.cell>
                 <Rose::Badge>{{t
-                    (concat 'resources.host-set.types.' hostSet.model.type)
+                    (concat 'resources.host-catalog.types.' hostSet.model.type)
                   }}</Rose::Badge>
               </row.cell>
               <row.cell>