Scopes: Name relationship objects *binding (#84955)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
Co-authored-by: Bogdan Matei <bogdan.matei@grafana.com>

Author: bergquist

pkg/apis/datasource/v0alpha1/zz_generated.openapi.go

@@ -22,8 +22,8 @@ var ScopeResourceInfo = common.NewResourceInfo(GROUP, VERSION,
 
 var ScopeDashboardResourceInfo = common.NewResourceInfo(GROUP, VERSION,
 	"scopedashboards", "scopedashboard", "ScopeDashboard",
-	func() runtime.Object { return &ScopeDashboard{} },
-	func() runtime.Object { return &ScopeDashboardList{} },
+	func() runtime.Object { return &ScopeDashboardBinding{} },
+	func() runtime.Object { return &ScopeDashboardBindingList{} },
 )
 
 var (
@@ -45,8 +45,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&Scope{},
 		&ScopeList{},
-		&ScopeDashboard{},
-		&ScopeDashboardList{},
+		&ScopeDashboardBinding{},
+		&ScopeDashboardBindingList{},
 	)
 	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil

pkg/apis/query/v0alpha1/zz_generated.openapi.go

@@ -13,19 +13,33 @@ type Scope struct {
 }
 
 type ScopeSpec struct {
-	Title       string        `json:"title"`
-	Type        string        `json:"type"`
-	Description string        `json:"description"`
-	Category    string        `json:"category"`
-	Filters     []ScopeFilter `json:"filters"`
+	Title       string `json:"title"`
+	Type        string `json:"type"`
+	Description string `json:"description"`
+	Category    string `json:"category"`
+
+	// +listType=atomic
+	Filters []ScopeFilter `json:"filters"`
 }
 
 type ScopeFilter struct {
-	Key      string `json:"key"`
-	Value    string `json:"value"`
-	Operator string `json:"operator"`
+	Key      string         `json:"key"`
+	Value    string         `json:"value"`
+	Operator FilterOperator `json:"operator"`
 }
 
+// Type of the filter operator.
+// +enum
+type FilterOperator string
+
+// Defines values for FilterOperator.
+const (
+	FilterOperatorEquals        FilterOperator = "equals"
+	FilterOperatorNotEquals     FilterOperator = "not-equals"
+	FilterOperatorRegexMatch    FilterOperator = "regex-match"
+	FilterOperatorRegexNotMatch FilterOperator = "regex-not-match"
+)
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type ScopeList struct {
 	metav1.TypeMeta `json:",inline"`
@@ -35,22 +49,22 @@ type ScopeList struct {
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type ScopeDashboard struct {
+type ScopeDashboardBinding struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec ScopeDashboardSpec `json:"spec,omitempty"`
+	Spec ScopeDashboardBindingSpec `json:"spec,omitempty"`
 }
 
-type ScopeDashboardSpec struct {
-	DashboardUIDs []string `json:"dashboardUids"`
-	ScopeUID      string   `json:"scopeUid"`
+type ScopeDashboardBindingSpec struct {
+	Dashboards []string `json:"dashboards"`
+	Scope      string   `json:"scope"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type ScopeDashboardList struct {
+type ScopeDashboardBindingList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	Items []ScopeDashboard `json:"items,omitempty"`
+	Items []ScopeDashboardBinding `json:"items,omitempty"`
 }

pkg/apis/scope/v0alpha1/register.go

@@ -1,4 +1 @@
-API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeDashboardSpec,DashboardUIDs
-API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeSpec,Filters
-API rule violation: names_match,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeDashboardSpec,DashboardUIDs
-API rule violation: names_match,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeDashboardSpec,ScopeUID
+API rule violation: list_type_missing,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeDashboardBindingSpec,Dashboards

pkg/apis/scope/v0alpha1/types.go

@@ -58,13 +58,10 @@ export class ScopesDashboardsScene extends SceneObjectBase<ScopesDashboardsScene
   private async fetchDashboardsUids(scope: string): Promise<string[]> {
     try {
       const response = await getBackendSrv().get<{
-        items: Array<{ spec: { dashboardUids: null | string[]; scopeUid: string } }>;
+        items: Array<{ spec: { dashboards: null | string[]; scope: string } }>;
       }>(this._url, { scope });
 
-      return (
-        response.items.find((item) => !!item.spec.dashboardUids && item.spec.scopeUid === scope)?.spec.dashboardUids ??
-        []
-      );
+      return response.items.find((item) => !!item.spec.dashboards && item.spec.scope === scope)?.spec.dashboards ?? [];
     } catch (err) {
       return [];
     }

pkg/apis/scope/v0alpha1/zz_generated.deepcopy.go

@@ -92,8 +92,8 @@ jest.mock('@grafana/runtime', () => ({
         return {
           items: Object.values(scopesMocks).map((scope) => ({
             spec: {
-              dashboardUids: scope.dashboards.map((dashboard) => dashboard.uid),
-              scopeUid: scope.uid,
+              dashboards: scope.dashboards.map((dashboard) => dashboard.uid),
+              scope: scope.uid,
             },
           })),
         };