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

Lint + fix

Browse Source
This commit is contained in:
Misi
2026-01-14 15:29:56 +00:00
parent 18e2fb8c3e
commit 7b47fc814e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/iam/pkg/apis/iam/v0alpha1/teambinding_schema_gen.go
Generated
+2 -2
View File
@@ -13,7 +13,7 @@ import (
// schema is unexported to prevent accidental overwrites
var (
schemaTeamBinding = resource.NewSimpleSchema("iam.grafana.app", "v0alpha1", NewTeamBinding(), &TeamBindingList{}, resource.WithKind("TeamBinding"),
resource.WithPlural("teambindings"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{resource.SelectableField{
resource.WithPlural("teambindings"), resource.WithScope(resource.NamespacedScope), resource.WithSelectableFields([]resource.SelectableField{{
FieldSelector: "spec.teamRef.name",
FieldValueFunc: func(o resource.Object) (string, error) {
cast, ok := o.(*TeamBinding)
@@ -24,7 +24,7 @@ var (
return cast.Spec.TeamRef.Name, nil
},
},
resource.SelectableField{
{
FieldSelector: "spec.subject.name",
FieldValueFunc: func(o resource.Object) (string, error) {
cast, ok := o.(*TeamBinding)
pkg/tests/apis/iam/team_bindings_integration_test.go
+9 -8
View File
@@ -7,6 +7,7 @@ import (
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -108,7 +109,7 @@ func doTeamBindingCRUDTestsUsingTheNewAPIs(t *testing.T, helper *apis.K8sTestHel
require.NotNil(t, response)
var actual iamv0alpha1.TeamBinding
require.NoError(t, helper.Scheme.Convert(response, &actual, nil))
require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(response.Object, &actual))
require.Equal(t, user.GetName(), actual.Spec.Subject.Name)
require.Equal(t, team.GetName(), actual.Spec.TeamRef.Name)
require.Equal(t, iamv0alpha1.TeamBindingTeamPermissionAdmin, actual.Spec.Permission)
@@ -134,7 +135,7 @@ func doTeamBindingCRUDTestsUsingTheNewAPIs(t *testing.T, helper *apis.K8sTestHel
require.NoError(t, err)
require.NotNil(t, response)
require.NoError(t, helper.Scheme.Convert(response, &actual, nil))
require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(response.Object, &actual))
require.Equal(t, user.GetName(), actual.Spec.Subject.Name)
require.Equal(t, team.GetName(), actual.Spec.TeamRef.Name)
require.Equal(t, iamv0alpha1.TeamBindingTeamPermissionMember, actual.Spec.Permission)
@@ -496,7 +497,7 @@ func doTeamBindingCRUDTestsUsingTheLegacyAPIs(t *testing.T, helper *apis.K8sTest
require.NotNil(t, response)
var actual iamv0alpha1.TeamBinding
require.NoError(t, helper.Scheme.Convert(response, &actual, nil))
require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(response.Object, &actual))
require.Equal(t, iamv0alpha1.TeamBindingTeamPermissionMember, actual.Spec.Permission)
require.Equal(t, userRsp.Result.UID, actual.Spec.Subject.Name)
require.Equal(t, teamRsp.Result.UID, actual.Spec.TeamRef.Name)
@@ -584,13 +585,13 @@ func doTeamBindingFieldSelectionTests(t *testing.T, helper *apis.K8sTestHelper)
cleanupCtx := context.Background()
for _, name := range bindingNames {
_, _ = teamBindingClient.Resource.Delete(cleanupCtx, name, metav1.DeleteOptions{})
_ = teamBindingClient.Resource.Delete(cleanupCtx, name, metav1.DeleteOptions{})
}
for _, name := range teamNames {
_, _ = teamClient.Resource.Delete(cleanupCtx, name, metav1.DeleteOptions{})
_ = teamClient.Resource.Delete(cleanupCtx, name, metav1.DeleteOptions{})
}
for _, name := range userNames {
_, _ = userClient.Resource.Delete(cleanupCtx, name, metav1.DeleteOptions{})
_ = userClient.Resource.Delete(cleanupCtx, name, metav1.DeleteOptions{})
}
})
@@ -607,7 +608,7 @@ func doTeamBindingFieldSelectionTests(t *testing.T, helper *apis.K8sTestHelper)
require.Len(t, listByTeam.Items, 2)
for _, item := range listByTeam.Items {
var actual iamv0alpha1.TeamBinding
require.NoError(t, helper.Scheme.Convert(&item, &actual, nil))
require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, &actual))
require.Equal(t, teamA.GetName(), actual.Spec.TeamRef.Name)
}
@@ -619,7 +620,7 @@ func doTeamBindingFieldSelectionTests(t *testing.T, helper *apis.K8sTestHelper)
require.Len(t, listByUser.Items, 2)
for _, item := range listByUser.Items {
var actual iamv0alpha1.TeamBinding
require.NoError(t, helper.Scheme.Convert(&item, &actual, nil))
require.NoError(t, runtime.DefaultUnstructuredConverter.FromUnstructured(item.Object, &actual))
require.Equal(t, user1.GetName(), actual.Spec.Subject.Name)
}
})