.github/workflows/ci.yml

@@ -8,8 +8,9 @@ env:
   GOTESTSUM_VERSION: "latest"
 
 jobs:
+
   lint:
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     strategy:
       fail-fast: false
       matrix:
@@ -25,15 +26,18 @@ jobs:
               ./internal/tools/...
               ./pkg/...
               ./ext4/...
+
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install go
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
-      - name: Clean mod cache
-        shell: Powershell
-        run: |
-          go clean -modcache
+          # sometimes go cache causes issues with lint
+          cache: false
+
       - uses: golangci/golangci-lint-action@v3
         with:
           version: v1.52
@@ -42,21 +46,30 @@ jobs:
             --max-issues-per-linter=0
             --max-same-issues=0
             --modules-download-mode=readonly
+            --timeout=10m
             ${{ matrix.dirs }}
           working-directory: ${{ matrix.root }}
         env:
           GOOS: ${{ matrix.goos }}
 
   protos:
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
+
+    env:
+      # translating from github.com/Microsoft/hcsshim/<path> (via `go list`) to <path> is easier if hcsshim is in GOPATH/src
+      GOPATH: '${{ github.workspace }}\go'
+
     steps:
-      - uses: actions/setup-go@v4
+      - name: Checkout hcsshim
+        uses: actions/checkout@v3
         with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: actions/checkout@v3
+          path: go/src/github.com/Microsoft/hcsshim
+
+      - name: Install go
+        uses: actions/setup-go@v4
         with:
-          path: "go/src/github.com/Microsoft/hcsshim"
-        name: Checkout hcsshim
+          go-version: ${{ env.GO_VERSION }}
+          cache-dependency-path: go/src/github.com/Microsoft/hcsshim/go.sum
 
       - name: Get containerd ref
         shell: powershell
@@ -70,55 +83,80 @@ jobs:
           "containerd_ref=$v" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         working-directory: go/src/github.com/Microsoft/hcsshim
 
-      # Install protoc-gen-gogoctrd in D:\bin
-      - uses: actions/checkout@v3
+      - name: Checkout containerd
+        uses: actions/checkout@v3
         with:
           repository: containerd/containerd
           path: "containerd"
           ref: "${{ env.containerd_ref }}"
-        name: Checkout containerd
 
-      - name: Install protoc-gen-gogoctrd
+      - name: Install protobuild and protoc-gen-gogoctrd
         shell: powershell
         run: |
+          # not actually GOBIN
+          $goBin = Join-Path (go env GOPATH) 'bin'
+          mkdir -f $goBin
+          $goBin | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+          go install github.com/containerd/protobuild@v0.2.0
+
           cd containerd
-          go build ./cmd/protoc-gen-gogoctrd
-          mkdir D:\bin
-          mv protoc-gen-gogoctrd.exe D:\bin
+          go build -o $goBin ./cmd/protoc-gen-gogoctrd
 
-      # Install protoc in D:\bin
       - name: Install protoc
         shell: powershell
         run: |
