Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0b1699d
Migrate away from deprecated wrappers
majst01 Dec 15, 2023
9e7edfe
Merge master
majst01 Apr 23, 2024
066af19
Merge master
majst01 Jun 13, 2024
e0a45ba
Update deps
majst01 Jul 8, 2024
41e9b42
Updates
majst01 Jul 10, 2024
2d97ac6
Merge master
majst01 Aug 29, 2024
89bde65
Updates
majst01 Oct 2, 2024
c6f6103
update deps again
majst01 Oct 26, 2024
bb471f9
Merge main
majst01 Oct 31, 2024
b84e1ab
Merge main
majst01 Oct 31, 2024
bf5fc97
Update mockery
majst01 Oct 31, 2024
1d62b77
Migrate to testcontainer postgres module
majst01 Oct 31, 2024
75a2d12
Fix
majst01 Oct 31, 2024
96fbe89
Update deps to fix CVEs
majst01 Nov 5, 2024
b24a75b
Updates
majst01 Nov 11, 2024
94274c4
Update deps
majst01 Dec 7, 2024
935baf1
Update protoc
majst01 Jan 7, 2025
b8ef79d
Update mockery
majst01 Jan 7, 2025
e5489e5
Updates
majst01 Jan 24, 2025
b102710
Update to go-1.24
majst01 Feb 19, 2025
31f2d48
merge master
majst01 Mar 17, 2025
44373e3
Merge master
majst01 Mar 24, 2025
bb93527
Merge branch 'master' of https://github.com/metal-stack/masterdata-ap…
majst01 Apr 22, 2025
6517a66
Merge main
majst01 Apr 22, 2025
c289549
Fix docker tags
majst01 Apr 22, 2025
a379ed2
Merge branch 'master' of https://github.com/metal-stack/masterdata-ap…
majst01 Apr 22, 2025
57557af
Fix tag creation
majst01 Apr 22, 2025
577985f
Updates
majst01 Apr 28, 2025
b739aac
Merge remote-tracking branch 'origin/master' into optional-instead-of…
Gerrit91 Jul 24, 2025
27ba0e4
Idea to maintain backwards compatibility for the clients.
Gerrit91 Jul 24, 2025
d95debe
Update deps and remove unused template field and offer migration path…
Gerrit91 Jul 24, 2025
6fd230b
Try fix health service.
Gerrit91 Jul 24, 2025
28f3e30
Maintain old quota field and migrate to a new.
Gerrit91 Jul 24, 2025
edc8750
Important fix.
Gerrit91 Jul 24, 2025
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
17 changes: 9 additions & 8 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,16 @@ jobs:
cache: false

- name: Lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v7
with:
args: --build-tags integration -p bugs -p unused -D protogetter --timeout=10m
args: --build-tags integration -D protogetter --timeout=10m

- name: Make tag
run: |
[ "${GITHUB_EVENT_NAME}" == 'pull_request' ] && echo "tag=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV || true
[ "${GITHUB_EVENT_NAME}" == 'release' ] && echo "tag=${GITHUB_REF##*/}" >> $GITHUB_ENV || true
[ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and Test
run: |
Expand All @@ -63,4 +64,4 @@ jobs:
context: .
push: true
sbom: true
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.tag }}
tags: ${{ steps.meta.outputs.tags }}
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.21 as health-downloader
ENV GRPC_HEALTH_PROBE_VERSION=v0.4.37 \
FROM alpine:3.22 AS health-downloader
ENV GRPC_HEALTH_PROBE_VERSION=v0.4.39 \
GRPC_HEALTH_PROBE_URL=https://github.com/grpc-ecosystem/grpc-health-probe/releases/download
RUN apk -U add curl \
&& curl -fLso /bin/grpc_health_probe \
Expand Down
44 changes: 11 additions & 33 deletions api/rest/mapper/mapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
v1 "github.com/metal-stack/masterdata-api/api/rest/v1"
mdmv1 "github.com/metal-stack/masterdata-api/api/v1"
"google.golang.org/protobuf/types/known/timestamppb"
"google.golang.org/protobuf/types/known/wrapperspb"
)

func ToMdmV1Tenant(t *v1.Tenant) *mdmv1.Tenant {
Expand Down Expand Up @@ -145,14 +144,9 @@ func ToMdmV1Quota(q *v1.Quota) *mdmv1.Quota {
if q == nil {
return nil
}
if q.Quota == nil {
return nil
}

return &mdmv1.Quota{
Quota: &wrapperspb.Int32Value{
Value: *q.Quota,
},
Max: q.Quota,
}
}

Expand All @@ -178,18 +172,11 @@ func ToMdmV1ProjectFindRequest(r *v1.ProjectFindRequest) *mdmv1.ProjectFindReque
return nil
}

mdmv1r := new(mdmv1.ProjectFindRequest)
if r.Id != nil {
mdmv1r.Id = &wrapperspb.StringValue{Value: *r.Id}
}
if r.Description != nil {
mdmv1r.Description = &wrapperspb.StringValue{Value: *r.Description}
}
if r.Name != nil {
mdmv1r.Name = &wrapperspb.StringValue{Value: *r.Name}
}
if r.TenantId != nil {
mdmv1r.TenantId = &wrapperspb.StringValue{Value: *r.TenantId}
mdmv1r := &mdmv1.ProjectFindRequest{
Id: r.Id,
Name: r.Name,
Description: r.Description,
TenantId: r.TenantId,
}

return mdmv1r
Expand All @@ -200,12 +187,9 @@ func ToMdmV1TenantFindRequest(r *v1.TenantFindRequest) *mdmv1.TenantFindRequest
return nil
}

mdmv1r := new(mdmv1.TenantFindRequest)
if r.Id != nil {
mdmv1r.Id = &wrapperspb.StringValue{Value: *r.Id}
}
if r.Name != nil {
mdmv1r.Name = &wrapperspb.StringValue{Value: *r.Name}
mdmv1r := &mdmv1.TenantFindRequest{
Id: r.Id,
Name: r.Name,
}
if r.Paging != nil {
mdmv1r.Paging = &mdmv1.Paging{
Expand Down Expand Up @@ -253,17 +237,11 @@ func ToV1Quota(q *mdmv1.Quota) *v1.Quota {
if q == nil {
return nil
}

return &v1.Quota{
Quota: unwrapInt32(q.Quota),
Quota: q.Max,
}
}
func unwrapInt32(w *wrapperspb.Int32Value) *int32 {
if w == nil {
return nil
}

return &w.Value
}

func mustTimestampToTime(ts *timestamppb.Timestamp) *time.Time {
if ts == nil {
Expand Down
27 changes: 10 additions & 17 deletions api/v1/common.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading