Chore: Use Kind().GroupVersionResource() (#113133)

This commit is contained in:
Ryan McKinley
2025-10-28 14:54:10 -07:00
committed by GitHub
parent 329d6a11fa
commit d72e048bfe
11 changed files with 27 additions and 102 deletions
@@ -5,12 +5,11 @@ import (
"errors"
"testing"
"github.com/grafana/grafana-app-sdk/app"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apiserver/pkg/admission"
"k8s.io/apiserver/pkg/authentication/user"
"github.com/grafana/grafana-app-sdk/app"
examplev1 "github.com/grafana/grafana/pkg/services/apiserver/builder/runner/testdata/app/pkg/apis/example/v1"
)
@@ -20,12 +19,8 @@ func TestBuilderAdmission_Validate(t *testing.T) {
A: "test",
},
}
gvk := schema.GroupVersionKind{
Group: examplev1.ExampleKind().Group(),
Version: examplev1.ExampleKind().Version(),
Kind: examplev1.ExampleKind().Kind(),
}
gvr := gvk.GroupVersion().WithResource(examplev1.ExampleKind().Plural())
gvk := examplev1.ExampleKind().GroupVersionKind()
gvr := examplev1.ExampleKind().GroupVersionResource()
defaultAttributes := admission.NewAttributesRecord(exampleObj, nil, gvk, "default", "foo", gvr, "", admission.Create, nil, false, &user.DefaultInfo{})
tests := []struct {
@@ -73,12 +68,8 @@ func TestBuilderAdmission_Validate(t *testing.T) {
}
func TestBuilderAdmission_Mutate(t *testing.T) {
gvk := schema.GroupVersionKind{
Group: examplev1.ExampleKind().Group(),
Version: examplev1.ExampleKind().Version(),
Kind: examplev1.ExampleKind().Kind(),
}
gvr := gvk.GroupVersion().WithResource(examplev1.ExampleKind().Plural())
gvk := examplev1.ExampleKind().GroupVersionKind()
gvr := examplev1.ExampleKind().GroupVersionResource()
getAttributes := func() admission.Attributes {
exampleObj := &examplev1.Example{
Spec: examplev1.ExampleSpec{