-          Invoke-WebRequest -OutFile protoc.zip -Uri https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-win32.zip
-          Expand-Archive -Path protoc.zip -DestinationPath .
-          mv include go/src/github.com/Microsoft/hcsshim/protobuf
-          mv bin\protoc.exe D:\bin
+          gh release download -R protocolbuffers/protobuf -p 'protoc-*-win32.zip' -O protoc.zip 'v23.2'
+          if ( $LASTEXITCODE ) {
+            Write-Output '::error::Could not download protoc.'
+            exit $LASTEXITCODE
+          }
+
+          tar.exe xf protoc.zip
+          if ( $LASTEXITCODE ) {
+            Write-Output '::error::Could not install protoc.'
+            exit $LASTEXITCODE
+          }
+
+          mkdir -f ${{ github.workspace }}/go/src/github.com/Microsoft/hcsshim/protobuf
+          mv include/* ${{ github.workspace }}/go/src/github.com/Microsoft/hcsshim/protobuf
+
+          # put protoc in GOPATH to make things easier
+          mv bin\protoc.exe (Join-Path (go env GOPATH) 'bin')
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Run Protobuild
         shell: powershell
         run: |
-          go install github.com/containerd/protobuild@v0.2.0
-          cd go\src\github.com\Microsoft\hcsshim
-
-          $Env:Path += ";D:\bin;" + $Env:GOPATH + "\bin"
+          Write-Output "::group::protobuild"
           protobuild $(go list ./... | grep -v /vendor/)
+          Write-Output "::endgroup::"
+          if ( $LASTEXITCODE ) {
+            Write-Output '::error::Failed to run protobuild.'
+            exit $LASTEXITCODE
+          }
 
+          Write-Output "::group::git diff"
+          # look for any new files not previously tracked
+          git add --all --intent-to-add .
           git diff --exit-code
-        env:
-          GOPATH: '${{ github.workspace }}\go'
-          GOFLAGS: ""
-          GOPROXY: ""
+          Write-Output "::endgroup::"
+        working-directory: "${{ github.workspace }}/go/src/github.com/Microsoft/hcsshim"
 
   verify-vendor:
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     env:
       GOPROXY: "https://proxy.golang.org,direct"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install go
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
+
       - name: Validate go.mod and vendoring
         shell: powershell
         run: |
@@ -128,6 +166,7 @@ jobs:
             Write-Error "Main modules are not up to date. Please validate your go version >= this job's and run `go mod vendor` followed by `go mod tidy` in the repo root path."
           }
           exit $process.ExitCode
+
       - name: Validate test/go.mod
         shell: powershell
         working-directory: test
@@ -148,12 +187,16 @@ jobs:
 
   go-gen:
     name: Go Generate
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install go
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
+
       - name: Validate go generate
         shell: powershell
         run: |
@@ -198,6 +241,9 @@ jobs:
       - name: Test rego policy interpreter
         run: gotestsum --format standard-verbose --debug -- -mod=mod -gcflags=all=-d=checkptr ./internal/regopolicyinterpreter
 
+      - name: Run guest code unit tests
+        run: gotestsum --format standard-verbose --debug -- -mod=mod -gcflags=all=-d=checkptr ./internal/guest/...
+
       - name: Build gcs Testing Binary
         run: go test -mod=mod -gcflags=all=-d=checkptr -c -tags functional ./gcs
         working-directory: test
@@ -209,8 +255,11 @@ jobs:
       matrix:
         os: [windows-2019, windows-2022]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install go
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -263,10 +312,17 @@ jobs:
         os: [windows-2019, windows-2022]
 
     steps:
-      - uses: actions/setup-go@v4
+      - name: Checkout hcsshim
+        uses: actions/checkout@v3
+        with:
+          path: src/github.com/Microsoft/hcsshim
+
+      - name: Install go
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
           check-latest: true
+          cache-dependency-path: src/github.com/Microsoft/hcsshim/go.sum
 
       - name: Set env
         shell: bash
@@ -276,11 +332,6 @@ jobs:
           echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
           echo "${{ github.workspace }}/src/github.com/containerd/containerd/bin" >> $GITHUB_PATH
 
-      - uses: actions/checkout@v3
-        with:
-          path: src/github.com/Microsoft/hcsshim
-        name: Checkout hcsshim
-
       - name: Get containerd ref
         shell: powershell
         run: |
@@ -303,18 +354,15 @@ jobs:
       - name: Install crictl
         shell: powershell
         run: |
-          $VerbosePreference = 'Continue'
-          $ErrorActionPreference = 'Stop'
-
-          $crictlVersion = 'v1.24.2'
-          $url = "https://github.com/kubernetes-sigs/cri-tools/releases/download/${crictlVersion}/crictl-${crictlVersion}-windows-amd64.tar.gz"
-          curl.exe -L --no-progress-meter -o c:\crictl.tar.gz $url
-          tar.exe xf c:\crictl.tar.gz -C "${{ github.workspace }}/bin"
+          gh release download -R kubernetes-sigs/cri-tools -p 'crictl-*-windows-amd64.tar.gz' -O c:\crictl.tar.gz 'v1.24.2'
+          tar.exe xf c:\crictl.tar.gz -C '${{ github.workspace }}/bin'
 
           if ( $LASTEXITCODE ) {
             Write-Output '::error::Could not install crictl.'
             exit $LASTEXITCODE
           }
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       # needs to be a separate step since terminal reload is required to bring in new env variables and PATH
       - name: Upgrade Chocolaty
@@ -463,10 +511,13 @@ jobs:
 
   build:
     needs: [test-windows, test-linux]
-    runs-on: "windows-2019"
+    runs-on: "windows-2022"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install go
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 

.gitignore

@@ -37,6 +37,10 @@ rootfs-conv/*
 deps/*
 out/*
 
+# protobuf files
+# only files at root of the repo, otherwise this will cause issues with vendoring
+/protobuf/*
+
 # test results
 test/results
 

.golangci.yml

@@ -135,3 +135,14 @@ issues:
       linters:
         - stylecheck
       Text: "ST1003:"
+
+    # v0 APIs are deprecated, but still retained for backwards compatability
+    - path: cmd\\ncproxy\\
+      linters:
+        - staticcheck
+      text: "^SA1019: .*(ncproxygrpc|nodenetsvc)[/]?v0"
+
+    - path: internal\\tools\\networkagent
+      linters:
+        - staticcheck
+      text: "^SA1019: .*nodenetsvc[/]?v0"

Protobuild.toml

@@ -9,6 +9,10 @@ plugins = ["grpc", "fieldpath"]
   # treat the root of the project as an include, but this may not be necessary.
   before = ["./protobuf"]
 
+  # defaults are "/usr/local/include" and "/usr/include", which don't exist on Windows.
+  # override defaults to supress errors about non-existant directories.
+  after = []
+
   # Paths that should be treated as include roots in relation to the vendor
   # directory. These will be calculated with the vendor directory nearest the
   # target package.

cmd/containerd-shim-runhcs-v1/main.go

@@ -26,7 +26,7 @@ const usage = ``
 const ttrpcAddressEnv = "TTRPC_ADDRESS"
 
 // Add a manifest to get proper Windows version detection.
-//go:generate go run github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.4.0 -platform-specific
+//go:generate go run github.com/josephspurrier/goversioninfo/cmd/goversioninfo -platform-specific
 
 // version will be populated by the Makefile, read from
 // VERSION file of the source code.