Merge branch 'main' into dependabot/go_modules/github.com/containerd/…

…containerd-1.6.18

.github/workflows/go.yml

@@ -14,15 +14,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.17
+        go-version: 1.21
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v2
+      uses: golangci/golangci-lint-action@v3
+      with:
+        version: v1.55.2
 
     - name: Test
       run: make test

.golangci.yml

@@ -53,7 +53,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - depguard
     - dogsled
     - dupl
     - errcheck

.reuse/dep5

@@ -39,5 +39,7 @@ Files:
     go.sum
     vars.json
     VERSION
+    manifest.yml
+    k8s-sidecar/*
 Copyright: 2020-2022 SAP SE or an SAP affiliate company and cloud-authorization-buildpack contributors
 License: Apache-2.0

Makefile

@@ -2,8 +2,8 @@ VERSION:=$(shell cat VERSION)
 
 build: build-image
 	docker run --rm -v "${PWD}:/src" -w /src buildpack-packager \
-	  buildpack-packager build --stack cflinuxfs3 --cached
-	mv opa_buildpack-cached-cflinuxfs3-v${VERSION}.zip opa_buildpack.zip
+	  buildpack-packager build --any-stack --cached
+	mv opa_buildpack-cached-v${VERSION}.zip opa_buildpack.zip
 test:
 	go test github.com/SAP/cloud-authorization-buildpack/...
 lint:

README.md

@@ -11,12 +11,15 @@ provides an upload mechanism for the applications base policy definitions to the
 Consume the latest released version of this buildpack with the following link in your manifest.yml or via the `-b` flag:
 
 https://github.com/SAP/cloud-authorization-buildpack/releases/latest/download/opa_buildpack.zip  
+
 We discourage referencing a branch of this repo directly because:
 
 - adds a start-up dependency to buildpacks.cloudfoundry.org, which should be avoided
 - staging time will be increased significantly
 - may contain potentially breaking changes
 
+>❗️ Add this buildpack as the first buildpack as shown in the [fixture manifest.yml](https://github.com/SAP/cloud-authorization-buildpack/blob/main/fixtures/node_with_opa/manifest.yml) as it only supplies dependencies. See also the [CF docs about multi-buildpack usage](https://docs.cloudfoundry.org/buildpacks/understand-buildpacks.html#:~:text=buildpack%20in%20the%20order%20is%20the%20final%20buildpack).
+
 ### Services
 
 #### Identity Service

VERSION

@@ -1 +1 @@
-0.5.0
+0.5.3

builder.Dockerfile

@@ -1,3 +1,3 @@
-FROM golang:1.19
+FROM golang:1.21
 
 RUN go install github.com/cloudfoundry/libbuildpack/packager/buildpack-packager@80929621d4

fixtures/node_with_opa/identity.json

@@ -1,7 +1,5 @@
 {
-    "consumed-services": [
-        {
-            "service-instance-name": "ams-node-opa"
-        }
-    ]
+    "authorization": {
+        "product_label": "ams-node-opa"
+    }
 }

fixtures/node_with_opa/manifest.yml

@@ -1,21 +1,18 @@
-# SPDX-FileCopyrightText: 2020 2020 SAP SE or an SAP affiliate company and Cloud Security Client Go contributors
-#
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 applications:
 - name: node-opa
   memory: 128M
   instances: 1
   buildpacks:
-    - https://github.com/SAP/cloud-authorization-buildpack/releases/latest/download/opa_buildpack.zip
+    - https://github.com/SAP/cloud-authorization-buildpack/releases/latest/download/opa_buildpack.zip # must not be supplied as the last/final buildpack, as it only supplies dependencies
     - nodejs_buildpack
   services:
-    - name: ias-node-opa
+    - name: fbtest
       parameters: { "credential-type": "X509_GENERATED" }
   health-check-type: process
   env:
     BP_DEBUG: "true"
     AMS_DCL_ROOT: "/"
+    AMS_LOG_LEVEL: "debug" # info, error
   no-route: true
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/SAP/cloud-authorization-buildpack
 
-go 1.19
+go 1.21
 
 require (
 	code.cloudfoundry.org/buildpackapplifecycle v0.0.0-20210512134323-e6b576c815a1
@@ -9,60 +9,64 @@ require (
 	github.com/golang/mock v1.6.0
 	github.com/onsi/ginkgo v1.16.4
 	github.com/onsi/gomega v1.17.0
-	github.com/open-policy-agent/opa v0.49.2
-	github.com/stretchr/testify v1.8.1
+	github.com/open-policy-agent/opa v0.57.1
+	github.com/stretchr/testify v1.8.4
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
+	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
+	github.com/Microsoft/hcsshim v0.11.0 // indirect
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
 	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/containerd/containerd v1.6.18 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/containerd/containerd v1.7.6 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/uuid v1.3.1 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/klauspost/compress v1.16.0 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/tchap/go-patricia/v2 v2.3.1 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/yashtewari/glob-intersection v0.1.0 // indirect
-	go.opentelemetry.io/otel v1.7.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.7.0 // indirect
-	go.opentelemetry.io/otel/trace v1.7.0 // indirect
-	golang.org/x/crypto v0.4.0 // indirect
-	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
-	google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
-	google.golang.org/grpc v1.52.3 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/yashtewari/glob-intersection v0.2.0 // indirect
+	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
+	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	golang.org/x/crypto v0.13.0 // indirect
+	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/grpc v1.58.2 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	oras.land/oras-go/v2 v2.0.0 // indirect
+	oras.land/oras-go/v2 v2.3.0 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )