Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Sep 3, 2025. It is now read-only.
/coder-xrayPublic archive

Commit63b7385

Browse files
committed
update coder
1 parentaa379e0 commit63b7385

File tree

5 files changed

+32
-17
lines changed

5 files changed

+32
-17
lines changed

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20231205095743-61c9
77
replacegithub.com/gliderlabs/ssh =>github.com/coder/sshv0.0.0-20230621095435-9a7e23486f1c
88

99
require (
10-
cdr.dev/slogv1.6.2-0.20230929193652-f0c466fabe10
11-
github.com/coder/coder/v2v2.6.1-0.20240125021520-d9f5cdda9bae
10+
cdr.dev/slogv1.6.2-0.20240126064726-20367d4aede6
11+
github.com/coder/coder/v2v2.7.2-0.20240130231137-0c30dde9b581
1212
github.com/google/go-containerregistryv0.14.0
13-
github.com/google/uuidv1.5.0
13+
github.com/google/uuidv1.6.0
1414
github.com/jfrog/jfrog-client-gov1.31.6
1515
github.com/spf13/cobrav1.8.0
1616
github.com/stretchr/testifyv1.8.4
@@ -228,7 +228,7 @@ require (
228228
google.golang.org/appenginev1.6.8// indirect
229229
google.golang.org/genproto/googleapis/apiv0.0.0-20231106174013-bbf56f31fb17// indirect
230230
google.golang.org/genproto/googleapis/rpcv0.0.0-20231120223509-83a465c0220f// indirect
231-
google.golang.org/grpcv1.60.1// indirect
231+
google.golang.org/grpcv1.61.0// indirect
232232
google.golang.org/protobufv1.32.0// indirect
233233
gopkg.in/DataDog/dd-trace-go.v1v1.57.0// indirect
234234
gopkg.in/inf.v0v0.9.1// indirect

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cdr.dev/slogv1.6.2-0.20230929193652-f0c466fabe10 h1:gnB1By6Hzs2PVQXyi/cvo6L3kHPb8utLuzycWHfCztQ=
2-
cdr.dev/slogv1.6.2-0.20230929193652-f0c466fabe10/go.mod h1:NaoTA7KwopCrnaSb0JXTC0PTp/O/Y83Lndnq0OEV3ZQ=
1+
cdr.dev/slogv1.6.2-0.20240126064726-20367d4aede6 h1:KHblWIE/KHOwQ6lEbMZt6YpcGve2FEZ1sDtrW1Am5UI=
2+
cdr.dev/slogv1.6.2-0.20240126064726-20367d4aede6/go.mod h1:NaoTA7KwopCrnaSb0JXTC0PTp/O/Y83Lndnq0OEV3ZQ=
33
cloud.google.com/gov0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME=
44
cloud.google.com/go/computev1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
55
cloud.google.com/go/computev1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
@@ -146,8 +146,8 @@ github.com/cilium/ebpf v0.11.0/go.mod h1:WE7CZAnqOL2RouJ4f1uyNhqr2P4CCvXFIqdRDUg
146146
github.com/cloudflare/circlv1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA=
147147
github.com/cloudflare/circlv1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
148148
github.com/cloudflare/circlv1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
149-
github.com/coder/coder/v2v2.6.1-0.20240125021520-d9f5cdda9bae h1:k3mhC2/RtoVon6NCljR9wY6u322Zib1CnNZ9GMyQZCk=
150-
github.com/coder/coder/v2v2.6.1-0.20240125021520-d9f5cdda9bae/go.mod h1:jSDTCnwDgcqPUcP17SJsDs/HW18pfQj4WEE3AAE+8o4=
149+
github.com/coder/coder/v2v2.7.2-0.20240130231137-0c30dde9b581 h1:8zP8bB1umZoayKi0QLO/qfQYLAxQg7hsRKiXr9i+2K4=
150+
github.com/coder/coder/v2v2.7.2-0.20240130231137-0c30dde9b581/go.mod h1:NsZFMXaCH50KLgzBPaSH3REb00wnL4C5NgkdbwKd/XA=
151151
github.com/coder/retryv1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc=
152152
github.com/coder/retryv1.5.1/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY=
153153
github.com/coder/sshv0.0.0-20230621095435-9a7e23486f1c h1:TI7TzdFI0UvQmwgyQhtI1HeyYNRxAQpr8Tw/rjT8VSA=
@@ -346,8 +346,8 @@ github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
346346
github.com/google/s2a-gov0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
347347
github.com/google/shlexv0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
348348
github.com/google/shlexv0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
349-
github.com/google/uuidv1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
350-
github.com/google/uuidv1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
349+
github.com/google/uuidv1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
350+
github.com/google/uuidv1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
351351
github.com/googleapis/enterprise-certificate-proxyv0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
352352
github.com/googleapis/enterprise-certificate-proxyv0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
353353
github.com/gookit/colorv1.5.4 h1:FZmqs7XOyGgCAxmWyPslpiok1k05wmY3SJTytgvYFs0=
@@ -388,8 +388,8 @@ github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI
388388
github.com/hashicorp/logutilsv1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
389389
github.com/hashicorp/terraform-execv0.17.2 h1:EU7i3Fh7vDUI9nNRdMATCEfnm9axzTnad8zszYZ73Go=
390390
github.com/hashicorp/terraform-execv0.17.2/go.mod h1:tuIbsL2l4MlwwIZx9HPM+LOV9vVyEfBYu2GsO1uH3/8=
391-
github.com/hashicorp/terraform-jsonv0.20.0 h1:cJcvn4gIOTi0SD7pIy+xiofV1zFA3hza+6K+fo52IX8=
392-
github.com/hashicorp/terraform-jsonv0.20.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk=
391+
github.com/hashicorp/terraform-jsonv0.21.0 h1:9NQxbLNqPbEMze+S6+YluEdXgJmhQykRyRNd+zTI05U=
392+
github.com/hashicorp/terraform-jsonv0.21.0/go.mod h1:qdeBs11ovMzo5puhrRibdD6d2Dq6TyE/28JiU4tIQxk=
393393
github.com/hashicorp/terraform-plugin-gov0.12.0 h1:6wW9mT1dSs0Xq4LR6HXj1heQ5ovr5GxXNJwkErZzpJw=
394394
github.com/hashicorp/terraform-plugin-gov0.12.0/go.mod h1:kwhmaWHNDvT1B3QiSJdAtrB/D4RaKSY/v3r2BuoWK4M=
395395
github.com/hashicorp/terraform-plugin-logv0.7.0 h1:SDxJUyT8TwN4l5b5/VkiTIaQgY6R+Y2BQ0sRZftGKQs=
@@ -568,8 +568,8 @@ github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4a
568568
github.com/ory/dockertest/v3v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
569569
github.com/outcaste-io/ristrettov0.2.3 h1:AK4zt/fJ76kjlYObOeNwh4T3asEuaCmp26pOvUOL9w0=
570570
github.com/outcaste-io/ristrettov0.2.3/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac=
571-
github.com/pelletier/go-toml/v2v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
572-
github.com/pelletier/go-toml/v2v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
571+
github.com/pelletier/go-toml/v2v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
572+
github.com/pelletier/go-toml/v2v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
573573
github.com/philhofer/fwdv1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
574574
github.com/philhofer/fwdv1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0=
575575
github.com/pierrec/lz4/v4v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
@@ -929,8 +929,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:
929929
google.golang.org/genproto/googleapis/apiv0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
930930
google.golang.org/genproto/googleapis/rpcv0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
931931
google.golang.org/genproto/googleapis/rpcv0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
932-
google.golang.org/grpcv1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
933-
google.golang.org/grpcv1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
932+
google.golang.org/grpcv1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0=
933+
google.golang.org/grpcv1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
934934
google.golang.org/protobufv1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
935935
google.golang.org/protobufv1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
936936
google.golang.org/protobufv1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

‎reporter/coder.go‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import (
44
"context"
55
"net/url"
66

7+
"golang.org/x/xerrors"
8+
9+
"github.com/coder/coder/v2/agent/proto"
710
"github.com/coder/coder/v2/codersdk"
811
"github.com/coder/coder/v2/codersdk/agentsdk"
912
)
@@ -28,7 +31,16 @@ type client struct {
2831
func (c*client)AgentManifest(ctx context.Context,tokenstring) (agentsdk.Manifest,error) {
2932
agent:=agentsdk.New(c.coder.URL)
3033
agent.SetSessionToken(token)
31-
returnagent.Manifest(ctx)
34+
client,err:=agent.RPC(ctx)
35+
iferr!=nil {
36+
return agentsdk.Manifest{},xerrors.Errorf("rpc: %w",err)
37+
}
38+
39+
pm,err:=client.GetManifest(ctx,&proto.GetManifestRequest{})
40+
iferr!=nil {
41+
return agentsdk.Manifest{},xerrors.Errorf("get manifest: %w",err)
42+
}
43+
returnagentsdk.ManifestFromProto(pm)
3244
}
3345

3446
func (c*client)PostJFrogXrayScan(ctx context.Context,req codersdk.JFrogXrayScan)error {

‎reporter/reporter.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ func (k *K8sReporter) Init(ctx context.Context) error {
103103
AgentID:manifest.AgentID,
104104
Critical:scan.SecurityIssues.Critical,
105105
High:scan.SecurityIssues.High,
106+
Medium:scan.SecurityIssues.Medium,
106107
}
107108
err=k.CoderClient.PostJFrogXrayScan(ctx,req)
108109
iferr!=nil {

‎reporter/reporter_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ func TestK8SReporter(t *testing.T) {
7070
AgentID:expectedAgentID,
7171
Critical:expectedCrit,
7272
High:expectedHigh,
73+
Medium:expectedMedium,
7374
})
7475

7576
rep:= reporter.K8sReporter{
@@ -115,6 +116,7 @@ func TestK8SReporter(t *testing.T) {
115116
AgentID:expectedAgentID,
116117
Critical:expectedCrit,
117118
High:expectedHigh,
119+
Medium:expectedMedium,
118120
}
119121
varactualResult codersdk.JFrogXrayScan
120122
select {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp