You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
3.6 KiB
63 lines
3.6 KiB
2 months ago
|
From 076177ff583b8e6d92948e0a4ddde0e8992d09a3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andreas Gerstmayr <agerstmayr@redhat.com>
|
||
|
|
Date: Wed, 22 Jun 2022 17:18:56 +0200
|
||
|
|
Subject: [PATCH] remove unused backend dependencies
|
||
|
|
|
||
|
|
saml and gofpdf are not used in the OSS edition of Grafana
|
||
|
|
after editing `pkg/extensions/main.go`, run `go mod tidy`
|
||
|
|
|
||
|
|
diff --git a/go.mod b/go.mod
|
||
|
|
index fcbc09da5e..82fdf39842 100644
|
||
|
|
--- a/go.mod
|
||
|
|
+++ b/go.mod
|
||
|
|
@@ -45,7 +45,6 @@ require (
|
||
|
|
github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-release-guild
|
||
|
|
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // @grafana/backend-platform
|
||
|
|
github.com/centrifugal/centrifuge v0.30.2 // @grafana/grafana-app-platform-squad
|
||
|
|
- github.com/crewjam/saml v0.4.13 // @grafana/grafana-authnz-team
|
||
|
|
github.com/fatih/color v1.15.0 // @grafana/backend-platform
|
||
|
|
github.com/gchaincl/sqlhooks v1.3.0 // @grafana/backend-platform
|
||
|
|
github.com/go-ldap/ldap/v3 v3.4.4 // @grafana/grafana-authnz-team
|
||
|
|
@@ -187,7 +186,6 @@ require (
|
||
|
|
github.com/josharian/intern v1.0.0 // indirect
|
||
|
|
github.com/jpillora/backoff v1.0.0 // indirect
|
||
|
|
github.com/mailru/easyjson v0.7.7 // indirect
|
||
|
|
- github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect
|
||
|
|
github.com/mattetti/filebuffer v1.0.1 // indirect
|
||
|
|
github.com/mattn/go-runewidth v0.0.13 // indirect
|
||
|
|
github.com/miekg/dns v1.1.51 // indirect
|
||
|
|
diff --git a/go.sum b/go.sum
|
||
|
|
index d05dfb55fd..b160387abe 100644
|
||
|
|
--- a/go.sum
|
||
|
|
+++ b/go.sum
|
||
|
|
@@ -1826,8 +1826,6 @@ github.com/grafana/pyroscope/api v0.3.0/go.mod h1:JggA80ToAAUACYGfwL49XoFk5aN5ec
|
||
|
|
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
|
||
|
|
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db h1:7aN5cccjIqCLTzedH7MZzRZt5/lsAHch6Z3L2ZGn5FA=
|
||
|
|
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
|
||
|
|
-github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c h1:1pHLC1ZTz7N5QI3jzCs5sqmVvAKe+JwGnpp9lQ+iUjY=
|
||
|
|
-github.com/grafana/saml v0.4.15-0.20231025143828-a6c0e9b86a4c/go.mod h1:S4+611dxnKt8z/ulbvaJzcgSHsuhjVc1QHNTcr1R7Fw=
|
||
|
|
github.com/grafana/sqlds/v2 v2.3.10 h1:HWKhE0vR6LoEiE+Is8CSZOgaB//D1yqb2ntkass9Fd4=
|
||
|
|
github.com/grafana/sqlds/v2 v2.3.10/go.mod h1:c6ibxnxRVGxV/0YkEgvy7QpQH/lyifFyV7K/14xvdIs=
|
||
|
|
github.com/grafana/tempo v1.5.1-0.20230524121406-1dc1bfe7085b h1:mDlkqgTEJuK7vjPG44f3ZMtId5AAYLWHvBVbiGqIOOQ=
|
||
|
|
@@ -2222,8 +2220,6 @@ github.com/markbates/sigtx v1.0.0/go.mod h1:QF1Hv6Ic6Ca6W+T+DL0Y/ypborFKyvUY9Hmu
|
||
|
|
github.com/markbates/willie v1.0.9/go.mod h1:fsrFVWl91+gXpx/6dv715j7i11fYPfZ9ZGfH0DQzY7w=
|
||
|
|
github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
|
||
|
|
github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
|
||
|
|
-github.com/mattermost/xml-roundtrip-validator v0.1.0 h1:RXbVD2UAl7A7nOTR4u7E3ILa4IbtvKBHw64LDsmu9hU=
|
||
|
|
-github.com/mattermost/xml-roundtrip-validator v0.1.0/go.mod h1:qccnGMcpgwcNaBnxqpJpWWUiPNr5H3O8eDgGV9gT5To=
|
||
|
|
github.com/mattetti/filebuffer v1.0.1 h1:gG7pyfnSIZCxdoKq+cPa8T0hhYtD9NxCdI4D7PTjRLM=
|
||
|
|
github.com/mattetti/filebuffer v1.0.1/go.mod h1:YdMURNDOttIiruleeVr6f56OrMc+MydEnTcXwtkxNVs=
|
||
|
|
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
|
||
|
|
diff --git a/pkg/extensions/main.go b/pkg/extensions/main.go
|
||
|
|
index 327e208221..426aad2a21 100644
|
||
|
|
--- a/pkg/extensions/main.go
|
||
|
|
+++ b/pkg/extensions/main.go
|
||
|
|
@@ -11,7 +11,6 @@ import (
|
||
|
|
_ "github.com/beevik/etree"
|
||
|
|
_ "github.com/blugelabs/bluge"
|
||
|
|
_ "github.com/blugelabs/bluge_segment_api"
|
||
|
|
- _ "github.com/crewjam/saml"
|
||
|
|
_ "github.com/go-jose/go-jose/v3"
|
||
|
|
_ "github.com/gobwas/glob"
|
||
|
|
_ "github.com/googleapis/gax-go/v2"
|