From 2153338e376d777fa2eada72a3182e529e8773c5 Mon Sep 17 00:00:00 2001
From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
Date: Fri, 24 Sep 2021 20:10:17 +1000
Subject: [PATCH 1/3] Check in CI that the test/ module doesn't use internal
 APIs

An idea mentioned in-passing in #1073, this would ensure that tests can
be looked at as usage examples, which use of internal APIs prevents.

vendor/ and internal/ are excluded, the former because we only care
about direct dependencies, and the latter so that if tests are done that
depend on an unpublished API, it's possible _and_ explicit.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
---
 .github/workflows/ci.yml                  | 21 +++++++++++++++++++++
 test/scripts/Verify-NoInternalImports.ps1 |  7 +++++++
 2 files changed, 28 insertions(+)
 create mode 100644 test/scripts/Verify-NoInternalImports.ps1

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10732582c0..ee0d49a804 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,6 +107,27 @@ jobs:
           }
           exit $process.ExitCode
 
+  verify-test-doesnt-use-internal-apis:
+    runs-on: 'windows-2019'
+    env:
+      GOPROXY: "https://proxy.golang.org,direct"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '^1.15.0'
+      - name: Validate test module doesn't use internal APIs
+        shell: powershell
+        run: |
+          $currentPath = (Get-Location).Path
+          $failures = & ${currentPath}/test/scripts/Verify-NoInternalImports.ps1 "${currentPath}/test"
+          if ($failures.Length -gt 0) {
+            Write-Error ("Test module should not depend on github.com/Microsoft/hcsshim/internal/... to function." + "`r`n" + $failures)
+          }
+          exit $failures.Length
+        # TODO: Remove this once this test succeeds.
+        continue-on-error: true
+
   test:
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/test/scripts/Verify-NoInternalImports.ps1 b/test/scripts/Verify-NoInternalImports.ps1
new file mode 100644
index 0000000000..0f3005dd01
--- /dev/null
+++ b/test/scripts/Verify-NoInternalImports.ps1
@@ -0,0 +1,7 @@
+$FOUND = 0
+Get-ChildItem -Path $args[0] -Recurse -Include '*.go' | Where-Object { $_.Directory -NotMatch 'vendor|internal' } | ForEach-Object {
+    $LISTDATA = (go list -tags functional -json $_.FullName | ConvertFrom-Json)
+    $INTERNALS = $LISTDATA.Imports.Where({ $_.StartsWith("github.com/Microsoft/hcsshim/internal") }) + $LISTDATA.TestImports.Where({ $_.StartsWith("github.com/Microsoft/hcsshim/internal") })
+    if ($INTERNALS.Length -gt 0) { Write-Output "$_ contains one or more imports from github.com/Microsoft/hcsshim/internal/..."; $FOUND += 1 }
+}
+exit $FOUND

From d413607a4654dcd39473ab9e52db8b884331d53c Mon Sep 17 00:00:00 2001
From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
Date: Fri, 24 Sep 2021 20:57:21 +1000
Subject: [PATCH 2/3] HACK: Fail CI on this branch until it's all working.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ee0d49a804..0d07e58ebe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -125,8 +125,6 @@ jobs:
             Write-Error ("Test module should not depend on github.com/Microsoft/hcsshim/internal/... to function." + "`r`n" + $failures)
           }
           exit $failures.Length
-        # TODO: Remove this once this test succeeds.
-        continue-on-error: true
 
   test:
     runs-on: ${{ matrix.os }}

From df1b28aaf4bf015652e52540db0eed78cb86db2e Mon Sep 17 00:00:00 2001
From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
Date: Fri, 24 Sep 2021 22:27:35 +1000
Subject: [PATCH 3/3] Make shimdiag package public

Some alternative approaches:
* Move the relevant tests to tests/internal to make it clear it's
  testing internal stuff.
* Restructure the four tests to use a compiled shimdiag.exe or
  host-provided hcsdiag.exe instead, assuming the latter is equivalent.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
---
 Protobuild.toml                               |  2 +-
 cmd/containerd-shim-runhcs-v1/main.go         |  2 +-
 cmd/containerd-shim-runhcs-v1/serve.go        |  2 +-
 cmd/containerd-shim-runhcs-v1/service.go      |  2 +-
 .../service_internal.go                       |  2 +-
 cmd/containerd-shim-runhcs-v1/task.go         |  2 +-
 cmd/containerd-shim-runhcs-v1/task_hcs.go     |  2 +-
 cmd/containerd-shim-runhcs-v1/task_test.go    |  2 +-
 .../task_wcow_podsandbox.go                   |  2 +-
 cmd/shimdiag/exec.go                          |  2 +-
 cmd/shimdiag/list.go                          |  2 +-
 cmd/shimdiag/share.go                         |  2 +-
 cmd/shimdiag/shimdiag.go                      |  2 +-
 cmd/shimdiag/stacks.go                        |  2 +-
 internal/tools/extendedtask/extendedtask.go   |  2 +-
 {internal => pkg}/shimdiag/doc.go             |  0
 {internal => pkg}/shimdiag/shimdiag.go        |  0
 {internal => pkg}/shimdiag/shimdiag.pb.go     | 95 +++++++++----------
 {internal => pkg}/shimdiag/shimdiag.proto     |  4 +-
 test/cri-containerd/exec.go                   |  2 +-
 test/cri-containerd/extended_task_test.go     |  2 +-
 test/cri-containerd/runpodsandbox_test.go     |  2 +-
 test/cri-containerd/share.go                  |  2 +-
 test/cri-containerd/update_utilities_test.go  |  2 +-
 .../Microsoft/hcsshim/Protobuild.toml         |  2 +-
 .../hcsshim/{internal => pkg}/shimdiag/doc.go |  0
 .../{internal => pkg}/shimdiag/shimdiag.go    |  0
 .../{internal => pkg}/shimdiag/shimdiag.pb.go | 95 +++++++++----------
 .../{internal => pkg}/shimdiag/shimdiag.proto |  4 +-
 test/vendor/modules.txt                       |  2 +-
 30 files changed, 120 insertions(+), 122 deletions(-)
 rename {internal => pkg}/shimdiag/doc.go (100%)
 rename {internal => pkg}/shimdiag/shimdiag.go (100%)
 rename {internal => pkg}/shimdiag/shimdiag.pb.go (92%)
 rename {internal => pkg}/shimdiag/shimdiag.proto (91%)
 rename test/vendor/github.com/Microsoft/hcsshim/{internal => pkg}/shimdiag/doc.go (100%)
 rename test/vendor/github.com/Microsoft/hcsshim/{internal => pkg}/shimdiag/shimdiag.go (100%)
 rename test/vendor/github.com/Microsoft/hcsshim/{internal => pkg}/shimdiag/shimdiag.pb.go (92%)
 rename test/vendor/github.com/Microsoft/hcsshim/{internal => pkg}/shimdiag/shimdiag.proto (91%)

