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.

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

Update to go-1.23 and fix new linter warnings #105

Merged
merged 2 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
make server

- name: Build and push image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: true
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.20 as health-downloader
ENV GRPC_HEALTH_PROBE_VERSION=v0.4.26 \
ENV GRPC_HEALTH_PROBE_VERSION=v0.4.28 \
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ This Microservice provides the source of truth for master data.
* tenant project
* settings
* limit max clusters
* tenant members
* tenant project members

## Design

Expand Down
22 changes: 9 additions & 13 deletions api/rest/mapper/mapper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/google/go-cmp/cmp"
v1 "github.com/metal-stack/masterdata-api/api/rest/v1"
"github.com/metal-stack/metal-lib/pkg/pointer"
)

func TestTenantMapperRoundtrip(t *testing.T) {
Expand Down Expand Up @@ -36,30 +37,30 @@ func TestTenantMapperRoundtrip(t *testing.T) {
Description: "tnt is a test tenant",
DefaultQuotas: &v1.QuotaSet{
Cluster: &v1.Quota{
Quota: int32p(100),
Quota: pointer.Pointer(int32(100)),
},
Machine: &v1.Quota{
Quota: int32p(10),
Quota: pointer.Pointer(int32(10)),
},
Ip: &v1.Quota{
Quota: int32p(20),
Quota: pointer.Pointer(int32(20)),
},
Project: &v1.Quota{
Quota: int32p(11),
Quota: pointer.Pointer(int32(11)),
},
},
Quotas: &v1.QuotaSet{
Cluster: &v1.Quota{
Quota: int32p(100),
Quota: pointer.Pointer(int32(100)),
},
Machine: &v1.Quota{
Quota: int32p(72),
Quota: pointer.Pointer(int32(72)),
},
Ip: &v1.Quota{
Quota: int32p(30),
Quota: pointer.Pointer(int32(30)),
},
Project: &v1.Quota{
Quota: int32p(7),
Quota: pointer.Pointer(int32(7)),
},
},
IAMConfig: &v1.IAMConfig{
Expand Down Expand Up @@ -137,11 +138,6 @@ func TestTenantMapperRoundtrip(t *testing.T) {
}
}

func int32p(i int) *int32 {
i32 := int32(i)
return &i32
}

func mustParseTimeP(ts string) *time.Time {
t, err := time.Parse("2006-01-02", ts)
if err != nil {
Expand Down
43 changes: 30 additions & 13 deletions api/v1/project_grpc.pb.go

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

40 changes: 28 additions & 12 deletions api/v1/project_member_grpc.pb.go

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

Loading