diff --git a/pkg/apis/scope/v0alpha1/types.go b/pkg/apis/scope/v0alpha1/types.go index 5d5b9f5601d..5fead973ad9 100644 --- a/pkg/apis/scope/v0alpha1/types.go +++ b/pkg/apis/scope/v0alpha1/types.go @@ -111,7 +111,7 @@ type ScopeNodeSpec struct { Description string `json:"description,omitempty"` LinkType LinkType `json:"linkType,omitempty"` // scope (later more things) - LinkID string `json:"linkID,omitempty"` // the k8s name + LinkID string `json:"linkId,omitempty"` // the k8s name // ?? should this be a slice of links } @@ -139,5 +139,5 @@ type TreeItem struct { Description string `json:"description,omitempty"` LinkType LinkType `json:"linkType,omitempty"` // scope (later more things) - LinkID string `json:"linkID,omitempty"` // the k8s name + LinkID string `json:"linkId,omitempty"` // the k8s name } diff --git a/pkg/apis/scope/v0alpha1/zz_generated.openapi.go b/pkg/apis/scope/v0alpha1/zz_generated.openapi.go index a2516e9723a..482b8ab11db 100644 --- a/pkg/apis/scope/v0alpha1/zz_generated.openapi.go +++ b/pkg/apis/scope/v0alpha1/zz_generated.openapi.go @@ -397,7 +397,7 @@ func schema_pkg_apis_scope_v0alpha1_ScopeNodeSpec(ref common.ReferenceCallback) Enum: []interface{}{"scope"}, }, }, - "linkID": { + "linkId": { SchemaProps: spec.SchemaProps{ Description: "scope (later more things)", Type: []string{"string"}, @@ -514,7 +514,7 @@ func schema_pkg_apis_scope_v0alpha1_TreeItem(ref common.ReferenceCallback) commo Enum: []interface{}{"scope"}, }, }, - "linkID": { + "linkId": { SchemaProps: spec.SchemaProps{ Description: "scope (later more things)", Type: []string{"string"}, diff --git a/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list b/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list index 98e6fa2035c..a295544ba5f 100644 --- a/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list +++ b/pkg/apis/scope/v0alpha1/zz_generated.openapi_violation_exceptions.list @@ -1 +1,3 @@ +API rule violation: names_match,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,ScopeNodeSpec,LinkID +API rule violation: names_match,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,TreeItem,LinkID API rule violation: names_match,github.com/grafana/grafana/pkg/apis/scope/v0alpha1,TreeItem,NodeID diff --git a/pkg/tests/apis/scopes/testdata/scopeNodesExample/scopeNodes.json b/pkg/tests/apis/scopes/testdata/scopeNodesExample/scopeNodes.json index 0cec2dc0417..7d776b86b5b 100644 --- a/pkg/tests/apis/scopes/testdata/scopeNodesExample/scopeNodes.json +++ b/pkg/tests/apis/scopes/testdata/scopeNodesExample/scopeNodes.json @@ -24,7 +24,7 @@ "title": "Clusters", "nodeType": "container", "parentName": "applications", - "linkID": "indexHelperCluster", + "linkId": "indexHelperCluster", "linkType": "scope" } }, @@ -38,7 +38,7 @@ "description": "Cluster Scopes", "title": "Clusters", "nodeType": "container", - "linkID": "indexHelperCluster", + "linkId": "indexHelperCluster", "linkType": "scope" } }, @@ -66,7 +66,7 @@ "title": "slothPictureFactory", "nodeType": "leaf", "parentName": "applications", - "linkID": "slothPictureFactory", + "linkId": "slothPictureFactory", "linkType": "scope" } }, @@ -81,7 +81,7 @@ "title": "slothVoteTracker", "nodeType": "leaf", "parentName": "applications", - "linkID": "slothVoteTracker", + "linkId": "slothVoteTracker", "linkType": "scope" } }, @@ -96,7 +96,7 @@ "title": "slothClusterNorth", "nodeType": "leaf", "parentName": "applications.clusters", - "linkID": "slothClusterNorth", + "linkId": "slothClusterNorth", "linkType": "scope" } }, @@ -111,7 +111,7 @@ "title": "slothClusterSouth", "nodeType": "leaf", "parentName": "applications.clusters", - "linkID": "slothClusterSouth", + "linkId": "slothClusterSouth", "linkType": "scope" } }, @@ -126,7 +126,7 @@ "title": "slothClusterNorth", "nodeType": "leaf", "parentName": "clusters", - "linkID": "slothClusterNorth", + "linkId": "slothClusterNorth", "linkType": "scope" } }, @@ -141,7 +141,7 @@ "title": "slothClusterSouth", "nodeType": "leaf", "parentName": "clusters", - "linkID": "slothClusterSouth", + "linkId": "slothClusterSouth", "linkType": "scope" } }, @@ -156,7 +156,7 @@ "title": "slothPictureFactory", "nodeType": "leaf", "parentName": "clusters.applications", - "linkID": "slothPictureFactory", + "linkId": "slothPictureFactory", "linkType": "scope" } }, @@ -171,7 +171,7 @@ "title": "slothVoteTracker", "nodeType": "leaf", "parentName": "clusters.applications", - "linkID": "slothVoteTracker", + "linkId": "slothVoteTracker", "linkType": "scope" } }