Merge pull request #357 from alecmerdler/fix-relationship-id-filter

Respect resource ID filter when reading relationships

Author: josephschorr

internal/commands/relationship.go

@@ -181,17 +181,17 @@ func buildRelationshipsFilter(cmd *cobra.Command, args []string) (*v1.Relationsh
 	filter := &v1.RelationshipFilter{ResourceType: args[0]}
 
 	if strings.Contains(args[0], ":") {
-		resourceID := ""
+		var resourceID string
+		err := stringz.SplitExact(args[0], ":", &filter.ResourceType, &resourceID)
+		if err != nil {
+			return nil, err
+		}
+
 		if strings.HasSuffix(resourceID, "%") {
 			filter.OptionalResourceIdPrefix = strings.TrimSuffix(resourceID, "%")
 		} else {
 			filter.OptionalResourceId = resourceID
 		}
-
-		err := stringz.SplitExact(args[0], ":", &filter.ResourceType, &resourceID)
-		if err != nil {
-			return nil, err
-		}
 	}
 
 	if len(args) > 1 {

internal/commands/relationship_test.go

@@ -466,6 +466,70 @@ func fileFromStrings(t *testing.T, strings []string) *os.File {
 	return file
 }
 
+func TestBuildRelationshipsFilter(t *testing.T) {
+	tests := []struct {
+		name     string
+		args     []string
+		expected *v1.RelationshipFilter
+	}{
+		{
+			name:     "resource type",
+			args:     []string{"res"},
+			expected: &v1.RelationshipFilter{ResourceType: "res"},
+		},
+		{
+			name:     "resource type, resource ID",
+			args:     []string{"res:123"},
+			expected: &v1.RelationshipFilter{ResourceType: "res", OptionalResourceId: "123"},
+		},
+		{
+			name:     "resource type, resource ID, relation",
+			args:     []string{"res:123", "view"},
+			expected: &v1.RelationshipFilter{ResourceType: "res", OptionalResourceId: "123", OptionalRelation: "view"},
+		},
+		{
+			name: "resource type, resource ID, relation, subject type",
+			args: []string{"res:123", "view", "sub"},
+			expected: &v1.RelationshipFilter{
+				ResourceType:          "res",
+				OptionalResourceId:    "123",
+				OptionalRelation:      "view",
+				OptionalSubjectFilter: &v1.SubjectFilter{SubjectType: "sub"},
+			},
+		},
+		{
+			name: "resource type, resource ID, relation, subject type, subject ID",
+			args: []string{"res:123", "view", "sub:321"},
+			expected: &v1.RelationshipFilter{
+				ResourceType:          "res",
+				OptionalResourceId:    "123",
+				OptionalRelation:      "view",
+				OptionalSubjectFilter: &v1.SubjectFilter{SubjectType: "sub", OptionalSubjectId: "321"},
+			},
+		},
+	}
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			cmd := &cobra.Command{}
+			cmd.Flags().String("subject-filter", "", "")
+
+			filter, err := buildRelationshipsFilter(cmd, tt.args)
+			require.NoError(t, err)
+			require.Equal(t, tt.expected.ResourceType, filter.ResourceType, "resource types do not match")
+			require.Equal(t, tt.expected.OptionalResourceId, filter.OptionalResourceId, "resource IDs do not match")
+			require.Equal(t, tt.expected.OptionalRelation, filter.OptionalRelation, "relations do not match")
+
+			if tt.expected.OptionalSubjectFilter != nil {
+				require.Equal(t, tt.expected.OptionalSubjectFilter.SubjectType, filter.OptionalSubjectFilter.SubjectType, "subject types do not match")
+				require.Equal(t, tt.expected.OptionalSubjectFilter.OptionalSubjectId, filter.OptionalSubjectFilter.OptionalSubjectId, "subject IDs do not match")
+			}
+		})
+	}
+}
+
 type mockClient struct {
 	v1.SchemaServiceClient
 	v1.PermissionsServiceClient