Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: microsoft/hcsshim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.12.2
Choose a base ref
...
head repository: microsoft/hcsshim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.12.3
Choose a head ref
  • 1 commit
  • 85 files changed
  • 1 contributor

Commits on Apr 19, 2024

  1. Update go-winio to v0.6.2 & fix lint errors 

    Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
    @kiashok
    kiashok committed Apr 19, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    c950974 View commit details
Showing with 683 additions and 13,074 deletions.
  1. +12 −15 computestorage/zsyscall_windows.go
  2. +1 −1 go.mod
  3. +2 −2 go.sum
  4. +37 −40 hcn/zsyscall_windows.go
  5. +2 −2 internal/hcs/utils.go
  6. +1 −4 internal/hns/zsyscall_windows.go
  7. +1 −4 internal/interop/zsyscall_windows.go
  8. +1 −4 internal/regstate/zsyscall_windows.go
  9. +3 −6 internal/security/zsyscall_windows.go
  10. +26 −29 internal/vmcompute/zsyscall_windows.go
  11. +21 −24 internal/wclayer/zsyscall_windows.go
  12. +56 −59 internal/winapi/zsyscall_windows.go
  13. +1 −2 test/go.mod
  14. +3 −2 test/go.sum
  15. +4 −6 vendor/github.com/Microsoft/go-winio/.golangci.yml
  16. +15 −18 vendor/github.com/Microsoft/go-winio/backup.go
  17. +4 −5 vendor/github.com/Microsoft/go-winio/backuptar/tar.go
  18. +37 −48 vendor/github.com/Microsoft/go-winio/file.go
  19. +18 −4 vendor/github.com/Microsoft/go-winio/fileinfo.go
  20. +27 −20 vendor/github.com/Microsoft/go-winio/hvsock.go
  21. +66 −6 vendor/github.com/Microsoft/go-winio/internal/fs/fs.go
  22. +3 −6 vendor/github.com/Microsoft/go-winio/internal/fs/zsyscall_windows.go
  23. +3 −5 vendor/github.com/Microsoft/go-winio/internal/socket/socket.go
  24. +3 −6 vendor/github.com/Microsoft/go-winio/internal/socket/zsyscall_windows.go
  25. +1 −1 vendor/github.com/Microsoft/go-winio/internal/stringbuffer/wstring.go
  26. +93 −32 vendor/github.com/Microsoft/go-winio/pipe.go
  27. +3 −2 vendor/github.com/Microsoft/go-winio/pkg/etw/eventdata.go
  28. +14 −6 vendor/github.com/Microsoft/go-winio/pkg/etw/eventdescriptor.go
  29. +12 −3 vendor/github.com/Microsoft/go-winio/pkg/etw/fieldopt.go
  30. +28 −0 vendor/github.com/Microsoft/go-winio/pkg/etw/level_string.go
  31. +27 −0 vendor/github.com/Microsoft/go-winio/pkg/etw/opcode_string.go
  32. +7 −10 vendor/github.com/Microsoft/go-winio/pkg/etw/zsyscall_windows.go
  33. +32 −21 vendor/github.com/Microsoft/go-winio/pkg/fs/resolve.go
  34. +3 −6 vendor/github.com/Microsoft/go-winio/pkg/process/zsyscall_windows.go
  35. +4 −5 vendor/github.com/Microsoft/go-winio/privilege.go
  36. +13 −24 vendor/github.com/Microsoft/go-winio/sd.go
  37. +0 −5 vendor/github.com/Microsoft/go-winio/tools.go
  38. +9 −46 vendor/github.com/Microsoft/go-winio/tools/mkwinsyscall/mkwinsyscall.go
  39. +5 −8 vendor/github.com/Microsoft/go-winio/vhd/zvhd_windows.go
  40. +82 −123 vendor/github.com/Microsoft/go-winio/zsyscall_windows.go
  41. +0 −660 vendor/golang.org/x/tools/cmd/stringer/stringer.go
  42. +0 −186 vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
  43. +0 −75 vendor/golang.org/x/tools/go/gcexportdata/importer.go
  44. +0 −48 vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
  45. +0 −220 vendor/golang.org/x/tools/go/packages/doc.go
  46. +0 −101 vendor/golang.org/x/tools/go/packages/external.go
  47. +0 −1,181 vendor/golang.org/x/tools/go/packages/golist.go
  48. +0 −575 vendor/golang.org/x/tools/go/packages/golist_overlay.go
  49. +0 −57 vendor/golang.org/x/tools/go/packages/loadmode_string.go
  50. +0 −1,333 vendor/golang.org/x/tools/go/packages/packages.go
  51. +0 −59 vendor/golang.org/x/tools/go/packages/visit.go
  52. +0 −827 vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
  53. +0 −150 vendor/golang.org/x/tools/internal/gcimporter/bimport.go
  54. +0 −99 vendor/golang.org/x/tools/internal/gcimporter/exportdata.go
  55. +0 −273 vendor/golang.org/x/tools/internal/gcimporter/gcimporter.go
  56. +0 −1,322 vendor/golang.org/x/tools/internal/gcimporter/iexport.go
  57. +0 −1,083 vendor/golang.org/x/tools/internal/gcimporter/iimport.go
  58. +0 −22 vendor/golang.org/x/tools/internal/gcimporter/newInterface10.go
  59. +0 −14 vendor/golang.org/x/tools/internal/gcimporter/newInterface11.go
  60. +0 −16 vendor/golang.org/x/tools/internal/gcimporter/support_go117.go
  61. +0 −37 vendor/golang.org/x/tools/internal/gcimporter/support_go118.go
  62. +0 −10 vendor/golang.org/x/tools/internal/gcimporter/unified_no.go
  63. +0 −10 vendor/golang.org/x/tools/internal/gcimporter/unified_yes.go
  64. +0 −19 vendor/golang.org/x/tools/internal/gcimporter/ureader_no.go
  65. +0 −728 vendor/golang.org/x/tools/internal/gcimporter/ureader_yes.go
  66. +0 −30 vendor/golang.org/x/tools/internal/packagesinternal/packages.go
  67. +0 −77 vendor/golang.org/x/tools/internal/pkgbits/codes.go
  68. +0 −517 vendor/golang.org/x/tools/internal/pkgbits/decoder.go
  69. +0 −32 vendor/golang.org/x/tools/internal/pkgbits/doc.go
  70. +0 −383 vendor/golang.org/x/tools/internal/pkgbits/encoder.go
  71. +0 −9 vendor/golang.org/x/tools/internal/pkgbits/flags.go
  72. +0 −21 vendor/golang.org/x/tools/internal/pkgbits/frames_go1.go
  73. +0 −28 vendor/golang.org/x/tools/internal/pkgbits/frames_go17.go
  74. +0 −42 vendor/golang.org/x/tools/internal/pkgbits/reloc.go
  75. +0 −17 vendor/golang.org/x/tools/internal/pkgbits/support.go
  76. +0 −113 vendor/golang.org/x/tools/internal/pkgbits/sync.go
  77. +0 −89 vendor/golang.org/x/tools/internal/pkgbits/syncmarker_string.go
  78. +0 −151 vendor/golang.org/x/tools/internal/tokeninternal/tokeninternal.go
  79. +0 −1,560 vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
  80. +0 −179 vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
  81. +0 −24 vendor/golang.org/x/tools/internal/typesinternal/objectpath.go
  82. +0 −52 vendor/golang.org/x/tools/internal/typesinternal/types.go
  83. +0 −19 vendor/golang.org/x/tools/internal/typesinternal/types_118.go
  84. +2 −12 vendor/modules.txt
  85. +1 −4 zsyscall_windows.go
