wip

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

Author: golanglemonade

.task/checksum/generate-ent-smart

@@ -1 +1 @@
-72fa30a003302debf7d1483ca0dc91d9
+61e2ab6dbc47a1e3535bd5d6128a8b14

.task/checksum/generate-graphql-smart

@@ -1 +1 @@
-94e0895ee52c5b94d359b74cfc3bdf7
+7842eb30ae6691f0d342b4ac7f77549b

.task/checksum/generate-openapi-smart

@@ -1 +1 @@
-a5ea6f046fb222aad2d3c0483d6da270
+9f7a6cf93682ba9c334cb528ff4f46d3

cmd/serve.go

@@ -278,7 +278,7 @@ func serve(ctx context.Context) error {
 	// add auth and integration options
 	so.AddServerOptions(
 		serveropts.WithAuth(),
-		serveropts.WithIntegrationsRuntime(dbClient),
+		serveropts.WithIntegrationsRuntime(ctx, dbClient),
 	)
 
 	// add session manager

internal/ent/checksum/.history_schema_checksum

@@ -1 +1 @@
-ab1a715fb86d24166a914417c34ed7ea5fa6e5e84c908dab42037e35f712e64c
+a5249abb9688a21c3e9a1a55ffa3a902d27415f016c0d3adeb2bf6fff6e91098

internal/ent/checksum/.schema_checksum

@@ -1 +1 @@
-77569e5f492746f4a0dbb2afecb5c1a9e7566307cbfa805a10a197ca180faace
+0a451c79267f3f3eae7b639646c5bb218c63d7a4271c535cc922c17ff82946e1

internal/graphapi/checksum/.schema_checksum

@@ -1 +1 @@
-42e2e0f073ec4fefbc285d28b305afe2b4c1bcf34487541a035dbb372609206f
+813b1073a55487c19c5616e4b2b12067b86cc1bd2f78f3e90d3029b11e1a0048

internal/graphapi/clientschema/checksum/.schema_checksum

@@ -1 +1 @@
-9186a098127484e3a4916396176d315605648724080287999ac06a6cd1c6c793
+1aa6acdf108b9d69fb351f1cfeba20ce006683287a454c11682fcc11600dfb5c

internal/graphapi/clientschema/schema.graphql

@@ -8899,6 +8899,14 @@ type Control implements Node {
 	Returns the workflow event timeline for this control across all workflow instances
 	"""
 	workflowTimeline(after: Cursor, first: Int, before: Cursor, last: Int, orderBy: [WorkflowEventOrder!], where: WorkflowEventWhereInput, includeEmitFailures: Boolean): WorkflowEventConnection!
+	"""
+	relatedControls show the controls and frameworks mapped to this control
+	"""
+	relatedControls: RelatedControlConnection!
+	"""
+	relatedSubcontrols show the subcontrols and frameworks mapped to this control
+	"""
+	relatedSubcontrols: RelatedSubcontrolConnection!
 }
 """
 Return response for createBulkControl mutation
@@ -70578,10 +70586,6 @@ type RelatedControlConnection {
 	"""
 	edges: [RelatedControlEdge]
 	"""
-	Information to aid in pagination.
-	"""
-	pageInfo: PageInfo!
-	"""
 	Identifies the total count of items in the connection.
 	"""
 	totalCount: Int!
@@ -70596,26 +70600,6 @@ type RelatedControlEdge {
 	node: Control!
 }
 """
-Ordering options for RelatedControl connections
-"""
-input RelatedControlOrder {
-	"""
-	The ordering direction.
-	"""
-	direction: OrderDirection! = ASC
-	"""
-	The field by which to order RelatedControl.
-	"""
-	field: RelatedControlOrderField!
-}
-"""
-Properties by which RelatedControl connections can be ordered.
-"""
-enum RelatedControlOrderField {
-	referenceFramework
-	systemOwned
-}
-"""
 A connection to a list of items.
 """
 type RelatedSubcontrolConnection {
@@ -70624,10 +70608,6 @@ type RelatedSubcontrolConnection {
 	"""
 	edges: [RelatedSubcontrolEdge]
 	"""
-	Information to aid in pagination.
-	"""
-	pageInfo: PageInfo!
-	"""
 	Identifies the total count of items in the connection.
 	"""
 	totalCount: Int!
@@ -70641,26 +70621,6 @@ type RelatedSubcontrolEdge {
 	"""
 	node: Subcontrol!
 }
-"""
-Ordering options for RelatedSubcontrol connections
-"""
-input RelatedSubcontrolOrder {
-	"""
-	The ordering direction.
-	"""
-	direction: OrderDirection! = ASC
-	"""
-	The field by which to order RelatedSubcontrol.
-	"""
-	field: RelatedSubcontrolOrderField!
-}
-"""
-Properties by which RelatedSubcontrol connections can be ordered.
-"""
-enum RelatedSubcontrolOrderField {
-	referenceFramework
-	systemOwned
-}
 type Remediation implements Node {
 	id: ID!
 	createdAt: Time
@@ -79130,6 +79090,14 @@ type Subcontrol implements Node {
 		where: IdentityHolderWhereInput
 	): IdentityHolderConnection!
 	"""
+	relatedControls show the controls and frameworks mapped to this control
+	"""
+	relatedControls: RelatedControlConnection!
+	"""
+	relatedSubcontrols show the subcontrols and frameworks mapped to this control
+	"""
+	relatedSubcontrols: RelatedSubcontrolConnection!
+	"""
 	Indicates if this subcontrol has pending changes awaiting workflow approval
 	"""
 	hasPendingWorkflow: Boolean!

internal/graphapi/control_test.go

@@ -882,7 +882,7 @@ func TestMutationCreateControlsByClone(t *testing.T) {
 			request: testclient.CloneControlInput{
 				ControlIDs: []string{orgOwnedControl.ID},
 			},
-			expectedStandard: lo.ToPtr("Custom"),
+			expectedStandard: lo.ToPtr("CUSTOM"),
 			expectedControls: []*generated.Control{orgOwnedControl},
 			client:           suite.client.api,
 			ctx:              sharedTestUser2.UserCtx,
@@ -891,7 +891,7 @@ func TestMutationCreateControlsByClone(t *testing.T) {
 		{
 			name:             "clone control under org, empty request",
 			request:          testclient.CloneControlInput{},
-			expectedStandard: lo.ToPtr("Custom"),
+			expectedStandard: lo.ToPtr("CUSTOM"),
 			expectedControls: []*generated.Control{orgOwnedControl},
 			client:           suite.client.api,
 			ctx:              sharedTestUser2.UserCtx,
@@ -2295,7 +2295,7 @@ func TestQueryControlSubcategories(t *testing.T) {
 // never try to run this in parallel with other tests that create controls
 // or standards, or that have controls linked to them
 func TestQueryControlCategoriesByFramework(t *testing.T) {
-	customFramework := "Custom"
+	customFramework := "CUSTOM"
 
 	newUser := suite.userBuilder(context.Background(), t)
 	newUser2 := suite.userBuilder(context.Background(), t)
@@ -2440,7 +2440,7 @@ func TestQueryControlCategoriesByFramework(t *testing.T) {
 }
 
 func TestQueryControlSubcategoriesByFramework(t *testing.T) {
-	customFramework := "Custom"
+	customFramework := "CUSTOM"
 
 	testUser := suite.userBuilder(context.Background(), t)
 	testUserAnother := suite.userBuilder(context.Background(), t)