From 3b74b36d988d1271f2899cbcc2b614ec166b7372 Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Thu, 13 Jun 2024 08:10:27 +0200 Subject: [PATCH] Migrate to buf v2 config format and update deps (#98) --- .github/workflows/docker.yaml | 2 +- .github/workflows/release-drafter.yaml | 2 +- Dockerfile | 6 +- api/v1/common.pb.go | 8 +-- api/v1/iam.pb.go | 14 ++-- api/v1/meta.pb.go | 6 +- api/v1/project.pb.go | 24 +++---- api/v1/project_member.pb.go | 22 +++--- api/v1/quota.pb.go | 8 +-- api/v1/tenant.pb.go | 46 ++++++------- api/v1/tenant_member.pb.go | 22 +++--- go.mod | 39 ++++++----- go.sum | 95 ++++++++++++-------------- pkg/client/client.go | 3 +- proto/Makefile | 4 +- proto/buf.gen.yaml | 13 ++-- proto/buf.lock | 13 ---- proto/buf.yaml | 18 +++-- 18 files changed, 162 insertions(+), 183 deletions(-) delete mode 100644 proto/buf.lock diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index b37c820..b0a356c 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -38,7 +38,7 @@ jobs: cache: false - name: Lint - uses: golangci/golangci-lint-action@v4 + uses: golangci/golangci-lint-action@v6 with: args: --build-tags integration -p bugs -p unused -D protogetter --timeout=10m diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml index da232f3..f0e8eae 100644 --- a/.github/workflows/release-drafter.yaml +++ b/.github/workflows/release-drafter.yaml @@ -10,6 +10,6 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 18e4233..ce274c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM alpine:3.19 as health-downloader -ENV GRPC_HEALTH_PROBE_VERSION=v0.4.25 \ +FROM alpine:3.20 as health-downloader +ENV GRPC_HEALTH_PROBE_VERSION=v0.4.26 \ 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 \ ${GRPC_HEALTH_PROBE_URL}/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 \ && chmod +x /bin/grpc_health_probe -FROM alpine:3.19 +FROM alpine:3.20 RUN apk -U add ca-certificates COPY --from=health-downloader /bin/grpc_health_probe /bin/grpc_health_probe COPY bin/server /masterdata-api diff --git a/api/v1/common.pb.go b/api/v1/common.pb.go index cb8796d..16cd3f6 100644 --- a/api/v1/common.pb.go +++ b/api/v1/common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/common.proto @@ -110,7 +110,7 @@ func file_v1_common_proto_rawDescGZIP() []byte { } var file_v1_common_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_v1_common_proto_goTypes = []interface{}{ +var file_v1_common_proto_goTypes = []any{ (*Paging)(nil), // 0: v1.Paging } var file_v1_common_proto_depIdxs = []int32{ @@ -127,7 +127,7 @@ func file_v1_common_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_v1_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_common_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Paging); i { case 0: return &v.state @@ -140,7 +140,7 @@ func file_v1_common_proto_init() { } } } - file_v1_common_proto_msgTypes[0].OneofWrappers = []interface{}{} + file_v1_common_proto_msgTypes[0].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/v1/iam.pb.go b/api/v1/iam.pb.go index 1e4de13..09dd466 100644 --- a/api/v1/iam.pb.go +++ b/api/v1/iam.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/iam.proto @@ -554,7 +554,7 @@ func file_v1_iam_proto_rawDescGZIP() []byte { } var file_v1_iam_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -var file_v1_iam_proto_goTypes = []interface{}{ +var file_v1_iam_proto_goTypes = []any{ (*IAMConfig)(nil), // 0: v1.IAMConfig (*IssuerConfig)(nil), // 1: v1.IssuerConfig (*IDMConfig)(nil), // 2: v1.IDMConfig @@ -581,7 +581,7 @@ func file_v1_iam_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_v1_iam_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_iam_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*IAMConfig); i { case 0: return &v.state @@ -593,7 +593,7 @@ func file_v1_iam_proto_init() { return nil } } - file_v1_iam_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_v1_iam_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*IssuerConfig); i { case 0: return &v.state @@ -605,7 +605,7 @@ func file_v1_iam_proto_init() { return nil } } - file_v1_iam_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_v1_iam_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*IDMConfig); i { case 0: return &v.state @@ -617,7 +617,7 @@ func file_v1_iam_proto_init() { return nil } } - file_v1_iam_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_v1_iam_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*NamespaceGroupConfig); i { case 0: return &v.state @@ -629,7 +629,7 @@ func file_v1_iam_proto_init() { return nil } } - file_v1_iam_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_v1_iam_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ConnectorConfig); i { case 0: return &v.state diff --git a/api/v1/meta.pb.go b/api/v1/meta.pb.go index 96d423b..1900c36 100644 --- a/api/v1/meta.pb.go +++ b/api/v1/meta.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/meta.proto @@ -176,7 +176,7 @@ func file_v1_meta_proto_rawDescGZIP() []byte { } var file_v1_meta_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_v1_meta_proto_goTypes = []interface{}{ +var file_v1_meta_proto_goTypes = []any{ (*Meta)(nil), // 0: v1.Meta nil, // 1: v1.Meta.AnnotationsEntry (*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp @@ -198,7 +198,7 @@ func file_v1_meta_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_v1_meta_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_meta_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Meta); i { case 0: return &v.state diff --git a/api/v1/project.pb.go b/api/v1/project.pb.go index 77d561e..59394f2 100644 --- a/api/v1/project.pb.go +++ b/api/v1/project.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/project.proto @@ -657,7 +657,7 @@ func file_v1_project_proto_rawDescGZIP() []byte { } var file_v1_project_proto_msgTypes = make([]protoimpl.MessageInfo, 10) -var file_v1_project_proto_goTypes = []interface{}{ +var file_v1_project_proto_goTypes = []any{ (*Project)(nil), // 0: v1.Project (*ProjectCreateRequest)(nil), // 1: v1.ProjectCreateRequest (*ProjectUpdateRequest)(nil), // 2: v1.ProjectUpdateRequest @@ -716,7 +716,7 @@ func file_v1_project_proto_init() { file_v1_meta_proto_init() file_v1_quota_proto_init() if !protoimpl.UnsafeEnabled { - file_v1_project_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*Project); i { case 0: return &v.state @@ -728,7 +728,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProjectCreateRequest); i { case 0: return &v.state @@ -740,7 +740,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProjectUpdateRequest); i { case 0: return &v.state @@ -752,7 +752,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProjectDeleteRequest); i { case 0: return &v.state @@ -764,7 +764,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProjectGetRequest); i { case 0: return &v.state @@ -776,7 +776,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProjectGetHistoryRequest); i { case 0: return &v.state @@ -788,7 +788,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProjectFindRequest); i { case 0: return &v.state @@ -800,7 +800,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProjectResponse); i { case 0: return &v.state @@ -812,7 +812,7 @@ func file_v1_project_proto_init() { return nil } } - file_v1_project_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*ProjectListResponse); i { case 0: return &v.state @@ -825,7 +825,7 @@ func file_v1_project_proto_init() { } } } - file_v1_project_proto_msgTypes[8].OneofWrappers = []interface{}{} + file_v1_project_proto_msgTypes[8].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/v1/project_member.pb.go b/api/v1/project_member.pb.go index 82ce912..687c18c 100644 --- a/api/v1/project_member.pb.go +++ b/api/v1/project_member.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/project_member.proto @@ -532,7 +532,7 @@ func file_v1_project_member_proto_rawDescGZIP() []byte { } var file_v1_project_member_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_v1_project_member_proto_goTypes = []interface{}{ +var file_v1_project_member_proto_goTypes = []any{ (*ProjectMember)(nil), // 0: v1.ProjectMember (*ProjectMemberCreateRequest)(nil), // 1: v1.ProjectMemberCreateRequest (*ProjectMemberUpdateRequest)(nil), // 2: v1.ProjectMemberUpdateRequest @@ -575,7 +575,7 @@ func file_v1_project_member_proto_init() { } file_v1_meta_proto_init() if !protoimpl.UnsafeEnabled { - file_v1_project_member_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ProjectMember); i { case 0: return &v.state @@ -587,7 +587,7 @@ func file_v1_project_member_proto_init() { return nil } } - file_v1_project_member_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ProjectMemberCreateRequest); i { case 0: return &v.state @@ -599,7 +599,7 @@ func file_v1_project_member_proto_init() { return nil } } - file_v1_project_member_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ProjectMemberUpdateRequest); i { case 0: return &v.state @@ -611,7 +611,7 @@ func file_v1_project_member_proto_init() { return nil } } - file_v1_project_member_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ProjectMemberDeleteRequest); i { case 0: return &v.state @@ -623,7 +623,7 @@ func file_v1_project_member_proto_init() { return nil } } - file_v1_project_member_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*ProjectMemberGetRequest); i { case 0: return &v.state @@ -635,7 +635,7 @@ func file_v1_project_member_proto_init() { return nil } } - file_v1_project_member_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*ProjectMemberFindRequest); i { case 0: return &v.state @@ -647,7 +647,7 @@ func file_v1_project_member_proto_init() { return nil } } - file_v1_project_member_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProjectMemberResponse); i { case 0: return &v.state @@ -659,7 +659,7 @@ func file_v1_project_member_proto_init() { return nil } } - file_v1_project_member_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_v1_project_member_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*ProjectMemberListResponse); i { case 0: return &v.state @@ -672,7 +672,7 @@ func file_v1_project_member_proto_init() { } } } - file_v1_project_member_proto_msgTypes[5].OneofWrappers = []interface{}{} + file_v1_project_member_proto_msgTypes[5].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/v1/quota.pb.go b/api/v1/quota.pb.go index 9cacb91..8b95686 100644 --- a/api/v1/quota.pb.go +++ b/api/v1/quota.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/quota.proto @@ -191,7 +191,7 @@ func file_v1_quota_proto_rawDescGZIP() []byte { } var file_v1_quota_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_v1_quota_proto_goTypes = []interface{}{ +var file_v1_quota_proto_goTypes = []any{ (*QuotaSet)(nil), // 0: v1.QuotaSet (*Quota)(nil), // 1: v1.Quota (*wrapperspb.Int32Value)(nil), // 2: google.protobuf.Int32Value @@ -215,7 +215,7 @@ func file_v1_quota_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_v1_quota_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_quota_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*QuotaSet); i { case 0: return &v.state @@ -227,7 +227,7 @@ func file_v1_quota_proto_init() { return nil } } - file_v1_quota_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_v1_quota_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*Quota); i { case 0: return &v.state diff --git a/api/v1/tenant.pb.go b/api/v1/tenant.pb.go index e5e8d5c..e2ee352 100644 --- a/api/v1/tenant.pb.go +++ b/api/v1/tenant.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/tenant.proto @@ -1192,7 +1192,7 @@ func file_v1_tenant_proto_rawDescGZIP() []byte { } var file_v1_tenant_proto_msgTypes = make([]protoimpl.MessageInfo, 22) -var file_v1_tenant_proto_goTypes = []interface{}{ +var file_v1_tenant_proto_goTypes = []any{ (*FindParticipatingProjectsRequest)(nil), // 0: v1.FindParticipatingProjectsRequest (*FindParticipatingTenantsRequest)(nil), // 1: v1.FindParticipatingTenantsRequest (*ListTenantMembersRequest)(nil), // 2: v1.ListTenantMembersRequest @@ -1282,7 +1282,7 @@ func file_v1_tenant_proto_init() { file_v1_project_proto_init() file_v1_quota_proto_init() if !protoimpl.UnsafeEnabled { - file_v1_tenant_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*FindParticipatingProjectsRequest); i { case 0: return &v.state @@ -1294,7 +1294,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*FindParticipatingTenantsRequest); i { case 0: return &v.state @@ -1306,7 +1306,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*ListTenantMembersRequest); i { case 0: return &v.state @@ -1318,7 +1318,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*ListTenantMembersResponse); i { case 0: return &v.state @@ -1330,7 +1330,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*FindParticipatingProjectsResponse); i { case 0: return &v.state @@ -1342,7 +1342,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*FindParticipatingTenantsResponse); i { case 0: return &v.state @@ -1354,7 +1354,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*ProjectWithMembershipAnnotations); i { case 0: return &v.state @@ -1366,7 +1366,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*TenantWithMembershipAnnotations); i { case 0: return &v.state @@ -1378,7 +1378,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[8].Exporter = func(v any, i int) any { switch v := v.(*Tenant); i { case 0: return &v.state @@ -1390,7 +1390,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[9].Exporter = func(v any, i int) any { switch v := v.(*TenantCreateRequest); i { case 0: return &v.state @@ -1402,7 +1402,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[10].Exporter = func(v any, i int) any { switch v := v.(*TenantUpdateRequest); i { case 0: return &v.state @@ -1414,7 +1414,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[11].Exporter = func(v any, i int) any { switch v := v.(*TenantDeleteRequest); i { case 0: return &v.state @@ -1426,7 +1426,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[12].Exporter = func(v any, i int) any { switch v := v.(*TenantGetRequest); i { case 0: return &v.state @@ -1438,7 +1438,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[13].Exporter = func(v any, i int) any { switch v := v.(*TenantGetHistoryRequest); i { case 0: return &v.state @@ -1450,7 +1450,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[14].Exporter = func(v any, i int) any { switch v := v.(*TenantFindRequest); i { case 0: return &v.state @@ -1462,7 +1462,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[15].Exporter = func(v any, i int) any { switch v := v.(*TenantResponse); i { case 0: return &v.state @@ -1474,7 +1474,7 @@ func file_v1_tenant_proto_init() { return nil } } - file_v1_tenant_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_proto_msgTypes[16].Exporter = func(v any, i int) any { switch v := v.(*TenantListResponse); i { case 0: return &v.state @@ -1487,10 +1487,10 @@ func file_v1_tenant_proto_init() { } } } - file_v1_tenant_proto_msgTypes[0].OneofWrappers = []interface{}{} - file_v1_tenant_proto_msgTypes[1].OneofWrappers = []interface{}{} - file_v1_tenant_proto_msgTypes[2].OneofWrappers = []interface{}{} - file_v1_tenant_proto_msgTypes[16].OneofWrappers = []interface{}{} + file_v1_tenant_proto_msgTypes[0].OneofWrappers = []any{} + file_v1_tenant_proto_msgTypes[1].OneofWrappers = []any{} + file_v1_tenant_proto_msgTypes[2].OneofWrappers = []any{} + file_v1_tenant_proto_msgTypes[16].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/api/v1/tenant_member.pb.go b/api/v1/tenant_member.pb.go index 92275cb..be74464 100644 --- a/api/v1/tenant_member.pb.go +++ b/api/v1/tenant_member.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: v1/tenant_member.proto @@ -531,7 +531,7 @@ func file_v1_tenant_member_proto_rawDescGZIP() []byte { } var file_v1_tenant_member_proto_msgTypes = make([]protoimpl.MessageInfo, 9) -var file_v1_tenant_member_proto_goTypes = []interface{}{ +var file_v1_tenant_member_proto_goTypes = []any{ (*TenantMember)(nil), // 0: v1.TenantMember (*TenantMemberCreateRequest)(nil), // 1: v1.TenantMemberCreateRequest (*TenantMemberUpdateRequest)(nil), // 2: v1.TenantMemberUpdateRequest @@ -574,7 +574,7 @@ func file_v1_tenant_member_proto_init() { } file_v1_meta_proto_init() if !protoimpl.UnsafeEnabled { - file_v1_tenant_member_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*TenantMember); i { case 0: return &v.state @@ -586,7 +586,7 @@ func file_v1_tenant_member_proto_init() { return nil } } - file_v1_tenant_member_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*TenantMemberCreateRequest); i { case 0: return &v.state @@ -598,7 +598,7 @@ func file_v1_tenant_member_proto_init() { return nil } } - file_v1_tenant_member_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[2].Exporter = func(v any, i int) any { switch v := v.(*TenantMemberUpdateRequest); i { case 0: return &v.state @@ -610,7 +610,7 @@ func file_v1_tenant_member_proto_init() { return nil } } - file_v1_tenant_member_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[3].Exporter = func(v any, i int) any { switch v := v.(*TenantMemberDeleteRequest); i { case 0: return &v.state @@ -622,7 +622,7 @@ func file_v1_tenant_member_proto_init() { return nil } } - file_v1_tenant_member_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[4].Exporter = func(v any, i int) any { switch v := v.(*TenantMemberGetRequest); i { case 0: return &v.state @@ -634,7 +634,7 @@ func file_v1_tenant_member_proto_init() { return nil } } - file_v1_tenant_member_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[5].Exporter = func(v any, i int) any { switch v := v.(*TenantMemberFindRequest); i { case 0: return &v.state @@ -646,7 +646,7 @@ func file_v1_tenant_member_proto_init() { return nil } } - file_v1_tenant_member_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[6].Exporter = func(v any, i int) any { switch v := v.(*TenantMemberResponse); i { case 0: return &v.state @@ -658,7 +658,7 @@ func file_v1_tenant_member_proto_init() { return nil } } - file_v1_tenant_member_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_v1_tenant_member_proto_msgTypes[7].Exporter = func(v any, i int) any { switch v := v.(*TenantMemberListResponse); i { case 0: return &v.state @@ -671,7 +671,7 @@ func file_v1_tenant_member_proto_init() { } } } - file_v1_tenant_member_proto_msgTypes[5].OneofWrappers = []interface{}{} + file_v1_tenant_member_proto_msgTypes[5].OneofWrappers = []any{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/go.mod b/go.mod index 7fa2afa..047b008 100644 --- a/go.mod +++ b/go.mod @@ -12,18 +12,18 @@ require ( github.com/json-iterator/go v1.1.12 github.com/lib/pq v1.10.9 github.com/lopezator/migrator v0.3.1 - github.com/metal-stack/metal-lib v0.16.2 + github.com/metal-stack/metal-lib v0.16.3 github.com/metal-stack/security v0.8.0 github.com/metal-stack/v v1.0.3 github.com/prometheus/client_golang v1.19.1 github.com/spf13/cobra v1.8.0 - github.com/spf13/viper v1.18.2 + github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.31.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 - go.opentelemetry.io/otel/trace v1.26.0 - google.golang.org/grpc v1.63.2 - google.golang.org/protobuf v1.34.1 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 + go.opentelemetry.io/otel/trace v1.27.0 + google.golang.org/grpc v1.64.0 + google.golang.org/protobuf v1.34.2 sigs.k8s.io/yaml v1.4.0 ) @@ -36,27 +36,27 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/containerd/containerd v1.7.16 // indirect + github.com/containerd/containerd v1.7.17 // indirect github.com/containerd/log v0.1.0 // indirect github.com/coreos/go-oidc/v3 v3.10.0 // indirect github.com/cpuguy83/dockercfg v0.3.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect github.com/distribution/reference v0.6.0 // indirect - github.com/docker/docker v26.1.2+incompatible // indirect + github.com/docker/docker v26.1.3+incompatible // indirect github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-jose/go-jose/v4 v4.0.1 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-jose/go-jose/v4 v4.0.2 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/errors v0.22.0 // indirect github.com/go-openapi/runtime v0.28.0 // indirect github.com/go-openapi/strfmt v0.23.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/gorilla/mux v1.8.1 // indirect @@ -73,7 +73,7 @@ require ( github.com/lestrrat-go/iter v1.0.2 // indirect github.com/lestrrat-go/jwx/v2 v2.0.21 // indirect github.com/lestrrat-go/option v1.0.1 // indirect - github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 // indirect + github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -94,11 +94,11 @@ require ( github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.53.0 // indirect - github.com/prometheus/procfs v0.14.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/segmentio/asm v1.2.0 // indirect - github.com/shirou/gopsutil/v3 v3.24.4 // indirect + github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sourcegraph/conc v0.3.0 // indirect @@ -111,19 +111,18 @@ require ( github.com/tklauser/numcpus v0.8.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.mongodb.org/mongo-driver v1.15.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect - go.opentelemetry.io/otel v1.26.0 // indirect - go.opentelemetry.io/otel/metric v1.26.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect + go.opentelemetry.io/otel v1.27.0 // indirect + go.opentelemetry.io/otel/metric v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.23.0 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect + golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.20.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index ae47977..e0d1181 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cloud.google.com/go v0.110.10 h1:LXy9GEO+timppncPIAZoOj3l58LIU9k+kn48AN7IO3Y= -cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= +cloud.google.com/go/compute v1.25.1 h1:ZRpHJedLtTpKgr3RV1Fx23NuaAEN1Zfx9hw1u4aJdjU= cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= @@ -24,8 +24,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/containerd/containerd v1.7.16 h1:7Zsfe8Fkj4Wi2My6DXGQ87hiqIrmOXolm72ZEkFU5Mg= -github.com/containerd/containerd v1.7.16/go.mod h1:NL49g7A/Fui7ccmxV6zkBWwqMgmMxFWzujYCc+JLt7k= +github.com/containerd/containerd v1.7.17 h1:KjNnn0+tAVQHAoaWRjmdak9WlvnFR/8rU1CHHy8Rm2A= +github.com/containerd/containerd v1.7.17/go.mod h1:vK+hhT4TIv2uejlcDlbVIc8+h/BqtKLIyNrtCZol8lI= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/coreos/go-oidc/v3 v3.10.0 h1:tDnXHnLyiTVyT/2zLDGj09pFPkhND8Gl8lnTRhoEaJU= @@ -43,8 +43,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnN github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v26.1.2+incompatible h1:UVX5ZOrrfTGZZYEP+ZDq3Xn9PdHNXaSYMFPDumMqG2k= -github.com/docker/docker v26.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v26.1.3+incompatible h1:lLCzRbrVZrljpVNobJu1J2FHk8V0s4BawoZippkc+xo= +github.com/docker/docker v26.1.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -55,11 +55,11 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U= -github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= +github.com/go-jose/go-jose/v4 v4.0.2 h1:R3l3kkBds16bO7ZFAEEcofK0MkrAJt3jlJznWZG0nvk= +github.com/go-jose/go-jose/v4 v4.0.2/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= @@ -87,15 +87,12 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -166,17 +163,16 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lopezator/migrator v0.3.1 h1:ZFPT6aC7+nGWkqhleynABZ6ftycSf6hmHHLOaryq1Og= github.com/lopezator/migrator v0.3.1/go.mod h1:X+lHDMZ9Ci3/KdbypJcQYFFwipVrJsX4fRCQ4QLauYk= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74 h1:1KuuSOy4ZNgW0KA2oYIngXVFhQcXxhLqCVK7cBcldkk= -github.com/lufia/plan9stats v0.0.0-20240408141607-282e7b5d6b74/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= +github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI= +github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/metal-stack/metal-lib v0.16.2 h1:RJls/Spai4h5xr3BEmQt9UdWNN4RB9+SOINoZcjYaA8= -github.com/metal-stack/metal-lib v0.16.2/go.mod h1:nyNGI4DZFOcWbSoq2Y6V3SHpFxuXBIqYBZHTb6cy//s= +github.com/metal-stack/metal-lib v0.16.3 h1:xJr6P9GauQK49aoFH0bFyye5kRGmt87PomokulUm4Go= +github.com/metal-stack/metal-lib v0.16.3/go.mod h1:nyNGI4DZFOcWbSoq2Y6V3SHpFxuXBIqYBZHTb6cy//s= github.com/metal-stack/security v0.8.0 h1:tVaSDB9m5clwYrnLyaXfPy7mQlJTnmeoHscG+RUy/xo= github.com/metal-stack/security v0.8.0/go.mod h1:7GAcQb+pOgflW30ohJygxpqc3i0dQ2ahGJK1CU5tqa0= github.com/metal-stack/v v1.0.3 h1:Sh2oBlnxrCUD+mVpzfC8HiqL045YWkxs0gpTvkjppqs= @@ -213,7 +209,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= @@ -222,8 +217,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE= github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= -github.com/prometheus/procfs v0.14.0 h1:Lw4VdGGoKEZilJsayHf0B+9YgLGREba2C6xr+Fdfq6s= -github.com/prometheus/procfs v0.14.0/go.mod h1:XL+Iwz8k8ZabyZfMFHPiilCniixqQarAy5Mu67pHlNQ= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -233,8 +228,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/shirou/gopsutil/v3 v3.24.4 h1:dEHgzZXt4LMNm+oYELpzl9YCqV65Yr/6SfrvgRBtXeU= -github.com/shirou/gopsutil/v3 v3.24.4/go.mod h1:lTd2mdiOspcqLgAnr9/nGi71NkeMpWKdmhuxm9GusH8= +github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= +github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= @@ -251,8 +246,8 @@ github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= -github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= @@ -271,10 +266,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/testcontainers/testcontainers-go v0.31.0 h1:W0VwIhcEVhRflwL9as3dhY6jXjVCA27AkmbnZ+UTh3U= github.com/testcontainers/testcontainers-go v0.31.0/go.mod h1:D2lAoA0zUFiSY+eAflqK5mcUx/A5hrrORaEQrd0SefI= -github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY= -github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY= github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -283,22 +276,22 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.15.0 h1:rJCKC8eEliewXjZGf0ddURtl7tTVy1TK3bfl0gkUSLc= go.mongodb.org/mongo-driver v1.15.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 h1:A3SayB3rNyt+1S6qpI9mHPkeHTZbD7XILEqWnYZb2l0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0/go.mod h1:27iA5uvhuRNmalO+iEUdVn5ZMj2qy10Mm+XRIpRmyuU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0/go.mod h1:vy+2G/6NvVMpwGX/NyLqcC41fxepnuKHk16E6IZUcJc= -go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= -go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= -go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= -go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= -go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA= -go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= +go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -308,8 +301,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= +golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg= +golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -333,9 +326,6 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= @@ -354,14 +344,15 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 h1:rIo7ocm2roD9DcFIX67Ym8icoGCKSARAiPljFhh5suQ= -google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 h1:umK/Ey0QEzurTNlsV3R+MfxHAb78HCEX/IkuR+zH4WQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM= -google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= -google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 h1:RFiFrvy37/mpSpdySBDrUdipW/dHwsRwh3J3+A9VgT4= +google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/pkg/client/client.go b/pkg/client/client.go index 141c431..4373743 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -93,10 +93,9 @@ func NewClient(ctx context.Context, hostname string, port int, certFile string, grpc.WithTransportCredentials(creds), // grpc.WithInsecure(), - grpc.WithBlock(), } // Set up a connection to the server. - conn, err := grpc.DialContext(ctx, address, opts...) + conn, err := grpc.NewClient(address, opts...) if err != nil { return nil, err } diff --git a/proto/Makefile b/proto/Makefile index 4fac0ed..cfe40c8 100644 --- a/proto/Makefile +++ b/proto/Makefile @@ -1,5 +1,5 @@ MAKEFLAGS += --no-print-directory -BUF_VERSION := 1.30.0 +BUF_VERSION := 1.32.2 _buf: docker run --rm \ @@ -12,7 +12,7 @@ _buf: .PHONY: protolint protolint: - @$(MAKE) _buf CMD="format -w v1" + @$(MAKE) _buf CMD="format -w" @$(MAKE) _buf CMD="lint -v" .PHONY: protoc diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml index 4790e82..8177f4a 100644 --- a/proto/buf.gen.yaml +++ b/proto/buf.gen.yaml @@ -1,14 +1,13 @@ -version: v1 +version: v2 managed: enabled: true - go_package_prefix: - default: github.com/metal-stack/masterdata-api + override: + - file_option: go_package_prefix + value: github.com/metal-stack/masterdata-api plugins: - # generate go structs for protocol buffer definition - - plugin: buf.build/grpc/go:v1.3.0 + - remote: buf.build/grpc/go:v1.3.0 out: ../api opt: paths=source_relative,require_unimplemented_servers=false - # generate go structs for protocol buffer definition - - plugin: buf.build/protocolbuffers/go:v1.33.0 + - remote: buf.build/protocolbuffers/go:v1.34.2 out: ../api opt: paths=source_relative diff --git a/proto/buf.lock b/proto/buf.lock deleted file mode 100644 index d5b9834..0000000 --- a/proto/buf.lock +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by buf. DO NOT EDIT. -version: v1 -deps: - - remote: buf.build - owner: googleapis - repository: googleapis - commit: 7e6f6e774e29406da95bd61cdcdbc8bc - digest: shake256:fe43dd2265ea0c07d76bd925eeba612667cf4c948d2ce53d6e367e1b4b3cb5fa69a51e6acb1a6a50d32f894f054a35e6c0406f6808a483f2752e10c866ffbf73 - - remote: buf.build - owner: grpc - repository: grpc - commit: 5967f8ae08c74d6381f4aa72169dfc09 - digest: shake256:66364f669c4a46ecb438ad2445329321f00cf8c77f7850a9f3066c945e8d8608fa874e3544ec2f905eeb7278160c056d02aa5f3d56d62efbabbcf25395c08899 diff --git a/proto/buf.yaml b/proto/buf.yaml index 48c9a52..a1d6c63 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,14 +1,18 @@ -version: v1 -breaking: - use: - - FILE +version: v2 lint: use: - DEFAULT except: + - FIELD_NOT_REQUIRED + - PACKAGE_NO_IMPORT_CYCLE + - PACKAGE_VERSION_SUFFIX - RPC_REQUEST_RESPONSE_UNIQUE - RPC_REQUEST_STANDARD_NAME - RPC_RESPONSE_STANDARD_NAME - - PACKAGE_VERSION_SUFFIX -deps: - - buf.build/grpc/grpc \ No newline at end of file + disallow_comment_ignores: true +breaking: + use: + - FILE + except: + - EXTENSION_NO_DELETE + - FIELD_SAME_DEFAULT