drop host key from ssh scheme

corpix · Aug 14, 2022 · 5fd56f7 · 5fd56f7
1 parent 578fc49
commit 5fd56f7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -100,7 +100,6 @@ Optional:
 
 - `bastion` (Block Set, Max: 1) SSH configuration for bastion server (see [below for nested schema](#nestedblock--ssh--bastion))
 - `config` (Map of String) SSH configuration map
-- `host` (String) SSH remote hostname
 - `port` (Number) SSH remote port
 - `user` (String) SSH remote user name
 

diff --git a/docs/resources/instance.md b/docs/resources/instance.md
@@ -118,7 +118,6 @@ Optional:
 
 - `bastion` (Block Set, Max: 1) SSH configuration for bastion server (see [below for nested schema](#nestedblock--ssh--bastion))
 - `config` (Map of String) SSH configuration map
-- `host` (String) SSH remote hostname
 - `port` (Number) SSH remote port
 - `user` (String) SSH remote user name
 

diff --git a/provider/schema.go b/provider/schema.go
@@ -93,11 +93,6 @@ const (
 
 var (
 	ProviderSchemaSshMap = map[string]*schema.Schema{
-		KeySshHost: {
-			Description: "SSH remote hostname",
-			Type:        schema.TypeString,
-			Optional:    true,
-		},
 		KeySshUser: {
 			Description: "SSH remote user name",
 			Type:        schema.TypeString,
@@ -117,6 +112,16 @@ var (
 			DefaultFunc: DefaultSshConfig,
 		},
 	}
+	ProviderSchemaBastionMap = SchemaMapExtend(
+		ProviderSchemaSshMap,
+		map[string]*schema.Schema{
+			KeySshHost: {
+				Description: "SSH remote hostname",
+				Type:        schema.TypeString,
+				Optional:    true,
+			},
+		},
+	)
 	ProviderSchemaSsh = SchemaWithDefaultFuncCtr(DefaultMapFromSchema, &schema.Schema{
 		Description: "SSH protocol settings",
 		Type:        schema.TypeSet,
@@ -130,7 +135,7 @@ var (
 						Type:        schema.TypeSet,
 						MaxItems:    1,
 						Elem: &schema.Resource{
-							Schema: ProviderSchemaSshMap,
+							Schema: ProviderSchemaBastionMap,
 						},
 						Optional: true,
 					},