Define specific kind for request modes kube resources field

gravitational · Oct 4, 2024 · b03a2f3 · b03a2f3
1 parent cc9b45c
commit b03a2f3
Show file tree

Hide file tree

Showing 6 changed files with 2,245 additions and 2,101 deletions.
diff --git a/api/proto/teleport/legacy/types/types.proto b/api/proto/teleport/legacy/types/types.proto
@@ -2666,8 +2666,19 @@ message AccessCapabilitiesRequest {
   bool FilterRequestableRolesByResource = 6 [(gogoproto.jsontag) = "filter_requestable_roles_by_resource,omitempty"];
 }
 
+// RequestModeKubernetesResources is the Kubernetes resource identifier used
+// in access request mode settings.
+// Modeled after existing message KubernetesResource.
+message RequestModeKubernetesResource {
+  // Kind specifies the Kubernetes Resource type.
+  string Kind = 1 [(gogoproto.jsontag) = "kind,omitempty"];
+}
+
+// AccessRequestMode describes request mode settings for applicable resources.
 message AccessRequestMode {
-  repeated KubernetesResource KubernetesResources = 1 [
+  // KubernetesResources defines which Kubernetes subresources a user can
+  // request during request creation.
+  repeated RequestModeKubernetesResource KubernetesResources = 1 [
     (gogoproto.nullable) = false,
     (gogoproto.jsontag) = "kubernetes_resources,omitempty"
   ];
@@ -3309,7 +3320,6 @@ message DatabasePermission {
 // KubernetesResource is the Kubernetes resource identifier.
 message KubernetesResource {
   // Kind specifies the Kubernetes Resource type.
-  // At the moment only "pod" is supported.
   string Kind = 1 [(gogoproto.jsontag) = "kind,omitempty"];
   // Namespace is the resource namespace.
   // It supports wildcards.

diff --git a/api/types/role.go b/api/types/role.go
@@ -1758,7 +1758,7 @@ func setDefaultKubernetesVerbs(spec *RoleSpecV6) {
 // - Name is not empty
 // - Namespace is not empty
 //
-// Keep in sync with related func validateKubeResourcesForAccessRequestMode
+// Keep applicable fields in sync with related func validateKubeResourcesForAccessRequestMode
 func validateKubeResources(roleVersion string, kubeResources []KubernetesResource) error {
 	for _, kubeResource := range kubeResources {
 		if !slices.Contains(KubernetesResourcesKinds, kubeResource.Kind) && kubeResource.Kind != Wildcard {
@@ -1804,21 +1804,11 @@ func validateKubeResources(roleVersion string, kubeResources []KubernetesResourc
 //
 // All other fields (eg: Name) might get future support.
 //
-// Keep in sync with related func validateKubeResources
-func validateKubeResourcesForAccessRequestMode(roleVersion string, kubeResources []KubernetesResource) error {
+// Keep applicable fields in sync with related func validateKubeResources
+func validateKubeResourcesForAccessRequestMode(roleVersion string, kubeResources []RequestModeKubernetesResource) error {
 	for _, kubeResource := range kubeResources {
 		if !slices.Contains(KubernetesResourcesKinds, kubeResource.Kind) && kubeResource.Kind != Wildcard {
-			return trace.BadParameter("request_mode kubernetes_resource kind %q is invalid or unsupported; Supported: %v", kubeResource.Kind, append([]string{Wildcard}, KubernetesResourcesKinds...))
-		}
-
-		if kubeResource.Name != "" {
-			return trace.BadParameter("request_mode kubernetes_resources field %q is not supported", "name")
-		}
-		if kubeResource.Namespace != "" {
-			return trace.BadParameter("request_mode kubernetes_resources field %q is not supported", "namespace")
-		}
-		if len(kubeResource.Verbs) > 0 {
-			return trace.BadParameter("request_mode kubernetes_resources field %q is not supported", "verbs")
+			return trace.BadParameter("request_mode.kubernetes_resource kind %q is invalid or unsupported; Supported: %v", kubeResource.Kind, append([]string{Wildcard}, KubernetesResourcesKinds...))
 		}
 
 		// Only Pod resources are supported in role version <=V6.
@@ -1828,7 +1818,7 @@ func validateKubeResourcesForAccessRequestMode(roleVersion string, kubeResources
 		// Teleport does not support role versions < v3.
 		case V6, V5, V4, V3:
 			if kubeResource.Kind != KindKubePod {
-				return trace.BadParameter("request_mode kubernetes_resources kind %q is not supported in role version %q. Upgrade the role version to %q", kubeResource.Kind, roleVersion, V7)
+				return trace.BadParameter("request_mode.kubernetes_resources kind %q is not supported in role version %q. Upgrade the role version to %q", kubeResource.Kind, roleVersion, V7)
 			}
 		}
 	}

diff --git a/api/types/role_test.go b/api/types/role_test.go
@@ -351,26 +351,26 @@ func TestRole_GetKubeResources(t *testing.T) {
 func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 	type args struct {
 		version   string
-		resources []KubernetesResource
+		resources []RequestModeKubernetesResource
 	}
 	tests := []struct {
 		name                string
 		args                args
-		want                []KubernetesResource
+		want                []RequestModeKubernetesResource
 		assertErrorCreation require.ErrorAssertionFunc
 	}{
 		{
 			name: "valid single value",
 			args: args{
 				version: V7,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: KindKubePod,
 					},
 				},
 			},
 			assertErrorCreation: require.NoError,
-			want: []KubernetesResource{
+			want: []RequestModeKubernetesResource{
 				{
 					Kind: KindKubePod,
 				},
@@ -387,14 +387,14 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "valid wildcard value",
 			args: args{
 				version: V7,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: Wildcard,
 					},
 				},
 			},
 			assertErrorCreation: require.NoError,
-			want: []KubernetesResource{
+			want: []RequestModeKubernetesResource{
 				{
 					Kind: Wildcard,
 				},
@@ -404,7 +404,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "valid multi values",
 			args: args{
 				version: V7,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: KindKubeNamespace,
 					},
@@ -417,7 +417,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 				},
 			},
 			assertErrorCreation: require.NoError,
-			want: []KubernetesResource{
+			want: []RequestModeKubernetesResource{
 				{
 					Kind: KindKubeNamespace,
 				},
@@ -433,7 +433,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "valid multi values with wildcard",
 			args: args{
 				version: V7,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: KindKubeNamespace,
 					},
@@ -443,7 +443,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 				},
 			},
 			assertErrorCreation: require.NoError,
-			want: []KubernetesResource{
+			want: []RequestModeKubernetesResource{
 				{
 					Kind: KindKubeNamespace,
 				},
@@ -456,7 +456,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "invalid single value",
 			args: args{
 				version: V7,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: KindKubernetesCluster,
 					},
@@ -468,7 +468,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "invalid multi value",
 			args: args{
 				version: V7,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: Wildcard,
 					},
@@ -482,50 +482,11 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			},
 			assertErrorCreation: require.Error,
 		},
-		{
-			name: "invalid unsupported field `name`",
-			args: args{
-				version: V7,
-				resources: []KubernetesResource{
-					{
-						Kind: Wildcard,
-						Name: "unsupported",
-					},
-				},
-			},
-			assertErrorCreation: require.Error,
-		},
-		{
-			name: "invalid unsupported field `namespace`",
-			args: args{
-				version: V7,
-				resources: []KubernetesResource{
-					{
-						Kind:      Wildcard,
-						Namespace: "unsupported",
-					},
-				},
-			},
-			assertErrorCreation: require.Error,
-		},
-		{
-			name: "invalid unsupported field `verbs`",
-			args: args{
-				version: V7,
-				resources: []KubernetesResource{
-					{
-						Kind:  Wildcard,
-						Verbs: []string{"unsupported"},
-					},
-				},
-			},
-			assertErrorCreation: require.Error,
-		},
 		{
 			name: "invalid kinds not supported for v6",
 			args: args{
 				version: V6,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: Wildcard,
 					},
@@ -537,7 +498,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "invalid kinds not supported for v5",
 			args: args{
 				version: V6,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: Wildcard,
 					},
@@ -549,7 +510,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "invalid kinds not supported for v4",
 			args: args{
 				version: V6,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: Wildcard,
 					},
@@ -561,7 +522,7 @@ func TestRole_OptionsRequestModeKubeResources(t *testing.T) {
 			name: "invalid kinds not supported for v3",
 			args: args{
 				version: V6,
-				resources: []KubernetesResource{
+				resources: []RequestModeKubernetesResource{
 					{
 						Kind: Wildcard,
 					},