Skip to content

Commit e8b45e4

Browse files
d80tb7d80tb7
committed
merge master
1 parent 00017ff commit e8b45e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+159
-10169
lines changed

‎client/DotNet/ArmadaProject.Io.Client/ArmadaProject.Io.Client.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
../../../proto/k8s.io/apimachinery/pkg/util/intstr/generated.proto;
3030
../../../proto/k8s.io/api/networking/v1/generated.proto;
3131
../../../proto/k8s.io/api/core/v1/generated.proto;
32-
../../../proto/github.com/gogo/protobuf/gogoproto/gogo.proto;
3332
../../../proto/google/api/*.proto
3433
"
3534
ProtoRoot="../../../proto/"

‎go.mod‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ require (
1717
github.com/go-openapi/loads v0.21.5
1818
github.com/go-openapi/runtime v0.26.0
1919
github.com/go-openapi/spec v0.20.14
20-
github.com/gogo/protobuf v1.3.2
21-
github.com/golang/protobuf v1.5.4
2220
github.com/google/go-cmp v0.6.0 // indirect
2321
github.com/google/uuid v1.6.0
2422
github.com/grpc-ecosystem/grpc-gateway v1.16.0
@@ -66,7 +64,8 @@ require (
6664
github.com/go-openapi/swag v0.22.6
6765
github.com/go-openapi/validate v0.22.6
6866
github.com/go-playground/validator/v10 v10.15.4
69-
github.com/gogo/status v1.1.1
67+
github.com/gogo/protobuf v1.3.2
68+
github.com/golang/protobuf v1.5.4
7069
github.com/goreleaser/goreleaser v1.24.0
7170
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
7271
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
@@ -85,6 +84,7 @@ require (
8584
golang.org/x/term v0.25.0
8685
golang.org/x/time v0.5.0
8786
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
87+
google.golang.org/protobuf v1.36.5
8888
gopkg.in/inf.v0 v0.9.1
8989
gopkg.in/natefinch/lumberjack.v2 v2.0.0
9090
gopkg.in/yaml.v3 v3.0.1
@@ -129,7 +129,6 @@ require (
129129
github.com/go-playground/universal-translator v0.18.1 // indirect
130130
github.com/gobwas/glob v0.2.3 // indirect
131131
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
132-
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a // indirect
133132
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
134133
github.com/golang/snappy v0.0.4 // indirect
135134
github.com/google/btree v1.0.1 // indirect
@@ -205,7 +204,6 @@ require (
205204
golang.org/x/text v0.19.0 // indirect
206205
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
207206
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
208-
google.golang.org/protobuf v1.35.1 // indirect
209207
gopkg.in/ini.v1 v1.67.0 // indirect
210208
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
211209
k8s.io/cli-runtime v0.26.15 // indirect

‎go.sum‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,8 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA
213213
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0=
214214
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
215215
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
216-
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a h1:dR8+Q0uO5S2ZBcs2IH6VBKYwSxPo2vYCYq0ot0mu7xA=
217-
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
218216
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
219217
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
220-
github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg=
221-
github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU=
222218
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
223219
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
224220
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -808,7 +804,6 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
808804
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
809805
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
810806
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
811-
google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
812807
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
813808
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
814809
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -835,7 +830,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 h1:
835830
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142/go.mod h1:d6be+8HhtEtucleCbxpPW9PA9XwISACu8nvpPqF0BVo=
836831
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
837832
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
838-
google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
839833
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
840834
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
841835
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -857,8 +851,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
857851
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
858852
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
859853
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
860-
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
861-
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
854+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
855+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
862856
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
863857
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
864858
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎internal/binoculars/server/binoculars.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import (
44
"context"
55
"strconv"
66

7-
"github.com/gogo/protobuf/types"
8-
97
"github.com/armadaproject/armada/internal/binoculars/service"
108
"github.com/armadaproject/armada/internal/common"
119
"github.com/armadaproject/armada/internal/common/armadacontext"
1210
"github.com/armadaproject/armada/internal/common/auth"
1311
"github.com/armadaproject/armada/pkg/api/binoculars"
12+
"google.golang.org/protobuf/types/known/emptypb"
1413
)
1514

1615
type BinocularsServer struct {
@@ -42,11 +41,11 @@ func (b *BinocularsServer) Logs(ctx context.Context, request *binoculars.LogRequ
4241
return &binoculars.LogResponse{Log: logLines}, nil
4342
}
4443

45-
func (b *BinocularsServer) Cordon(ctx context.Context, request *binoculars.CordonRequest) (*types.Empty, error) {
44+
func (b *BinocularsServer) Cordon(ctx context.Context, request *binoculars.CordonRequest) (*emptypb.Empty, error) {
4645
err := b.cordonService.CordonNode(armadacontext.FromGrpcCtx(ctx), request)
4746
if err != nil {
4847
return nil, err
4948
}
5049

51-
return &types.Empty{}, nil
50+
return &emptypb.Empty, nil
5251
}

‎internal/common/eventutil/eventutil.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package eventutil
22

33
import (
44
"fmt"
5+
56
"time"
67

7-
"github.com/gogo/protobuf/proto"
88
"github.com/pkg/errors"
9+
"google.golang.org/protobuf/proto"
910
v1 "k8s.io/api/core/v1"
1011
networking "k8s.io/api/networking/v1"
1112
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎internal/common/eventutil/eventutil_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package eventutil
22

33
import (
4+
"google.golang.org/protobuf/proto"
45
"testing"
56

6-
"github.com/gogo/protobuf/proto"
77
"github.com/stretchr/testify/assert"
88

99
"github.com/armadaproject/armada/internal/common/util"

‎internal/common/ingest/ingestion_pipeline_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"time"
77

88
"github.com/apache/pulsar-client-go/pulsar"
9-
"github.com/gogo/protobuf/proto"
109
"github.com/stretchr/testify/assert"
1110

1211
"github.com/armadaproject/armada/internal/common/armadacontext"

‎internal/common/ingest/testfixtures/event.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package testfixtures
33
import (
44
"time"
55

6-
"github.com/gogo/protobuf/proto"
76
"github.com/google/uuid"
87
v1 "k8s.io/api/core/v1"
98
"k8s.io/apimachinery/pkg/api/resource"

‎internal/common/mocks/mock_executorapi.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/common/proto/protoutil.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package protoutil
33
import (
44
"time"
55

6-
"github.com/gogo/protobuf/proto"
7-
"github.com/gogo/protobuf/types"
86
"github.com/pkg/errors"
7+
"google.golang.org/protobuf/proto"
8+
"google.golang.org/protobuf/types/known/durationpb"
9+
"google.golang.org/protobuf/types/known/timestamppb"
910

1011
"github.com/armadaproject/armada/internal/common/compress"
1112
)
@@ -76,30 +77,30 @@ func MustMarshallAndCompress(msg proto.Message, compressor compress.Compressor)
7677
return b
7778
}
7879

79-
func ToStdTime(ts *types.Timestamp) time.Time {
80+
func ToStdTime(ts *timestamppb.Timestamp) time.Time {
8081
if ts == nil {
8182
return time.Time{}.UTC()
8283
}
8384

8485
return time.Unix(ts.Seconds, int64(ts.Nanos)).UTC()
8586
}
8687

87-
func ToTimestamp(t time.Time) *types.Timestamp {
88-
return &types.Timestamp{
88+
func ToTimestamp(t time.Time) *timestamppb.Timestamp {
89+
return &timestamppb.Timestamp{
8990
Seconds: t.Unix(),
9091
Nanos: int32(t.Nanosecond()),
9192
}
9293
}
9394

94-
func ToStdDuration(pd *types.Duration) time.Duration {
95+
func ToStdDuration(pd *durationpb.Duration) time.Duration {
9596
if pd == nil {
9697
return 0
9798
}
9899
return time.Duration(pd.Seconds)*time.Second + time.Duration(pd.Nanos)*time.Nanosecond
99100
}
100101

101-
func ToDuration(d time.Duration) *types.Duration {
102-
return &types.Duration{
102+
func ToDuration(d time.Duration) *durationpb.Duration {
103+
return &durationpb.Duration{
103104
Seconds: d.Nanoseconds() / 1000000000,
104105
Nanos: int32(d.Nanoseconds() % 1000000000),
105106
}

0 commit comments

Comments
 (0)