Use GO111 modules with go mod vendor, update bump version script

Author: mauriciopoppe

.github/workflows/windows.yml

@@ -8,12 +8,12 @@ jobs:
   integration_tests:
     strategy:
       matrix:
-        go-versions: [1.13.x]
+        go: ['1.16']
         platform: [windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout code
@@ -36,14 +36,14 @@ jobs:
   unit_tests:
     strategy:
       matrix:
-        go-versions: [1.13.x]
+        go: ['1.16']
         platform: [windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version: ${{ matrix.go }}
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run Windows Unit Tests
@@ -53,16 +53,32 @@ jobs:
   bump_version_test:
     strategy:
       matrix:
-        go-versions: [1.16.x]
+        go: ['1.16']
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Install Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v2
         with:
-          go-version: ${{ matrix.go-version }}
+          go-version: ${{ matrix.go }}
+      - name: Install Tools
+        run: |
+          echo "${HOME}/.local/bin" >> $GITHUB_PATH
+          echo "/home/runner/work/csi-proxy/csi-proxy/go/bin" >> $GITHUB_PATH
+          PB_REL="https://github.com/protocolbuffers/protobuf/releases"
+          curl -LO $PB_REL/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip
+          unzip protoc-3.15.8-linux-x86_64.zip -d $HOME/.local
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+          path: go/src/github.com/kubernetes-csi/csi-proxy
       - name: Run bump version script
+        env:
+          GOPATH: /home/runner/work/csi-proxy/csi-proxy/go
+          GOBIN: /home/runner/work/csi-proxy/csi-proxy/go/bin
         run: |
+          go get -u github.com/golang/protobuf/{proto,protoc-gen-go}
+          protoc --version
+          cd /home/runner/work/csi-proxy/csi-proxy/go/src/github.com/kubernetes-csi/csi-proxy
           API_GROUP=filesystem OLD_API_VERSION=v1beta2 NEW_API_VERSION=v99 scripts/bump-version.sh

scripts/bump-version.sh

@@ -35,9 +35,9 @@ function generate_client_files {
   # the path to regenerate
   target=$1
 
-  # delete the vendor folder, otherwise generate-protobuf is going to create a wrong path
+  # delete the vendor folder, otherwise generate-protobuf is going to create a wrong path in the api.pb.go file
   rm -rf vendor
-
+  rm client/api/$target/api.pb.go || true
   rm client/groups/$target/client_generated.go || true
 
   # generate client_generated.go
@@ -77,7 +77,7 @@ function bump_server {
 
   # it looks like at this point client/groups/<version>/client_generated.go is generated
   # sync it to the vendor folder
-  go mod vendor
+  env GO111MODULE=on go mod vendor
 }
 
 function bump_integration {
@@ -116,6 +116,9 @@ EOF
 }
 
 function main {
+  printenv | sort | uniq
+  protoc --version
+
   validate_args
   bump_client
   bump_server

vendor/github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1/client_generated.go

@@ -58,6 +58,7 @@ github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1
 github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta2
 github.com/kubernetes-csi/csi-proxy/client/groups/iscsi/v1alpha2
+github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1
 github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1alpha1
 github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1beta2