Skip to content

Commit f9747ce

Browse files
tommytroenybelMekk
andcommitted
feat(wip): add tables for vulnz and cwes
* initial code for updating tables, needs a lot of refactoring * add table tests for register workload (which now will fail after adding vulnz update) Co-authored-by: ybelmekk <[email protected]>
1 parent 16f1ebd commit f9747ce

File tree

14 files changed

+786
-54
lines changed

14 files changed

+786
-54
lines changed

cmd/api/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func main() {
5454
}
5555

5656
vulnerabilities.RegisterVulnerabilitiesServer(grpcServer, &grpcvulnerabilities.Server{Db: db})
57-
management.RegisterManagementServer(grpcServer, &grpcmgmt.Server{db: db, client: dpClient})
57+
management.RegisterManagementServer(grpcServer, grpcmgmt.NewServer(db, dpClient))
5858

5959
stop := make(chan os.Signal, 1)
6060
signal.Notify(stop, os.Interrupt, syscall.SIGTERM)

cmd/client/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ func workloadManagement(c vulnerabilities.Client) {
6868
_, err := c.RegisterWorkload(
6969
ctx,
7070
&management.RegisterWorkloadRequest{
71-
Cluster: "dev-fss",
71+
Cluster: "management",
7272
Namespace: "nais-system",
73-
Workload: "aivenator",
73+
Workload: "console-frontend",
7474
WorkloadType: "app",
75-
ImageName: "europe-north1-docker.pkg.dev/nais-io/nais/images/aivenator",
76-
ImageTag: "2025-01-22-124805-9221180",
75+
ImageName: "europe-north1-docker.pkg.dev/nais-io/nais/images/console-frontend",
76+
ImageTag: "2025-01-24-150550-a8e0b9e",
7777
Metadata: &management.Metadata{
7878
Labels: map[string]string{
7979
"workflow": "deploy",

go.mod

+35
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,44 @@ require (
1111
github.com/sirupsen/logrus v1.9.3
1212
github.com/sqlc-dev/sqlc v1.28.0
1313
github.com/stretchr/testify v1.10.0
14+
github.com/testcontainers/testcontainers-go/modules/postgres v0.35.0
1415
github.com/vektra/mockery/v2 v2.51.1
1516
google.golang.org/grpc v1.70.0
1617
google.golang.org/protobuf v1.36.3
1718
)
1819

1920
require (
2021
cel.dev/expr v0.19.0 // indirect
22+
dario.cat/mergo v1.0.0 // indirect
2123
filippo.io/edwards25519 v1.1.0 // indirect
24+
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
25+
github.com/Microsoft/go-winio v0.6.2 // indirect
2226
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
27+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
2328
github.com/chigopher/pathlib v0.19.1 // indirect
29+
github.com/containerd/containerd v1.7.18 // indirect
30+
github.com/containerd/log v0.1.0 // indirect
31+
github.com/containerd/platforms v0.2.1 // indirect
32+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
2433
github.com/cubicdaiya/gonp v1.0.4 // indirect
2534
github.com/davecgh/go-spew v1.1.1 // indirect
35+
github.com/distribution/reference v0.6.0 // indirect
36+
github.com/docker/docker v27.1.1+incompatible // indirect
37+
github.com/docker/go-connections v0.5.0 // indirect
38+
github.com/docker/go-units v0.5.0 // indirect
2639
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
2740
github.com/dustin/go-humanize v1.0.1 // indirect
2841
github.com/fatih/structtag v1.2.0 // indirect
42+
github.com/felixge/httpsnoop v1.0.4 // indirect
2943
github.com/fsnotify/fsnotify v1.6.0 // indirect
3044
github.com/getkin/kin-openapi v0.127.0 // indirect
3145
github.com/go-logr/logr v1.4.2 // indirect
3246
github.com/go-logr/stdr v1.2.2 // indirect
47+
github.com/go-ole/go-ole v1.2.6 // indirect
3348
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3449
github.com/go-openapi/swag v0.23.0 // indirect
3550
github.com/go-sql-driver/mysql v1.8.1 // indirect
51+
github.com/gogo/protobuf v1.3.2 // indirect
3652
github.com/google/cel-go v0.22.1 // indirect
3753
github.com/google/uuid v1.6.0 // indirect
3854
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -46,27 +62,41 @@ require (
4662
github.com/jinzhu/copier v0.3.5 // indirect
4763
github.com/jinzhu/inflection v1.0.0 // indirect
4864
github.com/josharian/intern v1.0.0 // indirect
65+
github.com/klauspost/compress v1.17.7 // indirect
66+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
4967
github.com/magiconair/properties v1.8.7 // indirect
5068
github.com/mailru/easyjson v0.7.7 // indirect
5169
github.com/mattn/go-colorable v0.1.13 // indirect
5270
github.com/mattn/go-isatty v0.0.20 // indirect
5371
github.com/mfridman/interpolate v0.0.2 // indirect
5472
github.com/mitchellh/go-homedir v1.1.0 // indirect
5573
github.com/mitchellh/mapstructure v1.5.0 // indirect
74+
github.com/moby/docker-image-spec v1.3.1 // indirect
75+
github.com/moby/patternmatcher v0.6.0 // indirect
76+
github.com/moby/sys/sequential v0.5.0 // indirect
77+
github.com/moby/sys/user v0.1.0 // indirect
78+
github.com/moby/term v0.5.0 // indirect
5679
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
80+
github.com/morikuni/aec v1.0.0 // indirect
5781
github.com/ncruces/go-strftime v0.1.9 // indirect
82+
github.com/opencontainers/go-digest v1.0.0 // indirect
83+
github.com/opencontainers/image-spec v1.1.0 // indirect
5884
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
5985
github.com/perimeterx/marshmallow v1.1.5 // indirect
6086
github.com/pganalyze/pg_query_go/v5 v5.1.0 // indirect
6187
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect
6288
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
6389
github.com/pingcap/log v1.1.0 // indirect
6490
github.com/pingcap/tidb/pkg/parser v0.0.0-20241203170126-9812d85d0d25 // indirect
91+
github.com/pkg/errors v0.9.1 // indirect
6592
github.com/pmezard/go-difflib v1.0.0 // indirect
93+
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
6694
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
6795
github.com/riza-io/grpc-go v0.2.0 // indirect
6896
github.com/rs/zerolog v1.29.0 // indirect
6997
github.com/sethvargo/go-retry v0.3.0 // indirect
98+
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
99+
github.com/shoenig/go-m1cpu v0.1.6 // indirect
70100
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
71101
github.com/spf13/afero v1.9.3 // indirect
72102
github.com/spf13/cast v1.5.0 // indirect
@@ -77,11 +107,16 @@ require (
77107
github.com/stoewer/go-strcase v1.2.0 // indirect
78108
github.com/stretchr/objx v0.5.2 // indirect
79109
github.com/subosito/gotenv v1.4.2 // indirect
110+
github.com/testcontainers/testcontainers-go v0.35.0 // indirect
80111
github.com/tetratelabs/wazero v1.8.2 // indirect
112+
github.com/tklauser/go-sysconf v0.3.12 // indirect
113+
github.com/tklauser/numcpus v0.6.1 // indirect
81114
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
82115
github.com/wasilibs/go-pgquery v0.0.0-20240606042535-c0843d6592cc // indirect
83116
github.com/wasilibs/wazero-helpers v0.0.0-20240604052452-61d7981e9a38 // indirect
117+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
84118
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
119+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
85120
go.opentelemetry.io/otel v1.34.0 // indirect
86121
go.opentelemetry.io/otel/metric v1.34.0 // indirect
87122
go.opentelemetry.io/otel/trace v1.34.0 // indirect

0 commit comments

Comments
 (0)