Rework docker info output to be more like docker version

That is, reindent the two sections by one space. While the code was done by hand the `.golden` files had the extra space inserted with emacs' `string-insert-rectangle` macro to (try to) avoid possible manual errors. The docs were edited the same way. Signed-off-by: Ian Campbell <[email protected]>
anamehra · Jan 25, 2019 · bcb06b5 · bcb06b5
1 parent c9e60ae
commit bcb06b5
Show file tree

Hide file tree

Showing 7 changed files with 559 additions and 579 deletions.
diff --git a/cli/command/system/info.go b/cli/command/system/info.go
diff --git a/cli/command/system/testdata/docker-info-badsec.golden b/cli/command/system/testdata/docker-info-badsec.golden
@@ -1,54 +1,52 @@
-Client
-------
-Debug Mode: false
+Client:
+ Debug Mode: false
 
-Server
-------
-Containers: 0
- Running: 0
- Paused: 0
- Stopped: 0
-Images: 0
-Server Version: 17.06.1-ce
-Storage Driver: aufs
- Root Dir: /var/lib/docker/aufs
- Backing Filesystem: extfs
- Dirs: 0
- Dirperm1 Supported: true
-Logging Driver: json-file
-Cgroup Driver: cgroupfs
-Plugins:
- Volume: local
- Network: bridge host macvlan null overlay
- Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog
-Swarm: inactive
-Runtimes: runc
-Default Runtime: runc
-Init Binary: docker-init
-containerd version: 6e23458c129b551d5c9871e5174f6b1b7f6d1170
-runc version: 810190ceaa507aa2727d7ae6f4790c76ec150bd2
-init version: 949e6fa
-Kernel Version: 4.4.0-87-generic
-Operating System: Ubuntu 16.04.3 LTS
-OSType: linux
-Architecture: x86_64
-CPUs: 2
-Total Memory: 1.953GiB
-Name: system-sample
-ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
-Docker Root Dir: /var/lib/docker
-Debug Mode: true
- File Descriptors: 33
- Goroutines: 135
- System Time: 2017-08-24T17:44:34.077811894Z
- EventsListeners: 0
-Registry: https://index.docker.io/v1/
-Labels:
- provider=digitalocean
-Experimental: false
-Insecure Registries:
- 127.0.0.0/8
-Live Restore Enabled: false
+Server:
+ Containers: 0
+  Running: 0
+  Paused: 0
+  Stopped: 0
+ Images: 0
+ Server Version: 17.06.1-ce
+ Storage Driver: aufs
+  Root Dir: /var/lib/docker/aufs
+  Backing Filesystem: extfs
+  Dirs: 0
+  Dirperm1 Supported: true
+ Logging Driver: json-file
+ Cgroup Driver: cgroupfs
+ Plugins:
+  Volume: local
+  Network: bridge host macvlan null overlay
+  Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog
+ Swarm: inactive
+ Runtimes: runc
+ Default Runtime: runc
+ Init Binary: docker-init
+ containerd version: 6e23458c129b551d5c9871e5174f6b1b7f6d1170
+ runc version: 810190ceaa507aa2727d7ae6f4790c76ec150bd2
+ init version: 949e6fa
+ Kernel Version: 4.4.0-87-generic
+ Operating System: Ubuntu 16.04.3 LTS
+ OSType: linux
+ Architecture: x86_64
+ CPUs: 2
+ Total Memory: 1.953GiB
+ Name: system-sample
+ ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
+ Docker Root Dir: /var/lib/docker
+ Debug Mode: true
+  File Descriptors: 33
+  Goroutines: 135
+  System Time: 2017-08-24T17:44:34.077811894Z
+  EventsListeners: 0
+ Registry: https://index.docker.io/v1/
+ Labels:
+  provider=digitalocean
+ Experimental: false
+ Insecure Registries:
+  127.0.0.0/8
+ Live Restore Enabled: false
 
 ERROR: an error happened
 ERROR: invalid empty security option
diff --git a/cli/command/system/testdata/docker-info-errors.golden b/cli/command/system/testdata/docker-info-errors.golden
@@ -1,7 +1,5 @@
-Client
-------
+Client:
 ERROR: a client error occurred
 
-Server
-------
+Server:
 ERROR: a server error occurred
