Merge branch 'master' into dependabot/go_modules/google.golang.org/pr…

…otobuf-1.28.1
kumahq · Aug 2, 2022 · 258db06 · 258db06
2 parents 15f52a2 + 604e30f
commit 258db06
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/update-changelog.yaml b/.github/workflows/update-changelog.yaml
@@ -5,11 +5,8 @@ on:
   release:
     types: [published, edited, released, unpublished, deleted]
 jobs:
-  upgrade-kuma:
+  update-changelog:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: kong-mesh
     steps:
       - name: Generate GitHub app token
         id: github-app-token
@@ -22,7 +19,9 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "~1.18.1"
-      - run: |
+      - env:
+          GITHUB_TOKEN: ${{ steps.github-app-token.outputs.token }}
+        run: |
           go run ./tools/releases/changelog/... changelog.md > CHANGELOG.md
       - name: "Create Pull Request"
         uses: peter-evans/create-pull-request@v3

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/Nordix/simple-ipam v1.0.0
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490
-	github.com/containerd/cgroups v1.0.3
+	github.com/containerd/cgroups v1.0.4
 	github.com/containernetworking/cni v1.1.2
 	github.com/containernetworking/plugins v1.1.1
 	github.com/emicklei/go-restful/v3 v3.9.0

diff --git a/go.sum b/go.sum
@@ -318,8 +318,9 @@ github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4S
 github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
 github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU=
 github.com/containerd/cgroups v1.0.2/go.mod h1:qpbpJ1jmlqsR9f2IyaLPsdkCdnt0rbDVqIDlhuu5tRY=
-github.com/containerd/cgroups v1.0.3 h1:ADZftAkglvCiD44c77s5YmMqaP2pzVCFZvBmAlBdAP4=
 github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8=
+github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=
+github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA=
 github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
 github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
 github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE=

diff --git a/tools/policy-gen/generate-policy-import.sh b/tools/policy-gen/generate-policy-import.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
 
+IMPORTS_FILE="pkg/plugins/policies/imports.go"
+
 imports=$(for i in "$@"; do [[ -f pkg/plugins/policies/${i}/plugin.go ]] && echo "_ \"github.com/kumahq/kuma/pkg/plugins/policies/${i}\""; done)
 if [[ $imports == "" ]]; then
-  rm -f pkg/plugins/policies/imports.go
+  rm -f "${IMPORTS_FILE}"
   exit 0
 fi
 
 echo "package policies
 
 import (
+$imports
 )
-" > pkg/plugins/policies/imports.go
+" > "${IMPORTS_FILE}"
+
+gofmt -w "${IMPORTS_FILE}"
diff --git a/tools/policy-gen/protoc-gen-kumapolicy/plugin.go b/tools/policy-gen/protoc-gen-kumapolicy/plugin.go
@@ -18,7 +18,7 @@ package {{ .Package }}
 
 import (
 	"github.com/kumahq/kuma/pkg/plugins/policies/core"
-{{range $idx, $version := .Versions}}
+{{- range $idx, $version := .Versions}}
 	api_{{ $version }} "github.com/kumahq/kuma/pkg/plugins/policies/{{ $pkg }}/api/{{ $version }}"
 	k8s_{{ $version }} "github.com/kumahq/kuma/pkg/plugins/policies/{{ $pkg }}/k8s/{{ $version }}"
 {{- end}}