diff --git a/Protobuild.toml b/Protobuild.toml
index 471f133866..f17f6f6cf5 100644
--- a/Protobuild.toml
+++ b/Protobuild.toml
@@ -28,7 +28,7 @@ plugins = ["grpc", "fieldpath"]
   "github/containerd/cgroups/stats/v1/metrics.proto" = "github.com/containerd/cgroups/stats/v1"
 
 [[overrides]]
-prefixes = ["github.com/Microsoft/hcsshim/internal/shimdiag"]
+prefixes = ["github.com/Microsoft/hcsshim/pkg/shimdiag"]
 plugins = ["ttrpc"]
 
 [[overrides]]
diff --git a/cmd/containerd-shim-runhcs-v1/main.go b/cmd/containerd-shim-runhcs-v1/main.go
index f64d93ec30..ac1cc98d7c 100644
--- a/cmd/containerd-shim-runhcs-v1/main.go
+++ b/cmd/containerd-shim-runhcs-v1/main.go
@@ -14,7 +14,7 @@ import (
 	"github.com/Microsoft/go-winio/pkg/etwlogrus"
 	"github.com/Microsoft/go-winio/pkg/guid"
 	"github.com/Microsoft/hcsshim/internal/oc"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
diff --git a/cmd/containerd-shim-runhcs-v1/serve.go b/cmd/containerd-shim-runhcs-v1/serve.go
index b88c3a79c2..ff8417d0b8 100644
--- a/cmd/containerd-shim-runhcs-v1/serve.go
+++ b/cmd/containerd-shim-runhcs-v1/serve.go
@@ -28,8 +28,8 @@ import (
 	runhcsopts "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	"github.com/Microsoft/hcsshim/internal/extendedtask"
 	hcslog "github.com/Microsoft/hcsshim/internal/log"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
 	"github.com/Microsoft/hcsshim/pkg/octtrpc"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 )
 
 var svc *service
diff --git a/cmd/containerd-shim-runhcs-v1/service.go b/cmd/containerd-shim-runhcs-v1/service.go
index 92abc70a5c..b673c3a610 100644
--- a/cmd/containerd-shim-runhcs-v1/service.go
+++ b/cmd/containerd-shim-runhcs-v1/service.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/Microsoft/hcsshim/internal/extendedtask"
 	"github.com/Microsoft/hcsshim/internal/oc"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/runtime/v2/task"
 	google_protobuf1 "github.com/gogo/protobuf/types"
diff --git a/cmd/containerd-shim-runhcs-v1/service_internal.go b/cmd/containerd-shim-runhcs-v1/service_internal.go
index 3c64932e80..ed88a3f077 100644
--- a/cmd/containerd-shim-runhcs-v1/service_internal.go
+++ b/cmd/containerd-shim-runhcs-v1/service_internal.go
@@ -13,7 +13,7 @@ import (
 	runhcsopts "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	"github.com/Microsoft/hcsshim/internal/extendedtask"
 	"github.com/Microsoft/hcsshim/internal/oci"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	containerd_v1_types "github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/mount"
diff --git a/cmd/containerd-shim-runhcs-v1/task.go b/cmd/containerd-shim-runhcs-v1/task.go
index 6bae368284..3b6499f13e 100644
--- a/cmd/containerd-shim-runhcs-v1/task.go
+++ b/cmd/containerd-shim-runhcs-v1/task.go
@@ -11,7 +11,7 @@ import (
 	"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
 	"github.com/Microsoft/hcsshim/internal/gcs"
 	"github.com/Microsoft/hcsshim/internal/hcs"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/runtime/v2/task"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
diff --git a/cmd/containerd-shim-runhcs-v1/task_hcs.go b/cmd/containerd-shim-runhcs-v1/task_hcs.go
index 32f6a2055f..b97c91b6cb 100644
--- a/cmd/containerd-shim-runhcs-v1/task_hcs.go
+++ b/cmd/containerd-shim-runhcs-v1/task_hcs.go
@@ -37,10 +37,10 @@ import (
 	"github.com/Microsoft/hcsshim/internal/protocol/guestrequest"
 	"github.com/Microsoft/hcsshim/internal/protocol/guestresource"
 	"github.com/Microsoft/hcsshim/internal/resources"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
 	"github.com/Microsoft/hcsshim/internal/uvm"
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 )
 
 func newHcsStandaloneTask(ctx context.Context, events publisher, req *task.CreateTaskRequest, s *specs.Spec) (shimTask, error) {
diff --git a/cmd/containerd-shim-runhcs-v1/task_test.go b/cmd/containerd-shim-runhcs-v1/task_test.go
index cb9e975ecc..6428693634 100644
--- a/cmd/containerd-shim-runhcs-v1/task_test.go
+++ b/cmd/containerd-shim-runhcs-v1/task_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options"
 	"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	v1 "github.com/containerd/cgroups/stats/v1"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/runtime/v2/task"
diff --git a/cmd/containerd-shim-runhcs-v1/task_wcow_podsandbox.go b/cmd/containerd-shim-runhcs-v1/task_wcow_podsandbox.go
index c99dea3483..b13f0b3a3d 100644
--- a/cmd/containerd-shim-runhcs-v1/task_wcow_podsandbox.go
+++ b/cmd/containerd-shim-runhcs-v1/task_wcow_podsandbox.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Microsoft/hcsshim/internal/clone"
 	"github.com/Microsoft/hcsshim/internal/cmd"
 	"github.com/Microsoft/hcsshim/internal/log"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
 	"github.com/Microsoft/hcsshim/internal/uvm"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/runtime"
diff --git a/cmd/shimdiag/exec.go b/cmd/shimdiag/exec.go
index 403ca7f987..93cd65fa55 100644
--- a/cmd/shimdiag/exec.go
+++ b/cmd/shimdiag/exec.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Microsoft/hcsshim/internal/appargs"
 	"github.com/Microsoft/hcsshim/internal/cmd"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/containerd/console"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/shimdiag/list.go b/cmd/shimdiag/list.go
index fec1b04031..07267e6597 100644
--- a/cmd/shimdiag/list.go
+++ b/cmd/shimdiag/list.go
@@ -8,7 +8,7 @@ import (
 	"text/tabwriter"
 
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/shimdiag/share.go b/cmd/shimdiag/share.go
index 703ba65996..eb3d475d52 100644
--- a/cmd/shimdiag/share.go
+++ b/cmd/shimdiag/share.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/shimdiag/shimdiag.go b/cmd/shimdiag/shimdiag.go
index e658011d9c..3783a1b6d9 100644
--- a/cmd/shimdiag/shimdiag.go
+++ b/cmd/shimdiag/shimdiag.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/shimdiag/stacks.go b/cmd/shimdiag/stacks.go
index 81d58236f2..5a74b38846 100644
--- a/cmd/shimdiag/stacks.go
+++ b/cmd/shimdiag/stacks.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/urfave/cli"
 )
 
diff --git a/internal/tools/extendedtask/extendedtask.go b/internal/tools/extendedtask/extendedtask.go
index 464ab3fb32..22984b1926 100644
--- a/internal/tools/extendedtask/extendedtask.go
+++ b/internal/tools/extendedtask/extendedtask.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/Microsoft/hcsshim/internal/extendedtask"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	"github.com/urfave/cli"
 )
 
diff --git a/internal/shimdiag/doc.go b/pkg/shimdiag/doc.go
similarity index 100%
rename from internal/shimdiag/doc.go
rename to pkg/shimdiag/doc.go
diff --git a/internal/shimdiag/shimdiag.go b/pkg/shimdiag/shimdiag.go
similarity index 100%
rename from internal/shimdiag/shimdiag.go
rename to pkg/shimdiag/shimdiag.go
diff --git a/internal/shimdiag/shimdiag.pb.go b/pkg/shimdiag/shimdiag.pb.go
similarity index 92%
rename from internal/shimdiag/shimdiag.pb.go
rename to pkg/shimdiag/shimdiag.pb.go
index 84ca8aa334..0fbe8e12e0 100644
--- a/internal/shimdiag/shimdiag.pb.go
+++ b/pkg/shimdiag/shimdiag.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto
+// source: github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.proto
 
 package shimdiag
 
@@ -41,7 +41,7 @@ type ExecProcessRequest struct {
 func (m *ExecProcessRequest) Reset()      { *m = ExecProcessRequest{} }
 func (*ExecProcessRequest) ProtoMessage() {}
 func (*ExecProcessRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{0}
+	return fileDescriptor_115458d36b425fd0, []int{0}
 }
 func (m *ExecProcessRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -80,7 +80,7 @@ type ExecProcessResponse struct {
 func (m *ExecProcessResponse) Reset()      { *m = ExecProcessResponse{} }
 func (*ExecProcessResponse) ProtoMessage() {}
 func (*ExecProcessResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{1}
+	return fileDescriptor_115458d36b425fd0, []int{1}
 }
 func (m *ExecProcessResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -118,7 +118,7 @@ type StacksRequest struct {
 func (m *StacksRequest) Reset()      { *m = StacksRequest{} }
 func (*StacksRequest) ProtoMessage() {}
 func (*StacksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{2}
+	return fileDescriptor_115458d36b425fd0, []int{2}
 }
 func (m *StacksRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -158,7 +158,7 @@ type StacksResponse struct {
 func (m *StacksResponse) Reset()      { *m = StacksResponse{} }
 func (*StacksResponse) ProtoMessage() {}
 func (*StacksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{3}
+	return fileDescriptor_115458d36b425fd0, []int{3}
 }
 func (m *StacksResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -199,7 +199,7 @@ type ShareRequest struct {
 func (m *ShareRequest) Reset()      { *m = ShareRequest{} }
 func (*ShareRequest) ProtoMessage() {}
 func (*ShareRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{4}
+	return fileDescriptor_115458d36b425fd0, []int{4}
 }
 func (m *ShareRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -237,7 +237,7 @@ type ShareResponse struct {
 func (m *ShareResponse) Reset()      { *m = ShareResponse{} }
 func (*ShareResponse) ProtoMessage() {}
 func (*ShareResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{5}
+	return fileDescriptor_115458d36b425fd0, []int{5}
 }
 func (m *ShareResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -275,7 +275,7 @@ type PidRequest struct {
 func (m *PidRequest) Reset()      { *m = PidRequest{} }
 func (*PidRequest) ProtoMessage() {}
 func (*PidRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{6}
+	return fileDescriptor_115458d36b425fd0, []int{6}
 }
 func (m *PidRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -314,7 +314,7 @@ type PidResponse struct {
 func (m *PidResponse) Reset()      { *m = PidResponse{} }
 func (*PidResponse) ProtoMessage() {}
 func (*PidResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{7}
+	return fileDescriptor_115458d36b425fd0, []int{7}
 }
 func (m *PidResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -355,45 +355,44 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto", fileDescriptor_c7933dc6ffbb8784)
-}
-
-var fileDescriptor_c7933dc6ffbb8784 = []byte{
-	// 534 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0x8e, 0x49, 0x93, 0xda, 0xd3, 0x50, 0xd0, 0x52, 0x21, 0xd7, 0x91, 0x4c, 0xb0, 0x04, 0x98,
-	0x03, 0x8e, 0x28, 0x07, 0x0e, 0x88, 0x0b, 0x3f, 0x12, 0x08, 0x21, 0x42, 0x72, 0xa9, 0x38, 0x10,
-	0x6d, 0xed, 0xc5, 0x5e, 0x35, 0xde, 0x0d, 0xbb, 0xeb, 0xd0, 0xde, 0x78, 0x0c, 0x1e, 0x80, 0x87,
-	0xe9, 0x91, 0x23, 0x47, 0x9a, 0x27, 0x41, 0xbb, 0x5e, 0x07, 0x2a, 0x44, 0xda, 0x9e, 0x32, 0xdf,
-	0xb7, 0xf3, 0xcd, 0xec, 0x7c, 0xb3, 0x31, 0x3c, 0xcd, 0xa9, 0x2a, 0xaa, 0x83, 0x24, 0xe5, 0xe5,
-	0xf0, 0x2d, 0x4d, 0x05, 0x97, 0xfc, 0x93, 0x1a, 0x16, 0xa9, 0x94, 0x05, 0x2d, 0x87, 0x94, 0x29,
-	0x22, 0x18, 0x9e, 0x0d, 0x35, 0xca, 0x28, 0xce, 0x57, 0x41, 0x32, 0x17, 0x5c, 0x71, 0xb4, 0x9b,
-	0x72, 0xa6, 0x30, 0x65, 0x44, 0x64, 0x89, 0xa8, 0x58, 0x91, 0xca, 0x64, 0xf1, 0x30, 0xd1, 0x09,
-	0xc1, 0x4e, 0xce, 0x73, 0x6e, 0xb2, 0x86, 0x3a, 0xaa, 0x05, 0xd1, 0x77, 0x07, 0xd0, 0xcb, 0x23,
-	0x92, 0x8e, 0x04, 0x4f, 0x89, 0x94, 0x63, 0xf2, 0xb9, 0x22, 0x52, 0x21, 0x04, 0x1b, 0x58, 0xe4,
-	0xd2, 0x77, 0x06, 0xed, 0xd8, 0x1b, 0x9b, 0x18, 0xf9, 0xb0, 0xf9, 0x85, 0x8b, 0xc3, 0x8c, 0x0a,
-	0xff, 0xca, 0xc0, 0x89, 0xbd, 0x71, 0x03, 0x51, 0x00, 0xae, 0x22, 0xa2, 0xa4, 0x0c, 0xcf, 0xfc,
-	0xf6, 0xc0, 0x89, 0xdd, 0xf1, 0x0a, 0xa3, 0x1d, 0xe8, 0x48, 0x95, 0x51, 0xe6, 0x6f, 0x18, 0x4d,
-	0x0d, 0xd0, 0x4d, 0xe8, 0x4a, 0x95, 0xf1, 0x4a, 0xf9, 0x1d, 0x43, 0x5b, 0x64, 0x79, 0x22, 0x84,
-	0xdf, 0x5d, 0xf1, 0x44, 0x88, 0x68, 0x0f, 0x6e, 0x9c, 0xb9, 0xa5, 0x9c, 0x73, 0x26, 0x09, 0xea,
-	0x83, 0x47, 0x8e, 0xa8, 0x9a, 0xa6, 0x3c, 0x23, 0xbe, 0x33, 0x70, 0xe2, 0xce, 0xd8, 0xd5, 0xc4,
-	0x73, 0x9e, 0x91, 0xe8, 0x1a, 0x5c, 0x9d, 0x28, 0x9c, 0x1e, 0x36, 0x43, 0x45, 0x6f, 0x60, 0xbb,
-	0x21, 0xac, 0xde, 0xb4, 0xd3, 0x8c, 0x11, 0x9b, 0x76, 0x1a, 0xa1, 0xdb, 0xd0, 0xcb, 0xb5, 0x64,
-	0x6a, 0x4f, 0xeb, 0x79, 0xb7, 0x0c, 0x57, 0x97, 0x88, 0x52, 0xe8, 0x4d, 0x0a, 0x2c, 0x48, 0xe3,
-	0x58, 0x1f, 0xbc, 0x82, 0x4b, 0x35, 0x9d, 0x63, 0x55, 0xd8, 0x6a, 0xae, 0x26, 0x46, 0x58, 0x15,
-	0x68, 0x17, 0xdc, 0x6a, 0x51, 0xd6, 0x67, 0xd6, 0xbb, 0x6a, 0x51, 0x9a, 0xa3, 0x3e, 0x78, 0x82,
-	0xe0, 0x6c, 0xca, 0xd9, 0xec, 0xb8, 0x31, 0x4f, 0x13, 0xef, 0xd8, 0xec, 0xd8, 0x8c, 0x50, 0x37,
-	0xa9, 0x2f, 0x1c, 0xf5, 0x00, 0x46, 0x34, 0x6b, 0x06, 0xba, 0x05, 0x5b, 0x06, 0xd9, 0x69, 0xae,
-	0x43, 0x7b, 0x4e, 0x33, 0xeb, 0x83, 0x0e, 0xf7, 0xbe, 0xb5, 0xc1, 0x9d, 0x14, 0xb4, 0x7c, 0x41,
-	0x71, 0x8e, 0x38, 0x6c, 0xeb, 0x5f, 0xed, 0xe3, 0x6b, 0xf6, 0x8a, 0x4b, 0x85, 0x1e, 0x24, 0xff,
-	0x7d, 0x2e, 0xc9, 0xbf, 0x8f, 0x22, 0x48, 0x2e, 0x9a, 0x6e, 0xef, 0x83, 0x01, 0x74, 0xc3, 0xda,
-	0x30, 0x14, 0xaf, 0x51, 0x9f, 0xd9, 0x53, 0x70, 0xff, 0x02, 0x99, 0xb6, 0xc5, 0x47, 0xf0, 0x4c,
-	0x0b, 0x6d, 0x12, 0xba, 0xb7, 0x4e, 0xf7, 0xd7, 0xae, 0x82, 0xf8, 0xfc, 0x44, 0x5b, 0x7f, 0x1f,
-	0x36, 0x75, 0xfd, 0x11, 0xcd, 0xd0, 0x9d, 0x35, 0xa2, 0x3f, 0x3b, 0x09, 0xee, 0x9e, 0x97, 0x56,
-	0x57, 0x7e, 0xf6, 0xfe, 0xe4, 0x34, 0x6c, 0xfd, 0x3c, 0x0d, 0x5b, 0x5f, 0x97, 0xa1, 0x73, 0xb2,
-	0x0c, 0x9d, 0x1f, 0xcb, 0xd0, 0xf9, 0xb5, 0x0c, 0x9d, 0x0f, 0x8f, 0x2f, 0xf7, 0x09, 0x78, 0xd2,
-	0x04, 0xfb, 0xad, 0x83, 0xae, 0xf9, 0x53, 0x3f, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xb1,
-	0xa6, 0x27, 0x46, 0x04, 0x00, 0x00,
+	proto.RegisterFile("github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.proto", fileDescriptor_115458d36b425fd0)
+}
+
+var fileDescriptor_115458d36b425fd0 = []byte{
+	// 528 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xae, 0x49, 0x93, 0xda, 0xd3, 0x50, 0xd0, 0x52, 0x21, 0xd7, 0x91, 0x4c, 0xb0, 0x04, 0x98,
+	0x03, 0x8e, 0x08, 0x17, 0x24, 0x6e, 0xfc, 0x48, 0x20, 0x40, 0x44, 0xc9, 0xa5, 0xe2, 0x40, 0xb4,
+	0xf5, 0x2e, 0xf6, 0x2a, 0xb1, 0x37, 0xec, 0xae, 0x43, 0x7b, 0xe3, 0x31, 0x78, 0x00, 0x1e, 0xa6,
+	0x47, 0x8e, 0x1c, 0x69, 0x9e, 0x04, 0xed, 0x7a, 0xdd, 0x52, 0x21, 0xd2, 0x9c, 0x3c, 0xf3, 0xed,
+	0x7c, 0xf3, 0xed, 0x7c, 0xe3, 0x85, 0xa7, 0x19, 0x53, 0x79, 0x75, 0x94, 0xa4, 0xbc, 0x18, 0xbc,
+	0x67, 0xa9, 0xe0, 0x92, 0x7f, 0x56, 0x83, 0x3c, 0x95, 0x32, 0x67, 0xc5, 0x60, 0x31, 0xcb, 0x06,
+	0x3a, 0x20, 0x0c, 0x5f, 0x04, 0xc9, 0x42, 0x70, 0xc5, 0xd1, 0x41, 0xca, 0x4b, 0x85, 0x59, 0x49,
+	0x05, 0x49, 0x44, 0x55, 0xe6, 0xa9, 0x4c, 0x96, 0x8f, 0x13, 0x5d, 0x10, 0xec, 0x67, 0x3c, 0xe3,
+	0xa6, 0x6a, 0xa0, 0xa3, 0x9a, 0x10, 0xfd, 0x70, 0x00, 0xbd, 0x3a, 0xa6, 0xe9, 0x48, 0xf0, 0x94,
+	0x4a, 0x39, 0xa6, 0x5f, 0x2a, 0x2a, 0x15, 0x42, 0xb0, 0x8d, 0x45, 0x26, 0x7d, 0xa7, 0xdf, 0x8a,
+	0xbd, 0xb1, 0x89, 0x91, 0x0f, 0x3b, 0x5f, 0xb9, 0x98, 0x11, 0x26, 0xfc, 0x6b, 0x7d, 0x27, 0xf6,
+	0xc6, 0x4d, 0x8a, 0x02, 0x70, 0x15, 0x15, 0x05, 0x2b, 0xf1, 0xdc, 0x6f, 0xf5, 0x9d, 0xd8, 0x1d,
+	0x9f, 0xe7, 0x68, 0x1f, 0xda, 0x52, 0x11, 0x56, 0xfa, 0xdb, 0x86, 0x53, 0x27, 0xe8, 0x36, 0x74,
+	0xa4, 0x22, 0xbc, 0x52, 0x7e, 0xdb, 0xc0, 0x36, 0xb3, 0x38, 0x15, 0xc2, 0xef, 0x9c, 0xe3, 0x54,
+	0x88, 0x68, 0x08, 0xb7, 0x2e, 0xdd, 0x52, 0x2e, 0x78, 0x29, 0x29, 0xea, 0x81, 0x47, 0x8f, 0x99,
+	0x9a, 0xa6, 0x9c, 0x50, 0xdf, 0xe9, 0x3b, 0x71, 0x7b, 0xec, 0x6a, 0xe0, 0x05, 0x27, 0x34, 0xba,
+	0x01, 0xd7, 0x27, 0x0a, 0xa7, 0xb3, 0x66, 0xa8, 0xe8, 0x2d, 0xec, 0x35, 0x80, 0xe5, 0x1b, 0x39,
+	0x8d, 0x18, 0xb2, 0x91, 0xd3, 0x19, 0xba, 0x0b, 0xdd, 0x4c, 0x53, 0xa6, 0xf6, 0xb4, 0x9e, 0x77,
+	0xd7, 0x60, 0x75, 0x8b, 0x28, 0x85, 0xee, 0x24, 0xc7, 0x82, 0x36, 0x8e, 0xf5, 0xc0, 0xcb, 0xb9,
+	0x54, 0xd3, 0x05, 0x56, 0xb9, 0xed, 0xe6, 0x6a, 0x60, 0x84, 0x55, 0x8e, 0x0e, 0xc0, 0xad, 0x96,
+	0x45, 0x7d, 0x66, 0xbd, 0xab, 0x96, 0x85, 0x39, 0xea, 0x81, 0x27, 0x28, 0x26, 0x53, 0x5e, 0xce,
+	0x4f, 0x1a, 0xf3, 0x34, 0xf0, 0xa1, 0x9c, 0x9f, 0x98, 0x11, 0x6a, 0x91, 0xfa, 0xc2, 0x51, 0x17,
+	0x60, 0xc4, 0x48, 0x33, 0xd0, 0x1d, 0xd8, 0x35, 0x99, 0x9d, 0xe6, 0x26, 0xb4, 0x16, 0x8c, 0x58,
+	0x1f, 0x74, 0x38, 0xfc, 0xde, 0x02, 0x77, 0x92, 0xb3, 0xe2, 0x25, 0xc3, 0x19, 0xe2, 0xb0, 0xa7,
+	0xbf, 0xda, 0xc7, 0x37, 0xe5, 0x6b, 0x2e, 0x15, 0x7a, 0x94, 0xfc, 0xf7, 0x77, 0x49, 0xfe, 0xfd,
+	0x29, 0x82, 0x64, 0xd3, 0x72, 0x7b, 0x1f, 0x0c, 0xa0, 0x05, 0x6b, 0xc3, 0x50, 0xbc, 0x86, 0x7d,
+	0x69, 0x4f, 0xc1, 0xc3, 0x0d, 0x2a, 0xad, 0xc4, 0x27, 0xf0, 0x8c, 0x84, 0x36, 0x09, 0x3d, 0x58,
+	0xc7, 0xfb, 0x6b, 0x57, 0x41, 0x7c, 0x75, 0xa1, 0xed, 0x7f, 0x08, 0x3b, 0xba, 0xff, 0x88, 0x11,
+	0x74, 0x6f, 0x0d, 0xe9, 0x62, 0x27, 0xc1, 0xfd, 0xab, 0xca, 0xea, 0xce, 0xcf, 0xdf, 0x9d, 0x9e,
+	0x85, 0x5b, 0xbf, 0xce, 0xc2, 0xad, 0x6f, 0xab, 0xd0, 0x39, 0x5d, 0x85, 0xce, 0xcf, 0x55, 0xe8,
+	0xfc, 0x5e, 0x85, 0xce, 0xc7, 0xe1, 0xc6, 0xaf, 0xff, 0x59, 0x13, 0x1c, 0x6e, 0x1d, 0x75, 0xcc,
+	0x7b, 0x7e, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x71, 0xfb, 0x41, 0xf6, 0x3c, 0x04, 0x00, 0x00,
 }
 
 func (m *ExecProcessRequest) Marshal() (dAtA []byte, err error) {
diff --git a/internal/shimdiag/shimdiag.proto b/pkg/shimdiag/shimdiag.proto
similarity index 91%
rename from internal/shimdiag/shimdiag.proto
rename to pkg/shimdiag/shimdiag.proto
index d5ae007716..230dc78b84 100644
--- a/internal/shimdiag/shimdiag.proto
+++ b/pkg/shimdiag/shimdiag.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package containerd.runhcs.v1.diag;
-option go_package = "github.com/Microsoft/hcsshim/internal/shimdiag;shimdiag";
+option go_package = "github.com/Microsoft/hcsshim/pkg/shimdiag;shimdiag";
 
 import weak "gogoproto/gogo.proto";
 
@@ -47,4 +47,4 @@ message PidRequest{
 
 message PidResponse{
     int32 pid = 1;
-}
\ No newline at end of file
+}
diff --git a/test/cri-containerd/exec.go b/test/cri-containerd/exec.go
index 729541640f..f4d834d528 100644
--- a/test/cri-containerd/exec.go
+++ b/test/cri-containerd/exec.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 
 	"github.com/Microsoft/hcsshim/internal/cmd"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
diff --git a/test/cri-containerd/extended_task_test.go b/test/cri-containerd/extended_task_test.go
index 214f718dc0..51d51f6920 100644
--- a/test/cri-containerd/extended_task_test.go
+++ b/test/cri-containerd/extended_task_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/Microsoft/hcsshim/internal/extendedtask"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 )
 
 func getPodProcessorInfo(ctx context.Context, podID string) (*extendedtask.ComputeProcessorInfoResponse, error) {
diff --git a/test/cri-containerd/runpodsandbox_test.go b/test/cri-containerd/runpodsandbox_test.go
index 515ab9765e..157b457acc 100644
--- a/test/cri-containerd/runpodsandbox_test.go
+++ b/test/cri-containerd/runpodsandbox_test.go
@@ -19,9 +19,9 @@ import (
 	"github.com/Microsoft/hcsshim/internal/hcs"
 	"github.com/Microsoft/hcsshim/internal/lcow"
 	"github.com/Microsoft/hcsshim/internal/processorinfo"
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
 	"github.com/containerd/containerd/log"
 	"golang.org/x/sys/windows"
diff --git a/test/cri-containerd/share.go b/test/cri-containerd/share.go
index a3be151988..ab70ccfbc3 100644
--- a/test/cri-containerd/share.go
+++ b/test/cri-containerd/share.go
@@ -6,7 +6,7 @@ package cri_containerd
 import (
 	"context"
 
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 )
 
 func shareInUVM(ctx context.Context, client shimdiag.ShimDiagService, hostPath, uvmPath string, readOnly bool) error {
diff --git a/test/cri-containerd/update_utilities_test.go b/test/cri-containerd/update_utilities_test.go
index 1cfe00d337..81d7a9c3b6 100644
--- a/test/cri-containerd/update_utilities_test.go
+++ b/test/cri-containerd/update_utilities_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Microsoft/hcsshim/internal/shimdiag"
+	"github.com/Microsoft/hcsshim/pkg/shimdiag"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
diff --git a/test/vendor/github.com/Microsoft/hcsshim/Protobuild.toml b/test/vendor/github.com/Microsoft/hcsshim/Protobuild.toml
index 471f133866..f17f6f6cf5 100644
--- a/test/vendor/github.com/Microsoft/hcsshim/Protobuild.toml
+++ b/test/vendor/github.com/Microsoft/hcsshim/Protobuild.toml
@@ -28,7 +28,7 @@ plugins = ["grpc", "fieldpath"]
   "github/containerd/cgroups/stats/v1/metrics.proto" = "github.com/containerd/cgroups/stats/v1"
 
 [[overrides]]
-prefixes = ["github.com/Microsoft/hcsshim/internal/shimdiag"]
+prefixes = ["github.com/Microsoft/hcsshim/pkg/shimdiag"]
 plugins = ["ttrpc"]
 
 [[overrides]]
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/doc.go b/test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/doc.go
similarity index 100%
rename from test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/doc.go
rename to test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/doc.go
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.go b/test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.go
similarity index 100%
rename from test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.go
rename to test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.go
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.pb.go b/test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.pb.go
similarity index 92%
rename from test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.pb.go
rename to test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.pb.go
index 84ca8aa334..0fbe8e12e0 100644
--- a/test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.pb.go
+++ b/test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.pb.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto
+// source: github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.proto
 
 package shimdiag
 
@@ -41,7 +41,7 @@ type ExecProcessRequest struct {
 func (m *ExecProcessRequest) Reset()      { *m = ExecProcessRequest{} }
 func (*ExecProcessRequest) ProtoMessage() {}
 func (*ExecProcessRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{0}
+	return fileDescriptor_115458d36b425fd0, []int{0}
 }
 func (m *ExecProcessRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -80,7 +80,7 @@ type ExecProcessResponse struct {
 func (m *ExecProcessResponse) Reset()      { *m = ExecProcessResponse{} }
 func (*ExecProcessResponse) ProtoMessage() {}
 func (*ExecProcessResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{1}
+	return fileDescriptor_115458d36b425fd0, []int{1}
 }
 func (m *ExecProcessResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -118,7 +118,7 @@ type StacksRequest struct {
 func (m *StacksRequest) Reset()      { *m = StacksRequest{} }
 func (*StacksRequest) ProtoMessage() {}
 func (*StacksRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{2}
+	return fileDescriptor_115458d36b425fd0, []int{2}
 }
 func (m *StacksRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -158,7 +158,7 @@ type StacksResponse struct {
 func (m *StacksResponse) Reset()      { *m = StacksResponse{} }
 func (*StacksResponse) ProtoMessage() {}
 func (*StacksResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{3}
+	return fileDescriptor_115458d36b425fd0, []int{3}
 }
 func (m *StacksResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -199,7 +199,7 @@ type ShareRequest struct {
 func (m *ShareRequest) Reset()      { *m = ShareRequest{} }
 func (*ShareRequest) ProtoMessage() {}
 func (*ShareRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{4}
+	return fileDescriptor_115458d36b425fd0, []int{4}
 }
 func (m *ShareRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -237,7 +237,7 @@ type ShareResponse struct {
 func (m *ShareResponse) Reset()      { *m = ShareResponse{} }
 func (*ShareResponse) ProtoMessage() {}
 func (*ShareResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{5}
+	return fileDescriptor_115458d36b425fd0, []int{5}
 }
 func (m *ShareResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -275,7 +275,7 @@ type PidRequest struct {
 func (m *PidRequest) Reset()      { *m = PidRequest{} }
 func (*PidRequest) ProtoMessage() {}
 func (*PidRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{6}
+	return fileDescriptor_115458d36b425fd0, []int{6}
 }
 func (m *PidRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -314,7 +314,7 @@ type PidResponse struct {
 func (m *PidResponse) Reset()      { *m = PidResponse{} }
 func (*PidResponse) ProtoMessage() {}
 func (*PidResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_c7933dc6ffbb8784, []int{7}
+	return fileDescriptor_115458d36b425fd0, []int{7}
 }
 func (m *PidResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -355,45 +355,44 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto", fileDescriptor_c7933dc6ffbb8784)
-}
-
-var fileDescriptor_c7933dc6ffbb8784 = []byte{
-	// 534 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0x8e, 0x49, 0x93, 0xda, 0xd3, 0x50, 0xd0, 0x52, 0x21, 0xd7, 0x91, 0x4c, 0xb0, 0x04, 0x98,
-	0x03, 0x8e, 0x28, 0x07, 0x0e, 0x88, 0x0b, 0x3f, 0x12, 0x08, 0x21, 0x42, 0x72, 0xa9, 0x38, 0x10,
-	0x6d, 0xed, 0xc5, 0x5e, 0x35, 0xde, 0x0d, 0xbb, 0xeb, 0xd0, 0xde, 0x78, 0x0c, 0x1e, 0x80, 0x87,
-	0xe9, 0x91, 0x23, 0x47, 0x9a, 0x27, 0x41, 0xbb, 0x5e, 0x07, 0x2a, 0x44, 0xda, 0x9e, 0x32, 0xdf,
-	0xb7, 0xf3, 0xcd, 0xec, 0x7c, 0xb3, 0x31, 0x3c, 0xcd, 0xa9, 0x2a, 0xaa, 0x83, 0x24, 0xe5, 0xe5,
-	0xf0, 0x2d, 0x4d, 0x05, 0x97, 0xfc, 0x93, 0x1a, 0x16, 0xa9, 0x94, 0x05, 0x2d, 0x87, 0x94, 0x29,
-	0x22, 0x18, 0x9e, 0x0d, 0x35, 0xca, 0x28, 0xce, 0x57, 0x41, 0x32, 0x17, 0x5c, 0x71, 0xb4, 0x9b,
-	0x72, 0xa6, 0x30, 0x65, 0x44, 0x64, 0x89, 0xa8, 0x58, 0x91, 0xca, 0x64, 0xf1, 0x30, 0xd1, 0x09,
-	0xc1, 0x4e, 0xce, 0x73, 0x6e, 0xb2, 0x86, 0x3a, 0xaa, 0x05, 0xd1, 0x77, 0x07, 0xd0, 0xcb, 0x23,
-	0x92, 0x8e, 0x04, 0x4f, 0x89, 0x94, 0x63, 0xf2, 0xb9, 0x22, 0x52, 0x21, 0x04, 0x1b, 0x58, 0xe4,
-	0xd2, 0x77, 0x06, 0xed, 0xd8, 0x1b, 0x9b, 0x18, 0xf9, 0xb0, 0xf9, 0x85, 0x8b, 0xc3, 0x8c, 0x0a,
-	0xff, 0xca, 0xc0, 0x89, 0xbd, 0x71, 0x03, 0x51, 0x00, 0xae, 0x22, 0xa2, 0xa4, 0x0c, 0xcf, 0xfc,
-	0xf6, 0xc0, 0x89, 0xdd, 0xf1, 0x0a, 0xa3, 0x1d, 0xe8, 0x48, 0x95, 0x51, 0xe6, 0x6f, 0x18, 0x4d,
-	0x0d, 0xd0, 0x4d, 0xe8, 0x4a, 0x95, 0xf1, 0x4a, 0xf9, 0x1d, 0x43, 0x5b, 0x64, 0x79, 0x22, 0x84,
-	0xdf, 0x5d, 0xf1, 0x44, 0x88, 0x68, 0x0f, 0x6e, 0x9c, 0xb9, 0xa5, 0x9c, 0x73, 0x26, 0x09, 0xea,
-	0x83, 0x47, 0x8e, 0xa8, 0x9a, 0xa6, 0x3c, 0x23, 0xbe, 0x33, 0x70, 0xe2, 0xce, 0xd8, 0xd5, 0xc4,
-	0x73, 0x9e, 0x91, 0xe8, 0x1a, 0x5c, 0x9d, 0x28, 0x9c, 0x1e, 0x36, 0x43, 0x45, 0x6f, 0x60, 0xbb,
-	0x21, 0xac, 0xde, 0xb4, 0xd3, 0x8c, 0x11, 0x9b, 0x76, 0x1a, 0xa1, 0xdb, 0xd0, 0xcb, 0xb5, 0x64,
-	0x6a, 0x4f, 0xeb, 0x79, 0xb7, 0x0c, 0x57, 0x97, 0x88, 0x52, 0xe8, 0x4d, 0x0a, 0x2c, 0x48, 0xe3,
-	0x58, 0x1f, 0xbc, 0x82, 0x4b, 0x35, 0x9d, 0x63, 0x55, 0xd8, 0x6a, 0xae, 0x26, 0x46, 0x58, 0x15,
-	0x68, 0x17, 0xdc, 0x6a, 0x51, 0xd6, 0x67, 0xd6, 0xbb, 0x6a, 0x51, 0x9a, 0xa3, 0x3e, 0x78, 0x82,
-	0xe0, 0x6c, 0xca, 0xd9, 0xec, 0xb8, 0x31, 0x4f, 0x13, 0xef, 0xd8, 0xec, 0xd8, 0x8c, 0x50, 0x37,
-	0xa9, 0x2f, 0x1c, 0xf5, 0x00, 0x46, 0x34, 0x6b, 0x06, 0xba, 0x05, 0x5b, 0x06, 0xd9, 0x69, 0xae,
-	0x43, 0x7b, 0x4e, 0x33, 0xeb, 0x83, 0x0e, 0xf7, 0xbe, 0xb5, 0xc1, 0x9d, 0x14, 0xb4, 0x7c, 0x41,
-	0x71, 0x8e, 0x38, 0x6c, 0xeb, 0x5f, 0xed, 0xe3, 0x6b, 0xf6, 0x8a, 0x4b, 0x85, 0x1e, 0x24, 0xff,
-	0x7d, 0x2e, 0xc9, 0xbf, 0x8f, 0x22, 0x48, 0x2e, 0x9a, 0x6e, 0xef, 0x83, 0x01, 0x74, 0xc3, 0xda,
-	0x30, 0x14, 0xaf, 0x51, 0x9f, 0xd9, 0x53, 0x70, 0xff, 0x02, 0x99, 0xb6, 0xc5, 0x47, 0xf0, 0x4c,
-	0x0b, 0x6d, 0x12, 0xba, 0xb7, 0x4e, 0xf7, 0xd7, 0xae, 0x82, 0xf8, 0xfc, 0x44, 0x5b, 0x7f, 0x1f,
-	0x36, 0x75, 0xfd, 0x11, 0xcd, 0xd0, 0x9d, 0x35, 0xa2, 0x3f, 0x3b, 0x09, 0xee, 0x9e, 0x97, 0x56,
-	0x57, 0x7e, 0xf6, 0xfe, 0xe4, 0x34, 0x6c, 0xfd, 0x3c, 0x0d, 0x5b, 0x5f, 0x97, 0xa1, 0x73, 0xb2,
-	0x0c, 0x9d, 0x1f, 0xcb, 0xd0, 0xf9, 0xb5, 0x0c, 0x9d, 0x0f, 0x8f, 0x2f, 0xf7, 0x09, 0x78, 0xd2,
-	0x04, 0xfb, 0xad, 0x83, 0xae, 0xf9, 0x53, 0x3f, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x3e, 0xb1,
-	0xa6, 0x27, 0x46, 0x04, 0x00, 0x00,
+	proto.RegisterFile("github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.proto", fileDescriptor_115458d36b425fd0)
+}
+
+var fileDescriptor_115458d36b425fd0 = []byte{
+	// 528 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0xae, 0x49, 0x93, 0xda, 0xd3, 0x50, 0xd0, 0x52, 0x21, 0xd7, 0x91, 0x4c, 0xb0, 0x04, 0x98,
+	0x03, 0x8e, 0x08, 0x17, 0x24, 0x6e, 0xfc, 0x48, 0x20, 0x40, 0x44, 0xc9, 0xa5, 0xe2, 0x40, 0xb4,
+	0xf5, 0x2e, 0xf6, 0x2a, 0xb1, 0x37, 0xec, 0xae, 0x43, 0x7b, 0xe3, 0x31, 0x78, 0x00, 0x1e, 0xa6,
+	0x47, 0x8e, 0x1c, 0x69, 0x9e, 0x04, 0xed, 0x7a, 0xdd, 0x52, 0x21, 0xd2, 0x9c, 0x3c, 0xf3, 0xed,
+	0x7c, 0xf3, 0xed, 0x7c, 0xe3, 0x85, 0xa7, 0x19, 0x53, 0x79, 0x75, 0x94, 0xa4, 0xbc, 0x18, 0xbc,
+	0x67, 0xa9, 0xe0, 0x92, 0x7f, 0x56, 0x83, 0x3c, 0x95, 0x32, 0x67, 0xc5, 0x60, 0x31, 0xcb, 0x06,
+	0x3a, 0x20, 0x0c, 0x5f, 0x04, 0xc9, 0x42, 0x70, 0xc5, 0xd1, 0x41, 0xca, 0x4b, 0x85, 0x59, 0x49,
+	0x05, 0x49, 0x44, 0x55, 0xe6, 0xa9, 0x4c, 0x96, 0x8f, 0x13, 0x5d, 0x10, 0xec, 0x67, 0x3c, 0xe3,
+	0xa6, 0x6a, 0xa0, 0xa3, 0x9a, 0x10, 0xfd, 0x70, 0x00, 0xbd, 0x3a, 0xa6, 0xe9, 0x48, 0xf0, 0x94,
+	0x4a, 0x39, 0xa6, 0x5f, 0x2a, 0x2a, 0x15, 0x42, 0xb0, 0x8d, 0x45, 0x26, 0x7d, 0xa7, 0xdf, 0x8a,
+	0xbd, 0xb1, 0x89, 0x91, 0x0f, 0x3b, 0x5f, 0xb9, 0x98, 0x11, 0x26, 0xfc, 0x6b, 0x7d, 0x27, 0xf6,
+	0xc6, 0x4d, 0x8a, 0x02, 0x70, 0x15, 0x15, 0x05, 0x2b, 0xf1, 0xdc, 0x6f, 0xf5, 0x9d, 0xd8, 0x1d,
+	0x9f, 0xe7, 0x68, 0x1f, 0xda, 0x52, 0x11, 0x56, 0xfa, 0xdb, 0x86, 0x53, 0x27, 0xe8, 0x36, 0x74,
+	0xa4, 0x22, 0xbc, 0x52, 0x7e, 0xdb, 0xc0, 0x36, 0xb3, 0x38, 0x15, 0xc2, 0xef, 0x9c, 0xe3, 0x54,
+	0x88, 0x68, 0x08, 0xb7, 0x2e, 0xdd, 0x52, 0x2e, 0x78, 0x29, 0x29, 0xea, 0x81, 0x47, 0x8f, 0x99,
+	0x9a, 0xa6, 0x9c, 0x50, 0xdf, 0xe9, 0x3b, 0x71, 0x7b, 0xec, 0x6a, 0xe0, 0x05, 0x27, 0x34, 0xba,
+	0x01, 0xd7, 0x27, 0x0a, 0xa7, 0xb3, 0x66, 0xa8, 0xe8, 0x2d, 0xec, 0x35, 0x80, 0xe5, 0x1b, 0x39,
+	0x8d, 0x18, 0xb2, 0x91, 0xd3, 0x19, 0xba, 0x0b, 0xdd, 0x4c, 0x53, 0xa6, 0xf6, 0xb4, 0x9e, 0x77,
+	0xd7, 0x60, 0x75, 0x8b, 0x28, 0x85, 0xee, 0x24, 0xc7, 0x82, 0x36, 0x8e, 0xf5, 0xc0, 0xcb, 0xb9,
+	0x54, 0xd3, 0x05, 0x56, 0xb9, 0xed, 0xe6, 0x6a, 0x60, 0x84, 0x55, 0x8e, 0x0e, 0xc0, 0xad, 0x96,
+	0x45, 0x7d, 0x66, 0xbd, 0xab, 0x96, 0x85, 0x39, 0xea, 0x81, 0x27, 0x28, 0x26, 0x53, 0x5e, 0xce,
+	0x4f, 0x1a, 0xf3, 0x34, 0xf0, 0xa1, 0x9c, 0x9f, 0x98, 0x11, 0x6a, 0x91, 0xfa, 0xc2, 0x51, 0x17,
+	0x60, 0xc4, 0x48, 0x33, 0xd0, 0x1d, 0xd8, 0x35, 0x99, 0x9d, 0xe6, 0x26, 0xb4, 0x16, 0x8c, 0x58,
+	0x1f, 0x74, 0x38, 0xfc, 0xde, 0x02, 0x77, 0x92, 0xb3, 0xe2, 0x25, 0xc3, 0x19, 0xe2, 0xb0, 0xa7,
+	0xbf, 0xda, 0xc7, 0x37, 0xe5, 0x6b, 0x2e, 0x15, 0x7a, 0x94, 0xfc, 0xf7, 0x77, 0x49, 0xfe, 0xfd,
+	0x29, 0x82, 0x64, 0xd3, 0x72, 0x7b, 0x1f, 0x0c, 0xa0, 0x05, 0x6b, 0xc3, 0x50, 0xbc, 0x86, 0x7d,
+	0x69, 0x4f, 0xc1, 0xc3, 0x0d, 0x2a, 0xad, 0xc4, 0x27, 0xf0, 0x8c, 0x84, 0x36, 0x09, 0x3d, 0x58,
+	0xc7, 0xfb, 0x6b, 0x57, 0x41, 0x7c, 0x75, 0xa1, 0xed, 0x7f, 0x08, 0x3b, 0xba, 0xff, 0x88, 0x11,
+	0x74, 0x6f, 0x0d, 0xe9, 0x62, 0x27, 0xc1, 0xfd, 0xab, 0xca, 0xea, 0xce, 0xcf, 0xdf, 0x9d, 0x9e,
+	0x85, 0x5b, 0xbf, 0xce, 0xc2, 0xad, 0x6f, 0xab, 0xd0, 0x39, 0x5d, 0x85, 0xce, 0xcf, 0x55, 0xe8,
+	0xfc, 0x5e, 0x85, 0xce, 0xc7, 0xe1, 0xc6, 0xaf, 0xff, 0x59, 0x13, 0x1c, 0x6e, 0x1d, 0x75, 0xcc,
+	0x7b, 0x7e, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x71, 0xfb, 0x41, 0xf6, 0x3c, 0x04, 0x00, 0x00,
 }
 
 func (m *ExecProcessRequest) Marshal() (dAtA []byte, err error) {
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto b/test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.proto
similarity index 91%
rename from test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto
rename to test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.proto
index d5ae007716..230dc78b84 100644
--- a/test/vendor/github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto
+++ b/test/vendor/github.com/Microsoft/hcsshim/pkg/shimdiag/shimdiag.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package containerd.runhcs.v1.diag;
-option go_package = "github.com/Microsoft/hcsshim/internal/shimdiag;shimdiag";
+option go_package = "github.com/Microsoft/hcsshim/pkg/shimdiag;shimdiag";
 
 import weak "gogoproto/gogo.proto";
 
@@ -47,4 +47,4 @@ message PidRequest{
 
 message PidResponse{
     int32 pid = 1;
-}
\ No newline at end of file
+}
diff --git a/test/vendor/modules.txt b/test/vendor/modules.txt
index d42d80ca1f..f31f7152eb 100644
--- a/test/vendor/modules.txt
+++ b/test/vendor/modules.txt
@@ -59,7 +59,6 @@ github.com/Microsoft/hcsshim/internal/runhcs
 github.com/Microsoft/hcsshim/internal/safefile
 github.com/Microsoft/hcsshim/internal/schemaversion
 github.com/Microsoft/hcsshim/internal/security
-github.com/Microsoft/hcsshim/internal/shimdiag
 github.com/Microsoft/hcsshim/internal/timeout
 github.com/Microsoft/hcsshim/internal/tools/securitypolicy/helpers
 github.com/Microsoft/hcsshim/internal/uvm
@@ -74,6 +73,7 @@ github.com/Microsoft/hcsshim/pkg/go-runhcs
 github.com/Microsoft/hcsshim/pkg/ociwclayer
 github.com/Microsoft/hcsshim/pkg/octtrpc
 github.com/Microsoft/hcsshim/pkg/securitypolicy
+github.com/Microsoft/hcsshim/pkg/shimdiag
 # github.com/bits-and-blooms/bitset v1.2.0
 ## explicit; go 1.14
 github.com/bits-and-blooms/bitset