Skip to content

Commit 473898e

Browse files
spinillosspinillos
authored
Core: Remove thema and kindsys dependencies (#84499)
* Move some thema code inside grafana * Use new codegen instead of thema for core kinds * Replace TS generator * Use new generator for go types * Remove thema from oapi generator * Remove thema from generators * Don't use kindsys/thema for core kinds * Remove kindsys/thema from plugins * Remove last thema related * Remove most of cuectx and move utils_ts into codegen. It also deletes wire dependency * Merge plugins generators * Delete thema dependency 🎉 * Fix CODEOWNERS * Fix package name * Fix TS output names * More path fixes * Fix mod codeowners * Use original plugin's name * Remove kindsys dependency 🎉 * Modify oapi schema and create an apply function to fix elasticsearch errors * cue.mod was deleted by mistake * Fix TS panels * sort imports * Fixing elasticsearch output * Downgrade oapi-codegen library * Update output ts files * More fixes * Restore old elasticsearch generated file and skip its generation. Remove core imports into plugins * More lint fixes * Add codeowners * restore embed.go file * Fix embed.go
1 parent 856e410 commit 473898e

Some content is hidden

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

56 files changed

+1433
-1631
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,10 @@ playwright.config.ts @grafana/plugins-platform-frontend
624624
# Kind system and code generation
625625
embed.go @grafana/grafana-as-code
626626
/pkg/kinds/ @grafana/grafana-as-code
627-
/pkg/cuectx/ @grafana/grafana-as-code
628627
/pkg/registry/ @grafana/grafana-as-code
629628
/pkg/registry/apis/ @grafana/grafana-app-platform-squad
630629
/pkg/codegen/ @grafana/grafana-as-code
630+
/pkg/codegen/generators @grafana/grafana-as-code
631631
/pkg/kinds/*/*_gen.go @grafana/grafana-as-code
632632
/pkg/registry/schemas/ @grafana/grafana-as-code
633633
/public/app/plugins/*gen.go @grafana/grafana-as-code

‎embed.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import (
66

77
// CueSchemaFS embeds all schema-related CUE files in the Grafana project.
88
//
9-
//go:embed cue.mod/module.cue kinds/*.cue kinds/*/*.cue packages/grafana-schema/src/common/*.cue public/app/plugins/*/*/*.cue public/app/plugins/*/*/plugin.json
9+
//go:embed cue.mod/module.cue
1010
var CueSchemaFS embed.FS

‎go.mod

+25-23
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ replace cuelang.org/go => github.com/grafana/cue v0.0.0-20230926092038-971951014
1515
// import that instead of v0.X even though v0.X is newer.
1616
replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.49.0
1717

18-
// The v0.120.0 is needed for now to be compatible with grafana/thema.
19-
replace github.com/getkin/kin-openapi => github.com/getkin/kin-openapi v0.120.0
20-
2118
require (
2219
cloud.google.com/go/storage v1.36.0 // @grafana/backend-platform
2320
cuelang.org/go v0.6.0-0.dev // @grafana/grafana-as-code
@@ -90,7 +87,6 @@ require (
9087
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
9188
github.com/urfave/cli/v2 v2.25.0 // @grafana/backend-platform
9289
github.com/vectordotdev/go-datemath v0.1.1-0.20220323213446-f3954d0b18ae // @grafana/backend-platform
93-
github.com/yalue/merged_fs v1.2.2 // @grafana/grafana-as-code
9490
github.com/yudai/gojsondiff v1.0.0 // @grafana/backend-platform
9591
go.opentelemetry.io/collector/pdata v1.0.1 // @grafana/backend-platform
9692
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0 // @grafana/grafana-operator-experience-squad
@@ -103,7 +99,7 @@ require (
10399
golang.org/x/oauth2 v0.16.0 // @grafana/grafana-authnz-team
104100
golang.org/x/sync v0.6.0 // @grafana/alerting-squad-backend
105101
golang.org/x/time v0.5.0 // @grafana/backend-platform
106-
golang.org/x/tools v0.17.0 // indirect; @grafana/grafana-as-code
102+
golang.org/x/tools v0.17.0 // @grafana/grafana-as-code
107103
gonum.org/v1/gonum v0.12.0 // @grafana/observability-metrics
108104
google.golang.org/api v0.155.0 // @grafana/backend-platform
109105
google.golang.org/grpc v1.62.1 // @grafana/plugins-platform-backend
@@ -113,7 +109,7 @@ require (
113109
gopkg.in/mail.v2 v2.3.1 // @grafana/backend-platform
114110
gopkg.in/yaml.v2 v2.4.0 // indirect
115111
gopkg.in/yaml.v3 v3.0.1 // @grafana/alerting-squad-backend
116-
xorm.io/builder v0.3.6 // @grafana/backend-platform
112+
xorm.io/builder v0.3.6 // indirect; @grafana/backend-platform
117113
xorm.io/core v0.7.3 // @grafana/backend-platform
118114
xorm.io/xorm v0.8.2 // @grafana/alerting-squad-backend
119115
)
@@ -135,7 +131,7 @@ require (
135131
github.com/cespare/xxhash/v2 v2.2.0 // indirect
136132
github.com/cheekybits/genny v1.0.0 // indirect
137133
github.com/cockroachdb/apd/v2 v2.0.2 // indirect
138-
github.com/deepmap/oapi-codegen v1.12.4 // indirect
134+
github.com/deepmap/oapi-codegen v1.13.0 // @grafana/grafana-as-code
139135
github.com/dennwc/varint v1.0.0 // indirect
140136
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
141137
github.com/docker/go-units v0.5.0 // indirect
@@ -160,12 +156,12 @@ require (
160156
github.com/google/btree v1.1.2 // indirect
161157
github.com/google/flatbuffers v23.5.26+incompatible // indirect
162158
github.com/googleapis/gax-go/v2 v2.12.0 // @grafana/backend-platform
163-
github.com/gorilla/mux v1.8.0 // @grafana/backend-platform
159+
github.com/gorilla/mux v1.8.1 // @grafana/backend-platform
164160
github.com/grafana/grafana-google-sdk-go v0.1.0 // @grafana/partner-datasources
165161
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340 // indirect
166162
github.com/hashicorp/errwrap v1.1.0 // indirect
167163
github.com/hashicorp/go-msgpack v0.5.5 // indirect
168-
github.com/hashicorp/go-multierror v1.1.1 // @grafana/alerting-squad
164+
github.com/hashicorp/go-multierror v1.1.1 // indirect; @grafana/alerting-squad
169165
github.com/hashicorp/go-sockaddr v1.0.6 // indirect
170166
github.com/hashicorp/golang-lru v0.6.0 // indirect
171167
github.com/hashicorp/yamux v0.1.1 // indirect
@@ -177,7 +173,7 @@ require (
177173
github.com/mailru/easyjson v0.7.7 // indirect
178174
github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect
179175
github.com/mattetti/filebuffer v1.0.1 // indirect
180-
github.com/mattn/go-runewidth v0.0.13 // indirect
176+
github.com/mattn/go-runewidth v0.0.15 // indirect
181177
github.com/miekg/dns v1.1.57 // indirect
182178
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
183179
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -224,7 +220,6 @@ require (
224220
github.com/bufbuild/connect-go v1.10.0 // @grafana/observability-traces-and-profiling
225221
github.com/dlmiddlecote/sqlstats v1.0.2 // @grafana/backend-platform
226222
github.com/drone/drone-cli v1.6.1 // @grafana/grafana-release-guild
227-
github.com/getkin/kin-openapi v0.120.0 // @grafana/grafana-operator-experience-squad
228223
github.com/golang-migrate/migrate/v4 v4.7.0 // @grafana/backend-platform
229224
github.com/google/go-github v17.0.0+incompatible // @grafana/grafana-release-guild
230225
github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-release-guild
@@ -250,11 +245,9 @@ require (
250245
github.com/go-jose/go-jose/v3 v3.0.3 // @grafana/grafana-authnz-team
251246
github.com/grafana/dataplane/examples v0.0.1 // @grafana/observability-metrics
252247
github.com/grafana/dataplane/sdata v0.0.7 // @grafana/observability-metrics
253-
github.com/grafana/kindsys v0.0.0-20230508162304-452481b63482 // @grafana/grafana-as-code
254248
github.com/grafana/tempo v1.5.1-0.20230524121406-1dc1bfe7085b // @grafana/observability-traces-and-profiling
255-
github.com/grafana/thema v0.0.0-20230712153715-375c1b45f3ed // @grafana/grafana-as-code
256249
github.com/microsoft/go-mssqldb v1.6.1-0.20240214161942-b65008136246 // @grafana/grafana-bi-squad
257-
github.com/redis/go-redis/v9 v9.0.2 // @grafana/alerting-squad-backend
250+
github.com/redis/go-redis/v9 v9.1.0 // @grafana/alerting-squad-backend
258251
go.opentelemetry.io/contrib/samplers/jaegerremote v0.18.0 // @grafana/backend-platform
259252
golang.org/x/mod v0.14.0 // @grafana/backend-platform
260253
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // @grafana/partner-datasources
@@ -298,9 +291,6 @@ require (
298291
github.com/bwmarrin/snowflake v0.3.0 // @grafan/grafana-app-platform-squad
299292
github.com/centrifugal/protocol v0.10.0 // indirect
300293
github.com/cloudflare/circl v1.3.7 // indirect
301-
github.com/cockroachdb/errors v1.9.1 // indirect
302-
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
303-
github.com/cockroachdb/redact v1.1.3 // indirect
304294
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
305295
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
306296
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -315,7 +305,6 @@ require (
315305
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
316306
github.com/felixge/httpsnoop v1.0.4 // indirect
317307
github.com/fsnotify/fsnotify v1.7.0 // indirect
318-
github.com/getsentry/sentry-go v0.12.0 // indirect
319308
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
320309
github.com/goccy/go-json v0.10.2 // indirect
321310
github.com/gogo/googleapis v1.4.1 // indirect
@@ -328,13 +317,12 @@ require (
328317
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
329318
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db // indirect
330319
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
331-
github.com/hashicorp/golang-lru/v2 v2.0.7 // @grafana/alerting-squad-backend
320+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect; @grafana/alerting-squad-backend
332321
github.com/hashicorp/memberlist v0.5.0 // indirect
333322
github.com/inconshreveable/mousetrap v1.1.0 // indirect
334323
github.com/invopop/yaml v0.2.0 // indirect
335324
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
336325
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
337-
github.com/kr/pretty v0.3.1 // indirect
338326
github.com/kr/text v0.2.0 // indirect
339327
github.com/mattn/go-colorable v0.1.13 // indirect
340328
github.com/mattn/go-ieproxy v0.0.3 // indirect
@@ -350,7 +338,6 @@ require (
350338
github.com/redis/rueidis v1.0.16 // indirect
351339
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
352340
github.com/rivo/uniseg v0.3.4 // indirect
353-
github.com/rogpeppe/go-internal v1.11.0 // indirect
354341
github.com/russross/blackfriday/v2 v2.1.0 // indirect
355342
github.com/segmentio/asm v1.2.0 // indirect
356343
github.com/shopspring/decimal v1.2.0 // indirect
@@ -427,7 +414,7 @@ require (
427414
github.com/imdario/mergo v0.3.16 // indirect
428415
github.com/klauspost/compress v1.17.4 // indirect
429416
github.com/kylelemons/godebug v1.1.0 // indirect
430-
github.com/labstack/echo/v4 v4.10.2 // indirect
417+
github.com/labstack/echo/v4 v4.11.1 // indirect
431418
github.com/labstack/gommon v0.4.0 // indirect
432419
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
433420
github.com/mschoch/smat v0.2.0 // indirect
@@ -440,7 +427,6 @@ require (
440427

441428
require (
442429
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
443-
github.com/go-errors/errors v1.4.2 // indirect
444430
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
445431
github.com/google/gnostic-models v0.6.8 // indirect
446432
github.com/grafana/grafana-openapi-client-go v0.0.0-20231213163343-bd475d63fb79 // @grafana/backend-platform
@@ -486,9 +472,19 @@ require (
486472

487473
require github.com/jackc/pgx/v5 v5.5.5 // @grafana/oss-big-tent
488474

475+
require github.com/getkin/kin-openapi v0.120.0 // @grafana/grafana-as-code
476+
489477
require (
490478
github.com/bahlo/generic-list-go v0.2.0 // indirect
491479
github.com/buger/jsonparser v1.1.1 // indirect
480+
github.com/bytedance/sonic v1.9.1 // indirect
481+
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
482+
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
483+
github.com/gin-contrib/sse v0.1.0 // indirect
484+
github.com/gin-gonic/gin v1.9.1 // indirect
485+
github.com/go-playground/locales v0.14.1 // indirect
486+
github.com/go-playground/universal-translator v0.18.1 // indirect
487+
github.com/go-playground/validator/v10 v10.14.0 // indirect
492488
github.com/hashicorp/go-uuid v1.0.3 // indirect
493489
github.com/invopop/jsonschema v0.12.0 // indirect
494490
github.com/jackc/pgpassfile v1.0.0 // indirect
@@ -500,7 +496,13 @@ require (
500496
github.com/jcmturner/goidentity/v6 v6.0.1 // indirect
501497
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
502498
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
499+
github.com/leodido/go-urn v1.2.4 // indirect
500+
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
501+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
502+
github.com/ugorji/go/codec v1.2.11 // indirect
503503
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
504+
github.com/yudai/pp v2.0.1+incompatible // indirect
505+
golang.org/x/arch v0.3.0 // indirect
504506
)
505507

506508
// Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream

0 commit comments

Comments
 (0)