Merge branch 'main' into ICU-3529-add-boundary-does-not-yet-support-rotating-credentials-warning-message-for-azure-provider

ui/admin/app/components/form/host-catalog/aws/index.hbs

@@ -138,6 +138,7 @@
     @label={{t 'form.access_key_id.label'}}
     @helperText={{t 'form.access_key_id.help'}}
     @linkText={{t 'actions.learn-more'}}
+    @link={{doc-url 'host-catalog.aws'}}
     readonly={{false}}
   />
 
@@ -148,6 +149,7 @@
     @label={{t 'form.secret_access_key.label'}}
     @helperText={{t 'form.secret_access_key.help'}}
     @linkText={{t 'actions.learn-more'}}
+    @link={{doc-url 'host-catalog.aws'}}
     readonly={{false}}
   />
 

ui/admin/app/components/form/host-catalog/azure/index.hbs

@@ -137,7 +137,7 @@
     @label={{t 'form.tenant_id.label'}}
     @helperText={{t 'form.tenant_id.help'}}
     @linkText={{t 'actions.learn-more'}}
-    @link={{doc-url @doc}}
+    @link={{doc-url 'host-catalog.azure'}}
     readonly={{false}}
   />
 
@@ -148,7 +148,7 @@
     @label={{t 'form.subscription_id.label'}}
     @helperText={{t 'form.subscription_id.help'}}
     @linkText={{t 'actions.learn-more'}}
-    @link={{doc-url @doc}}
+    @link={{doc-url 'host-catalog.azure'}}
     readonly={{false}}
   />
 
@@ -159,7 +159,7 @@
     @label={{t 'resources.host-catalog.form.azure_client_id.label'}}
     @helperText={{t 'resources.host-catalog.form.azure_client_id.help'}}
     @linkText={{t 'actions.learn-more'}}
-    @link={{doc-url @doc}}
+    @link={{doc-url 'host-catalog.azure'}}
     readonly={{false}}
   />
 
@@ -170,7 +170,7 @@
     @label={{t 'form.secret.label'}}
     @helperText={{t 'form.secret.help'}}
     @linkText={{t 'actions.learn-more'}}
-    @link={{doc-url @doc}}
+    @link={{doc-url 'host-catalog.azure'}}
     readonly={{false}}
   />
 

ui/admin/app/components/form/host-catalog/index.hbs

@@ -4,5 +4,4 @@
   submit=@submit
   cancel=@cancel
   changeType=@changeType
-  doc=@doc
 }}

ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs

@@ -19,7 +19,6 @@
       @submit={{route-action 'save' @model}}
       @cancel={{route-action 'cancel' @model}}
       @changeType={{route-action 'changeType'}}
-      @doc='host-catalog.set-up-cloud-hosts'
     />
   </page.body>
 

ui/admin/config/environment.js

@@ -53,7 +53,8 @@ module.exports = function (environment) {
         'group.add-members': '/groups/add-members',
         'host-catalog': '/host-catalogs',
         'host-catalog.new': '/host-catalogs/new',
-        'host-catalog.set-up-cloud-hosts': '/host-catalog-set-up-cloud-hosts',
+        'host-catalog.azure': '/dynamic-host-catalogs-on-azure',
+        'host-catalog.aws': '/dynamic-host-catalogs-on-aws',
         'host-set': '/host-sets',
         'host-set.new': '/host-sets/new',
         'host-set.add-hosts': '/host-sets/add-hosts',