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

gRPC Endpoints #232

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
feat: ServiceLogs
  • Loading branch information
Andrew Hare committed May 2, 2024
commit 59b74522b05ea2a592b8758cff2b112bb183537b
2 changes: 1 addition & 1 deletion cmd/provider-services/cmd/leaseLogs.go
Original file line number Diff line number Diff line change
@@ -235,7 +235,7 @@ func (g leaseLogGetter) rest(ctx context.Context, leases []mtypes.LeaseID) {
for _, lid := range leases {
stream := result{lid: lid}
prov, _ := sdk.AccAddressFromBech32(lid.Provider)
gclient, err := gwrest.NewClient(ctx, g.cl, prov, []tls.Certificate{cert})
gclient, err := gwrest.NewClient(ctx, g.cl, prov, []tls.Certificate{g.cert})
if err == nil {
stream.stream, stream.error = gclient.LeaseLogs(ctx, lid, g.svcs, g.follow, g.tailLines)
} else {
2 changes: 1 addition & 1 deletion cmd/provider-services/cmd/leaseStatus.go
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ func doLeaseStatus(cmd *cobra.Command) error {

leaseStatus = toLeaseStatus(res)
} else {
gclient, err := gwrest.NewClient(ctx, cl, prov, []tls.Certificate{cert})
gclient, err := gwrest.NewClient(ctx, cl, provAddr, []tls.Certificate{cert})
if err != nil {
return err
}
55 changes: 42 additions & 13 deletions gateway/grpc/lease.go
Original file line number Diff line number Diff line change
@@ -28,8 +28,37 @@ func (*server) SendManifest(context.Context, *leasev1.SendManifestRequest) (*lea
panic("unimplemented")
}

func (*server) ServiceLogs(context.Context, *leasev1.ServiceLogsRequest) (*leasev1.ServiceLogsResponse, error) {
panic("unimplemented")
func (s *server) ServiceLogs(ctx context.Context, r *leasev1.ServiceLogsRequest) (*leasev1.ServiceLogsResponse, error) {
var (
id = r.GetLeaseId()
services = strings.Join(r.GetServices(), " ")
lines = int64(0)
)

logs, err := s.rc.LeaseLogs(ctx, id, services, true, &lines)
if err != nil {
return nil, fmt.Errorf("lease logs: %w", err)
}

if len(logs) == 0 {
return nil, ErrNoRunningPods
}

var resp leasev1.ServiceLogsResponse
for _, l := range logs {
defer l.Stream.Close()

for l.Scanner.Scan() {
resp.Services = append(resp.Services,
newLeaseV1ServiceLogs(l.Name, l.Scanner.Bytes()))
}

if err := l.Scanner.Err(); err != nil {
return nil, fmt.Errorf("%s scanner: %w", l.Name, err)
}
}

return &resp, nil
}

func (s *server) ServiceStatus(ctx context.Context, r *leasev1.ServiceStatusRequest) (*leasev1.ServiceStatusResponse, error) {
@@ -178,19 +207,9 @@ func (s *server) StreamServiceLogs(r *leasev1.ServiceLogsRequest, strm leasev1.L
case <-ctx.Done():
return
default:
var (
buf = l.Scanner.Bytes()
logs = make([]byte, len(buf))
)

copy(logs, buf)

resp := leasev1.ServiceLogsResponse{
Services: []*leasev1.ServiceLogs{
{
Name: l.Name,
Logs: buf,
},
newLeaseV1ServiceLogs(l.Name, l.Scanner.Bytes()),
},
}

@@ -219,6 +238,16 @@ func (s *server) StreamServiceLogs(r *leasev1.ServiceLogsRequest, strm leasev1.L
return nil
}

func newLeaseV1ServiceLogs(name string, buf []byte) *leasev1.ServiceLogs {
logs := make([]byte, len(buf))
copy(logs, buf)

return &leasev1.ServiceLogs{
Name: name,
Logs: buf,
}
}

type safeLogStream struct {
s leasev1.LeaseRPC_StreamServiceLogsServer
mu sync.Mutex
20 changes: 10 additions & 10 deletions gateway/grpc/server.go
Original file line number Diff line number Diff line change
@@ -158,19 +158,19 @@ func NewServer(ctx context.Context, opts ...opt) Server {
}

func mtlsInterceptor(cquery ctypes.QueryClient) grpc.UnaryServerInterceptor {
return func(ctx context.Context, req interface{}, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp interface{}, err error) {
return func(ctx context.Context, req any, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) {
if p, ok := peer.FromContext(ctx); ok {
if mtls, ok := p.AuthInfo.(credentials.TLSInfo); ok {
certificates := mtls.State.PeerCertificates

if len(certificates) > 0 {
owner, _, err := atls.ValidatePeerCertificates(ctx, cquery, certificates, []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth})
if err != nil {
return nil, err
}

ctx = ContextWithOwner(ctx, owner)
owner, _, err := atls.ValidatePeerCertificates(
ctx,
cquery,
mtls.State.PeerCertificates,
[]x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth})
if err != nil {
return nil, err
}

ctx = ContextWithOwner(ctx, owner)
}
}

82 changes: 81 additions & 1 deletion gateway/grpc/server_test.go
Original file line number Diff line number Diff line change
@@ -86,6 +86,86 @@ func TestRPCs(t *testing.T) {
},
},

// ServiceLogs
{
desc: "ServiceLogs none",
readClient: func(t *testing.T) *cmocks.ReadClient {
var m cmocks.ReadClient
m.EXPECT().LeaseLogs(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return([]*v1beta3.ServiceLog{}, nil)
return &m
},
run: func(ctx context.Context, t *testing.T, c client) {
_, err := c.l.ServiceLogs(ctx, &leasev1.ServiceLogsRequest{})
assert.ErrorContains(t, err, ErrNoRunningPods.Error())
},
},
{
desc: "ServiceLogs LeaseLogs err",
readClient: func(t *testing.T) *cmocks.ReadClient {
var m cmocks.ReadClient
m.EXPECT().LeaseLogs(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(nil, errors.New("boom"))
return &m
},
run: func(ctx context.Context, t *testing.T, c client) {
_, err := c.l.ServiceLogs(ctx, &leasev1.ServiceLogsRequest{})
assert.ErrorContains(t, err, "boom")
},
},
{
desc: "ServiceLogs",
readClient: func(t *testing.T) *cmocks.ReadClient {
var m cmocks.ReadClient

var (
stream1 = io.NopCloser(strings.NewReader("1_1\n1_2\n1_3"))
stream2 = io.NopCloser(strings.NewReader("2_1\n2_2\n2_3"))
stream3 = io.NopCloser(strings.NewReader("3_1\n3_2\n3_3"))
)

m.EXPECT().LeaseLogs(mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return([]*v1beta3.ServiceLog{
{
Name: "one",
Stream: stream1,
Scanner: bufio.NewScanner(stream1),
},
{
Name: "two",
Stream: stream2,
Scanner: bufio.NewScanner(stream2),
},
{
Name: "three",
Stream: stream3,
Scanner: bufio.NewScanner(stream3),
},
}, nil)
return &m
},
run: func(ctx context.Context, t *testing.T, c client) {
resp, err := c.l.ServiceLogs(ctx, &leasev1.ServiceLogsRequest{})
require.NoError(t, err)

expected := leasev1.ServiceLogsResponse{
Services: []*leasev1.ServiceLogs{
{Name: "one", Logs: []byte("1_1")},
{Name: "one", Logs: []byte("1_2")},
{Name: "one", Logs: []byte("1_3")},
{Name: "two", Logs: []byte("2_1")},
{Name: "two", Logs: []byte("2_2")},
{Name: "two", Logs: []byte("2_3")},
{Name: "three", Logs: []byte("3_1")},
{Name: "three", Logs: []byte("3_2")},
{Name: "three", Logs: []byte("3_3")},
},
}

assert.EqualValues(t, &expected, resp)
},
},

// ServiceStatus
{
desc: "ServiceStatus get manifest error",
@@ -597,7 +677,7 @@ func TestMTLS(t *testing.T) {
cert: func(*testing.T) tls.Certificate {
return tls.Certificate{}
},
errContains: "empty chain",
errContains: "too many peer certificates",
},
}

6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@ module github.com/akash-network/provider
go 1.21

require (
github.com/akash-network/akash-api v0.0.66
github.com/akash-network/node v0.34.0
github.com/akash-network/akash-api v0.0.67
github.com/akash-network/node v0.34.1
github.com/avast/retry-go/v4 v4.5.0
github.com/blang/semver/v4 v4.0.0
github.com/boz/go-lifecycle v0.1.1
@@ -53,6 +53,8 @@ replace (
// use cosmos fork of keyring
github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0

github.com/akash-network/akash-api => github.com/akash-network/akash-api v0.0.68-0.20240501222454-6db85d461499

github.com/cosmos/ledger-cosmos-go => github.com/akash-network/ledger-go/cosmos v0.14.4

// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -197,16 +197,16 @@ github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
github.com/akash-network/akash-api v0.0.66 h1:HGYbjLmnKj7hNIO2V7f6CiHJfZJzeOBCIV45gRo/AbY=
github.com/akash-network/akash-api v0.0.66/go.mod h1:PdOQGTCX3kLBoKHdbPF9pe5+vSLANaMJbgA04UE+OqY=
github.com/akash-network/akash-api v0.0.68-0.20240501222454-6db85d461499 h1:kDqzcaf5K0zblTG3FlrLcy6UdROUXEA0jzd0J3kUgg0=
github.com/akash-network/akash-api v0.0.68-0.20240501222454-6db85d461499/go.mod h1:hlloP8i0WLhFn8Gq5KkX8nwFjpsxr1QzV7OqmgFGG6U=
github.com/akash-network/cometbft v0.34.27-akash h1:V1dApDOr8Ee7BJzYyQ7Z9VBtrAul4+baMeA6C49dje0=
github.com/akash-network/cometbft v0.34.27-akash/go.mod h1:BcCbhKv7ieM0KEddnYXvQZR+pZykTKReJJYf7YC7qhw=
github.com/akash-network/ledger-go v0.14.3 h1:LCEFkTfgGA2xFMN2CtiKvXKE7dh0QSM77PJHCpSkaAo=
github.com/akash-network/ledger-go v0.14.3/go.mod h1:NfsjfFvno9Kaq6mfpsKz4sqjnAVVEsVsnBJfKB4ueAs=
github.com/akash-network/ledger-go/cosmos v0.14.4 h1:h3WiXmoKKs9wkj1LHcJ12cLjXXg6nG1fp+UQ5+wu/+o=
github.com/akash-network/ledger-go/cosmos v0.14.4/go.mod h1:SjAfheQTE4rWk0ir+wjbOWxwj8nc8E4AZ08NdsvYG24=
github.com/akash-network/node v0.34.0 h1:qBLEJlMDs7hSt1skomdPAtTXIXiAAmezYob8V+gG5Ks=
github.com/akash-network/node v0.34.0/go.mod h1:EnqNTPmvkKK0CHO1SqyF5ozAPJXpgmyFpBGak+KcPDY=
github.com/akash-network/node v0.34.1 h1:5ky3Q1dgXgGkcZA0y0AjEshi3fL7bk76OqCeh5ecMTs=
github.com/akash-network/node v0.34.1/go.mod h1:lPxn9dDCAXXflq9o1bqRH4DsLOiQaXIwCnU0l/nOLUs=
github.com/alecthomas/participle/v2 v2.0.0-alpha7 h1:cK4vjj0VSgb3lN1nuKA5F7dw+1s1pWBe5bx7nNCnN+c=
github.com/alecthomas/participle/v2 v2.0.0-alpha7/go.mod h1:NumScqsC42o9x+dGj8/YqsIfhrIQjFEOFovxotbBirA=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=