diff --git a/cli/command/system/testdata/docker-info-no-swarm.golden b/cli/command/system/testdata/docker-info-no-swarm.golden
@@ -1,56 +1,54 @@
-Client
-------
-Debug Mode: true
+Client:
+ Debug Mode: true
 
-Server
-------
-Containers: 0
- Running: 0
- Paused: 0
- Stopped: 0
-Images: 0
-Server Version: 17.06.1-ce
-Storage Driver: aufs
- Root Dir: /var/lib/docker/aufs
- Backing Filesystem: extfs
- Dirs: 0
- Dirperm1 Supported: true
-Logging Driver: json-file
-Cgroup Driver: cgroupfs
-Plugins:
- Volume: local
- Network: bridge host macvlan null overlay
- Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog
-Swarm: inactive
-Runtimes: runc
-Default Runtime: runc
-Init Binary: docker-init
-containerd version: 6e23458c129b551d5c9871e5174f6b1b7f6d1170
-runc version: 810190ceaa507aa2727d7ae6f4790c76ec150bd2
-init version: 949e6fa
-Security Options:
- apparmor
- seccomp
-  Profile: default
-Kernel Version: 4.4.0-87-generic
-Operating System: Ubuntu 16.04.3 LTS
-OSType: linux
-Architecture: x86_64
-CPUs: 2
-Total Memory: 1.953GiB
-Name: system-sample
-ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
-Docker Root Dir: /var/lib/docker
-Debug Mode: true
- File Descriptors: 33
- Goroutines: 135
- System Time: 2017-08-24T17:44:34.077811894Z
- EventsListeners: 0
-Registry: https://index.docker.io/v1/
-Labels:
- provider=digitalocean
-Experimental: false
-Insecure Registries:
- 127.0.0.0/8
-Live Restore Enabled: false
+Server:
+ Containers: 0
+  Running: 0
+  Paused: 0
+  Stopped: 0
+ Images: 0
+ Server Version: 17.06.1-ce
+ Storage Driver: aufs
+  Root Dir: /var/lib/docker/aufs
+  Backing Filesystem: extfs
+  Dirs: 0
+  Dirperm1 Supported: true
+ Logging Driver: json-file
+ Cgroup Driver: cgroupfs
+ Plugins:
+  Volume: local
+  Network: bridge host macvlan null overlay
+  Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog
+ Swarm: inactive
+ Runtimes: runc
+ Default Runtime: runc
+ Init Binary: docker-init
+ containerd version: 6e23458c129b551d5c9871e5174f6b1b7f6d1170
+ runc version: 810190ceaa507aa2727d7ae6f4790c76ec150bd2
+ init version: 949e6fa
+ Security Options:
+  apparmor
+  seccomp
+   Profile: default
+ Kernel Version: 4.4.0-87-generic
+ Operating System: Ubuntu 16.04.3 LTS
+ OSType: linux
+ Architecture: x86_64
+ CPUs: 2
+ Total Memory: 1.953GiB
+ Name: system-sample
+ ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
+ Docker Root Dir: /var/lib/docker
+ Debug Mode: true
+  File Descriptors: 33
+  Goroutines: 135
+  System Time: 2017-08-24T17:44:34.077811894Z
+  EventsListeners: 0
+ Registry: https://index.docker.io/v1/
+ Labels:
+  provider=digitalocean
+ Experimental: false
+ Insecure Registries:
+  127.0.0.0/8
+ Live Restore Enabled: false
 
diff --git a/cli/command/system/testdata/docker-info-with-swarm.golden b/cli/command/system/testdata/docker-info-with-swarm.golden
@@ -1,78 +1,76 @@
-Client
-------
-Debug Mode: false
+Client:
+ Debug Mode: false
 
