Refactor iam app cue files (#108542)

A breaking change was introduced by this grafana-app-sdk PR: https://github.com/grafana/grafana-app-sdk/pull/795

This PR refactors the definition of our CUE files (manifest and kinds) to match the new model in the latest version of grafana-app-sdk.

apps/iam/Makefile

@@ -9,4 +9,3 @@ generate: install-app-sdk update-app-sdk ## Run Grafana App SDK code generation
 		--defencoding=none \
 		--noschemasinmanifest \
 		--postprocess \
-		--useoldmanifestkinds

apps/iam/kinds/manifest.cue

@@ -3,16 +3,22 @@ package kinds
 manifest: {
 	appName: 	   "iam"
 	groupOverride: "iam.grafana.app"
+	versions: {
+	    "v0alpha1": v0alpha1
+	}
+}
+
+v0alpha1: {
     kinds: [
-		globalrole, 
+		globalrolev0alpha1, 
-		globalrolebinding,
+		globalrolebindingv0alpha1,
-		corerole,
+		corerolev0alpha1,
-		role,
+		rolev0alpha1,
-		rolebinding,
+		rolebindingv0alpha1,
-		resourcepermission,
+		resourcepermissionv0alpha1,
-		user,
+		userv0alpha1,
-		team,
+		teamv0alpha1,
-		teambinding,
+		teambindingv0alpha1,
-		serviceaccount,
+		serviceaccountv0alpha1,
 	]
 }

apps/iam/kinds/resourcepermission.cue

@@ -4,20 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-resourcepermission: {
+resourcepermissionKind: {
 	kind:       "ResourcePermission"
 	pluralName: "ResourcePermissions"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
+}
+
+resourcepermissionv0alpha1: resourcepermissionKind & {
 	schema: {
 		spec:   v0alpha1.ResourcePermission
 	}
-		}
-	}
 }

apps/iam/kinds/role.cue

@@ -4,56 +4,47 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-role: {
+roleKind: {
 	kind:       "Role"
 	pluralName: "Roles"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
-			schema: {
-				spec:   v0alpha1.RoleSpec
-			}
-		}
-	}
 }
 
-corerole: {
+coreroleKind: {
 	kind:       "CoreRole"
 	pluralName: "CoreRoles"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
-			schema: {
-				spec:   v0alpha1.RoleSpec
-			}
-		}
-	}
 }
 
-globalrole: {
+globalroleKind: {
 	kind:       "GlobalRole"
 	pluralName: "GlobalRoles"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
+}
+
+rolev0alpha1: roleKind & {
 	schema: {
 		spec:   v0alpha1.RoleSpec
 	}
-		}
+}
+
+corerolev0alpha1: coreroleKind & {
+	schema: {
+		spec:   v0alpha1.RoleSpec
+	}
+}
+
+globalrolev0alpha1: globalroleKind & {
+	schema: {
+		spec:   v0alpha1.RoleSpec
 	}
 }

apps/iam/kinds/rolebinding.cue

@@ -4,38 +4,32 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-rolebinding: {
+rolebindingKind: {
 	kind:       "RoleBinding"
 	pluralName: "RoleBindings"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
+}
+
+globalrolebindingKind: {
+	kind:       "GlobalRoleBinding"
+	pluralName: "GlobalRoleBindings"
+	codegen: {
+		ts: { enabled: false }
+		go: { enabled: true }
+	}
+}
+
+rolebindingv0alpha1: rolebindingKind & {
 	schema: {
 		spec:   v0alpha1.RoleBindingSpec
 	}
-		}
-	}
 }
 
-globalrolebinding: {
+globalrolebindingv0alpha1: globalrolebindingKind & {
-	kind:       "GlobalRoleBinding"
-	pluralName: "GlobalRoleBindings"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
-			codegen: {
-				ts: { enabled: false }
-				go: { enabled: true }
-			}
 	schema: {
 		spec:   v0alpha1.GlobalRoleBindingSpec
 	}
-		}
-	}
 }

apps/iam/kinds/serviceaccount.cue

@@ -4,20 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-serviceaccount: {
+serviceaccountKind: {
 	kind:       "ServiceAccount"
 	pluralName: "ServiceAccounts"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
+}
+
+serviceaccountv0alpha1: serviceaccountKind & {
 	schema: {
 		spec: v0alpha1.ServiceAccountSpec
 	}
-		}
-	}
 }

apps/iam/kinds/team.cue

@@ -4,20 +4,18 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-team: {
+teamKind: {
 	kind:       "Team"
 	pluralName: "Teams"
 	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
+}
+
+teamv0alpha1: teamKind & {
 	schema: {
 		spec: v0alpha1.TeamSpec
 	}
-		}
-	}
 }

apps/iam/kinds/teambinding.cue

@@ -4,20 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-teambinding: {
+teambindingKind: {
 	kind:       "TeamBinding"
 	pluralName: "TeamBindings"
-	current:    "v0alpha1"
-
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
+}
+
+teambindingv0alpha1: teambindingKind & {
 	schema: {
 		spec: v0alpha1.TeamBindingSpec
 	}
-		}
-	}
 }

apps/iam/kinds/user.cue

@@ -4,26 +4,17 @@ import (
 	"github.com/grafana/grafana/apps/iam/kinds/v0alpha1"
 )
 
-user: {
+userKind: {
 	kind:       "User"
 	pluralName: "Users"
-	current:    "v0alpha1"
-    
-	versions: {
-		"v0alpha1": {
 	codegen: {
 		ts: { enabled: false }
 		go: { enabled: true }
 	}
-			validation: {
+}
-				operations: [
+
-					"CREATE",
+userv0alpha1: userKind & {
-					"UPDATE",
-				]
-			}
 	schema: {
 		spec: v0alpha1.UserSpec
 	}
-		}
-	}
 }