Fix instance/ipool key naming in json output (#612)

Renames keys that did not match actual data:
- `template_id` -> `template`;
- `zoneid` -> `zone`.

These were present in both `c instance show` and `c instance-pool show`
commands.

CHANGELOG.md

@@ -10,6 +10,7 @@
 ### Bug Fixes
 
 - dbaas opensearch: remove top-level max-index-count flag #611
+- Fix instance/ipool key naming in json output #612
 
 ## 1.78.2
 

cmd/instance_pool_show.go

@@ -21,8 +21,8 @@ type instancePoolShowOutput struct {
 	Name               string            `json:"name"`
 	Description        string            `json:"description"`
 	InstanceType       string            `json:"instance_type"`
-	Template           string            `json:"template_id"`
-	Zone               string            `json:"zoneid"`
+	Template           string            `json:"template"`
+	Zone               string            `json:"zone"`
 	AntiAffinityGroups []string          `json:"anti_affinity_groups" outputLabel:"Anti-Affinity Groups"`
 	SecurityGroups     []string          `json:"security_groups"`
 	PrivateNetworks    []string          `json:"private_networks"`

cmd/instance_show.go

@@ -21,8 +21,8 @@ type instanceShowOutput struct {
 	Name               string            `json:"name"`
 	CreationDate       string            `json:"creation_date"`
 	InstanceType       string            `json:"instance_type"`
-	Template           string            `json:"template_id"`
-	Zone               string            `json:"zoneid"`
+	Template           string            `json:"template"`
+	Zone               string            `json:"zone"`
 	AntiAffinityGroups []string          `json:"anti_affinity_groups" outputLabel:"Anti-Affinity Groups"`
 	DeployTarget       string            `json:"deploy_target"`
 	SecurityGroups     []string          `json:"security_groups"`