Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use shared auditing from metal-lib #425

Merged
merged 7 commits into from
Mar 31, 2023
Merged

use shared auditing from metal-lib #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
495c2c6
feat: use shared auditing from metal-lib
vknabel Mar 2, 2023
16ff0f3
feat(auditing): bump metal-lib
vknabel Mar 7, 2023
70be362
Merge branch 'master' of github.com:metal-stack/metal-api into featur…
vknabel Mar 7, 2023
c03cfe5
fix(mod): downgraded go-restful
vknabel Mar 7, 2023
abc0028
feat(mod). upgrade metal-lib
vknabel Mar 8, 2023
f65fc0a
fix: review
vknabel Mar 31, 2023
ca43a26
fix: go mod tidy
vknabel Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM alpine:3.17
RUN apk add ca-certificates
COPY bin/metal-api /metal-api
ENTRYPOINT [ "/metal-api" ]
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ protoc-docker:

.PHONY: mini-lab-push
mini-lab-push:
docker build -t metalstack/metal-api:latest .
make
docker build -f Dockerfile.dev -t metalstack/metal-api:latest .
kind --name metal-control-plane load docker-image metalstack/metal-api:latest
kubectl --kubeconfig=$(MINI_LAB_KUBECONFIG) patch deployments.apps -n metal-control-plane metal-api --patch='{"spec":{"template":{"spec":{"containers":[{"name": "metal-api","imagePullPolicy":"IfNotPresent","image":"metalstack/metal-api:latest"}]}}}}'
kubectl --kubeconfig=$(MINI_LAB_KUBECONFIG) delete pod -n metal-control-plane -l app=metal-api
Expand Down
210 changes: 0 additions & 210 deletions cmd/metal-api/internal/auditing/auditing-interceptor.go
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions cmd/metal-api/internal/auditing/auditing.go
View file
Open in desktop

This file was deleted.

112 changes: 0 additions & 112 deletions cmd/metal-api/internal/auditing/meilisearch.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/metal-api/internal/grpc/grpc-server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/status"

"github.com/metal-stack/metal-api/cmd/metal-api/internal/auditing"
"github.com/metal-stack/metal-api/cmd/metal-api/internal/datastore"
v1 "github.com/metal-stack/metal-api/pkg/api/v1"
"github.com/metal-stack/metal-lib/auditing"
"github.com/metal-stack/metal-lib/bus"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/metal-api/internal/service/filesystem-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"net/http"

"github.com/metal-stack/metal-api/cmd/metal-api/internal/auditing"
"github.com/metal-stack/metal-api/cmd/metal-api/internal/datastore"
v1 "github.com/metal-stack/metal-api/cmd/metal-api/internal/service/v1"
"github.com/metal-stack/metal-lib/auditing"
"go.uber.org/zap"

restfulspec "github.com/emicklei/go-restful-openapi/v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/metal-api/internal/service/firewall-service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"net/http"

"github.com/metal-stack/metal-api/cmd/metal-api/internal/auditing"
"github.com/metal-stack/metal-api/cmd/metal-api/internal/headscale"
"github.com/metal-stack/metal-lib/auditing"

"github.com/metal-stack/security"

Expand Down
Loading