-Server
-------
-Containers: 0
- Running: 0
- Paused: 0
- Stopped: 0
-Images: 0
-Server Version: 17.06.1-ce
-Storage Driver: aufs
- Root Dir: /var/lib/docker/aufs
- Backing Filesystem: extfs
- Dirs: 0
- Dirperm1 Supported: true
-Logging Driver: json-file
-Cgroup Driver: cgroupfs
-Plugins:
- Volume: local
- Network: bridge host macvlan null overlay
- Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog
-Swarm: active
- NodeID: qo2dfdig9mmxqkawulggepdih
- Is Manager: true
- ClusterID: 9vs5ygs0gguyyec4iqf2314c0
- Managers: 1
- Nodes: 1
- Orchestration:
-  Task History Retention Limit: 5
- Raft:
-  Snapshot Interval: 10000
-  Number of Old Snapshots to Retain: 0
-  Heartbeat Tick: 1
-  Election Tick: 3
- Dispatcher:
-  Heartbeat Period: 5 seconds
- CA Configuration:
-  Expiry Duration: 3 months
-  Force Rotate: 0
- Autolock Managers: true
- Root Rotation In Progress: false
- Node Address: 165.227.107.89
- Manager Addresses:
-  165.227.107.89:2377
-Runtimes: runc
-Default Runtime: runc
-Init Binary: docker-init
-containerd version: 6e23458c129b551d5c9871e5174f6b1b7f6d1170
-runc version: 810190ceaa507aa2727d7ae6f4790c76ec150bd2
-init version: 949e6fa
-Security Options:
- apparmor
- seccomp
-  Profile: default
-Kernel Version: 4.4.0-87-generic
-Operating System: Ubuntu 16.04.3 LTS
-OSType: linux
-Architecture: x86_64
-CPUs: 2
-Total Memory: 1.953GiB
-Name: system-sample
-ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
-Docker Root Dir: /var/lib/docker
-Debug Mode: true
- File Descriptors: 33
- Goroutines: 135
- System Time: 2017-08-24T17:44:34.077811894Z
- EventsListeners: 0
-Registry: https://index.docker.io/v1/
-Labels:
- provider=digitalocean
-Experimental: false
-Insecure Registries:
- 127.0.0.0/8
-Live Restore Enabled: false
+Server:
+ Containers: 0
+  Running: 0
+  Paused: 0
+  Stopped: 0
+ Images: 0
+ Server Version: 17.06.1-ce
+ Storage Driver: aufs
+  Root Dir: /var/lib/docker/aufs
+  Backing Filesystem: extfs
+  Dirs: 0
+  Dirperm1 Supported: true
+ Logging Driver: json-file
+ Cgroup Driver: cgroupfs
+ Plugins:
+  Volume: local
+  Network: bridge host macvlan null overlay
+  Log: awslogs fluentd gcplogs gelf journald json-file logentries splunk syslog
+ Swarm: active
+  NodeID: qo2dfdig9mmxqkawulggepdih
+  Is Manager: true
+  ClusterID: 9vs5ygs0gguyyec4iqf2314c0
+  Managers: 1
+  Nodes: 1
+  Orchestration:
+   Task History Retention Limit: 5
+  Raft:
+   Snapshot Interval: 10000
+   Number of Old Snapshots to Retain: 0
+   Heartbeat Tick: 1
+   Election Tick: 3
+  Dispatcher:
+   Heartbeat Period: 5 seconds
+  CA Configuration:
+   Expiry Duration: 3 months
+   Force Rotate: 0
+  Autolock Managers: true
+  Root Rotation In Progress: false
+  Node Address: 165.227.107.89
+  Manager Addresses:
+   165.227.107.89:2377
+ Runtimes: runc
+ Default Runtime: runc
+ Init Binary: docker-init
+ containerd version: 6e23458c129b551d5c9871e5174f6b1b7f6d1170
+ runc version: 810190ceaa507aa2727d7ae6f4790c76ec150bd2
+ init version: 949e6fa
+ Security Options:
+  apparmor
+  seccomp
+   Profile: default
+ Kernel Version: 4.4.0-87-generic
+ Operating System: Ubuntu 16.04.3 LTS
+ OSType: linux
+ Architecture: x86_64
+ CPUs: 2
+ Total Memory: 1.953GiB
+ Name: system-sample
+ ID: EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX
+ Docker Root Dir: /var/lib/docker
+ Debug Mode: true
+  File Descriptors: 33
+  Goroutines: 135
+  System Time: 2017-08-24T17:44:34.077811894Z
+  EventsListeners: 0
+ Registry: https://index.docker.io/v1/
+ Labels:
+  provider=digitalocean
+ Experimental: false
+ Insecure Registries:
+  127.0.0.0/8
+ Live Restore Enabled: false