27 changes: 12 additions & 15 deletions computestorage/zsyscall_windows.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ go 1.21
require (
github.com/Microsoft/cosesign1go v1.1.0
github.com/Microsoft/didx509go v0.0.2
github.com/Microsoft/go-winio v0.6.1
github.com/Microsoft/go-winio v0.6.2
github.com/blang/semver/v4 v4.0.0
github.com/cenkalti/backoff/v4 v4.2.1
github.com/containerd/cgroups/v3 v3.0.2
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -79,8 +79,8 @@ github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JP
github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
77 changes: 37 additions & 40 deletions hcn/zsyscall_windows.go
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions internal/hcs/utils.go
View file
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@ import (
"golang.org/x/sys/windows"
)

// makeOpenFiles calls winio.MakeOpenFile for each handle in a slice but closes all the handles
// makeOpenFiles calls winio.NewOpenFile for each handle in a slice but closes all the handles
// if there is an error.
func makeOpenFiles(hs []syscall.Handle) (_ []io.ReadWriteCloser, err error) {
fs := make([]io.ReadWriteCloser, len(hs))
for i, h := range hs {
if h != syscall.Handle(0) {
if err == nil {
fs[i], err = winio.MakeOpenFile(h)
fs[i], err = winio.NewOpenFile(windows.Handle(h))
}
if err != nil {
syscall.Close(h)
5 changes: 1 addition & 4 deletions internal/hns/zsyscall_windows.go
View file
5 changes: 1 addition & 4 deletions internal/interop/zsyscall_windows.go
View file
5 changes: 1 addition & 4 deletions internal/regstate/zsyscall_windows.go
View file
9 changes: 3 additions & 6 deletions internal/security/zsyscall_windows.go
View file
55 changes: 26 additions & 29 deletions internal/vmcompute/zsyscall_windows.go
View file
45 changes: 21 additions & 24 deletions internal/wclayer/zsyscall_windows.go
View file
115 changes: 56 additions & 59 deletions internal/winapi/zsyscall_windows.go
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions test/go.mod
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ module github.com/Microsoft/hcsshim/test
go 1.21

require (
github.com/Microsoft/go-winio v0.6.1
github.com/Microsoft/go-winio v0.6.2
github.com/Microsoft/hcsshim v0.11.4
github.com/containerd/cgroups/v3 v3.0.2
github.com/containerd/containerd v1.7.0
@@ -100,7 +100,6 @@ require (
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
5 changes: 3 additions & 2 deletions test/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1239,8 +1239,9 @@ github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOp
github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
@@ -3063,8 +3064,8 @@ golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
10 changes: 4 additions & 6 deletions vendor/github.com/Microsoft/go-winio/.golangci.yml
View file
33 changes: 15 additions & 18 deletions vendor/github.com/Microsoft/go-winio/backup.go
View file
9 changes: 4 additions & 5 deletions vendor/github.com/Microsoft/go-winio/backuptar/tar.go
View file
85 changes: 37 additions & 48 deletions vendor/github.com/Microsoft/go-winio/file.go
View file
22 changes: 18 additions & 4 deletions vendor/github.com/Microsoft/go-winio/fileinfo.go
View file
47 changes: 27 additions & 20 deletions vendor/github.com/Microsoft/go-winio/hvsock.go
View file
72 changes: 66 additions & 6 deletions vendor/github.com/Microsoft/go-winio/internal/fs/fs.go
View file
9 changes: 3 additions & 6 deletions vendor/github.com/Microsoft/go-winio/internal/fs/zsyscall_windows.go
View file
8 changes: 3 additions & 5 deletions vendor/github.com/Microsoft/go-winio/internal/socket/socket.go
View file
9 changes: 3 additions & 6 deletions vendor/github.com/Microsoft/go-winio/internal/socket/zsyscall_windows.go
View file
2 changes: 1 addition & 1 deletion vendor/github.com/Microsoft/go-winio/internal/stringbuffer/wstring.go
View file
125 changes: 93 additions & 32 deletions vendor/github.com/Microsoft/go-winio/pipe.go
View file
5 changes: 3 additions & 2 deletions vendor/github.com/Microsoft/go-winio/pkg/etw/eventdata.go
View file
20 changes: 14 additions & 6 deletions vendor/github.com/Microsoft/go-winio/pkg/etw/eventdescriptor.go
View file
15 changes: 12 additions & 3 deletions vendor/github.com/Microsoft/go-winio/pkg/etw/fieldopt.go
View file
28 changes: 28 additions & 0 deletions vendor/github.com/Microsoft/go-winio/pkg/etw/level_string.go
View file
27 changes: 27 additions & 0 deletions vendor/github.com/Microsoft/go-winio/pkg/etw/opcode_string.go
View file
17 changes: 7 additions & 10 deletions vendor/github.com/Microsoft/go-winio/pkg/etw/zsyscall_windows.go
View file
53 changes: 32 additions & 21 deletions vendor/github.com/Microsoft/go-winio/pkg/fs/resolve.go
View file
9 changes: 3 additions & 6 deletions vendor/github.com/Microsoft/go-winio/pkg/process/zsyscall_windows.go
View file
9 changes: 4 additions & 5 deletions vendor/github.com/Microsoft/go-winio/privilege.go
View file
37 changes: 13 additions & 24 deletions vendor/github.com/Microsoft/go-winio/sd.go
View file
5 changes: 0 additions & 5 deletions vendor/github.com/Microsoft/go-winio/tools.go
View file

This file was deleted.

55 changes: 9 additions & 46 deletions vendor/github.com/Microsoft/go-winio/tools/mkwinsyscall/mkwinsyscall.go
View file
Loading