public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(deps): Switch to maintained gopkg.in/yaml fork (#114131)

Browse Source 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Dave Henderson
2025-11-19 15:20:32 -05:00
committed by GitHub
parent 84d6f54daa
commit 7264803016
41 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/response/response.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"reflect"
jsoniter "github.com/json-iterator/go"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
"github.com/grafana/grafana/pkg/infra/tracing"
pkg/apimachinery/apis/common/v0alpha1/secure_values.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"strconv"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
openapi "k8s.io/kube-openapi/pkg/common"
spec "k8s.io/kube-openapi/pkg/validation/spec"
ptr "k8s.io/utils/ptr"
pkg/apimachinery/apis/common/v0alpha1/secure_values_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"k8s.io/kube-openapi/pkg/validation/strfmt"
"k8s.io/kube-openapi/pkg/validation/validate"
pkg/apimachinery/go.mod
+3 -4
View File
@@ -3,18 +3,17 @@ module github.com/grafana/grafana/pkg/apimachinery
go 1.25.3
require (
github.com/go-jose/go-jose/v4 v4.1.2
github.com/grafana/authlib v0.0.0-20250930082137-a40e2c2b094f // @grafana/identity-access-team
github.com/grafana/authlib/types v0.0.0-20250926065801-df98203cff37 // @grafana/identity-access-team
github.com/stretchr/testify v1.11.1
gopkg.in/yaml.v3 v3.0.1
go.yaml.in/yaml/v3 v3.0.4
k8s.io/apimachinery v0.34.2
k8s.io/apiserver v0.34.2
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
)
require github.com/go-jose/go-jose/v4 v4.1.2
require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
@@ -44,7 +43,6 @@ require (
go.opentelemetry.io/otel/metric v1.38.0 // indirect
go.opentelemetry.io/otel/trace v1.38.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.44.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/sync v0.18.0 // indirect
@@ -54,6 +52,7 @@ require (
google.golang.org/grpc v1.76.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
pkg/registry/apis/provisioning/resources/parser.go
+2 -1
View File
@@ -8,7 +8,7 @@ import (
"path"
"go.opentelemetry.io/otel/attribute"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -16,6 +16,7 @@ import (
"k8s.io/client-go/dynamic"
"github.com/grafana/grafana-app-sdk/logging"
dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v0alpha1"
provisioning "github.com/grafana/grafana/apps/provisioning/pkg/apis/provisioning/v0alpha1"
"github.com/grafana/grafana/apps/provisioning/pkg/repository"
pkg/services/ngalert/api/api_convert_prometheus.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
amconfig "github.com/prometheus/alertmanager/config"
"github.com/prometheus/alertmanager/pkg/labels"
prommodel "github.com/prometheus/common/model"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
pkg/services/ngalert/api/api_convert_prometheus_test.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
prommodel "github.com/prometheus/common/model"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/api/lotex_am.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"io"
"net/http"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/api/lotex_ruler.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net/http"
"net/url"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/api/prometheus_conversion.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"io"
"mime"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
pkg/services/ngalert/api/tooling/definitions/alertmanager.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"github.com/prometheus/alertmanager/config"
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/common/model"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/alerting/definition"
alertingmodels "github.com/grafana/alerting/models"
pkg/services/ngalert/api/tooling/definitions/alertmanager_test.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
//go:embed test-data/*.*
pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings"
"github.com/grafana/alerting/templates"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func (t *NotificationTemplate) Validate() error {
pkg/services/ngalert/api/tooling/definitions/cortex-ruler_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func Test_Rule_Marshaling(t *testing.T) {
pkg/services/ngalert/api/tooling/definitions/provisioning_policies_test.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func TestNotificationPolicyExportMarshal(t *testing.T) {
pkg/services/ngalert/api/util.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strconv"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/services/accesscontrol"
pkg/services/ngalert/models/alert_rule_test.go
+1 -1
View File
@@ -15,8 +15,8 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"
"golang.org/x/exp/maps"
"gopkg.in/yaml.v3"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
pkg/services/ngalert/prom/convert.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"time"
"github.com/google/uuid"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
"github.com/grafana/grafana/pkg/services/datasources"
pkg/services/ngalert/prom/convert_test.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/google/uuid"
prommodel "github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/expr"
"github.com/grafana/grafana/pkg/expr/mathexp"
pkg/services/ngalert/prom/models_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
prommodel "github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/util"
)
pkg/services/ngalert/remote/alertmanager.go
+1 -1
View File
@@ -30,7 +30,7 @@ import (
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/client_golang/prometheus"
common_config "github.com/prometheus/common/config"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
pkg/services/ngalert/remote/alertmanager_test.go
+1 -1
View File
@@ -27,12 +27,12 @@ import (
"github.com/prometheus/client_golang/prometheus"
common_config "github.com/prometheus/common/config"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"
alertingClusterPB "github.com/grafana/alerting/cluster/clusterpb"
"github.com/grafana/alerting/definition"
alertingModels "github.com/grafana/alerting/models"
"github.com/grafana/alerting/notify"
"gopkg.in/yaml.v3"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
pkg/services/ngalert/sender/notifier.go
+1 -1
View File
@@ -38,7 +38,7 @@ import (
"github.com/prometheus/common/promslog"
"github.com/prometheus/common/version"
"github.com/prometheus/sigv4"
"gopkg.in/yaml.v2"
"go.yaml.in/yaml/v3"
"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery/targetgroup"
pkg/services/ngalert/sender/notifier_test.go
+1 -1
View File
@@ -38,7 +38,7 @@ import (
"github.com/prometheus/common/promslog"
"github.com/stretchr/testify/require"
"go.uber.org/atomic"
"gopkg.in/yaml.v2"
"go.yaml.in/yaml/v2"
"github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/discovery"
pkg/services/provisioning/alerting/config_reader.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
)
pkg/services/provisioning/alerting/contact_point_types_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/services/provisioning/values"
)
pkg/services/provisioning/alerting/notification_policy_types_test.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
)
func TestNotificationPolicy(t *testing.T) {
pkg/services/provisioning/alerting/rules_types_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/provisioning/values"
pkg/services/provisioning/dashboards/config_reader.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/provisioning/utils"
pkg/services/provisioning/datasources/config_reader.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/datasources"
pkg/services/provisioning/plugins/config_reader.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"path/filepath"
"strings"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore"
pkg/services/provisioning/values/values_test.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.yaml.in/yaml/v3"
"gopkg.in/ini.v1"
"gopkg.in/yaml.v3"
"github.com/grafana/grafana/pkg/setting"
)
pkg/tests/api/alerting/api_convert_prometheus_alertmanager_test.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/services/featuremgmt"
apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
pkg/tests/api/alerting/api_provisioning_test.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/apimachinery/errutil"
"github.com/grafana/grafana/pkg/expr"
pkg/tests/api/alerting/testing.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v3"
"go.yaml.in/yaml/v3"
"github.com/grafana/grafana/pkg/api"
"github.com/grafana/grafana/pkg/configprovider"