No internal package use in tests

.github/workflows/ci.yml

@@ -107,6 +107,25 @@ 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
+
   test:
     runs-on: ${{ matrix.os }}
     strategy:

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]]

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"

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

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"

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"

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"

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) {

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"

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"

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"
 )

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

internal/shimdiag/shimdiag.proto → 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;
-}
+}

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"
 )
 

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) {

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"

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 {

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"
 )