Skip to content

Commit

Permalink
Merge pull request #6175 from hashicorp/dani/remove-hidden-vols
Browse files Browse the repository at this point in the history
remove hidden field from host volumes
  • Loading branch information
endocrimes authored Aug 22, 2019
2 parents 30da2b8 + 2d2b23d commit fbddb92
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion api/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,6 @@ type DriverInfo struct {
type HostVolumeInfo struct {
Path string
ReadOnly bool
Hidden bool
}

// Node is used to deserialize a node entry.
Expand Down
1 change: 0 additions & 1 deletion api/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,6 @@ type VolumeRequest struct {
Name string
Type string
ReadOnly bool `mapstructure:"read_only"`
Hidden bool

Config map[string]interface{}
}
Expand Down
1 change: 0 additions & 1 deletion command/agent/job_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,6 @@ func ApiTgToStructsTG(taskGroup *api.TaskGroup, tg *structs.TaskGroup) {
Name: v.Name,
Type: v.Type,
ReadOnly: v.ReadOnly,
Hidden: v.Hidden,
Config: v.Config,
}

Expand Down
4 changes: 2 additions & 2 deletions command/node_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,11 @@ func (c *NodeStatusCommand) outputNodeVolumeInfo(node *api.Node) {
sort.Strings(names)

output := make([]string, 0, len(names)+1)
output = append(output, "Name|ReadOnly|Hidden|Source")
output = append(output, "Name|ReadOnly|Source")

for _, volName := range names {
info := node.HostVolumes[volName]
output = append(output, fmt.Sprintf("%s|%v|%v|%s", volName, info.ReadOnly, info.Hidden, info.Path))
output = append(output, fmt.Sprintf("%s|%v|%s", volName, info.ReadOnly, info.Path))
}
c.Ui.Output(formatList(output))
}
Expand Down
2 changes: 0 additions & 2 deletions nomad/structs/volumes.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ type ClientHostVolumeConfig struct {
Name string `hcl:",key"`
Path string `hcl:"path"`
ReadOnly bool `hcl:"read_only"`
Hidden bool `hcl:"hidden"`
}

func (p *ClientHostVolumeConfig) Copy() *ClientHostVolumeConfig {
Expand Down Expand Up @@ -96,7 +95,6 @@ type VolumeRequest struct {
Name string
Type string
ReadOnly bool
Hidden bool

Config map[string]interface{}
}
Expand Down

0 comments on commit fbddb92

Please sign in to comment.