Combine issue feature detection into a single GraphQL query

Merge the Issue_fields and IssueClosedStateReason_enumValues
introspection queries into one call to avoid an extra API round-trip
on GHES.

Author: tksohishi

internal/featuredetection/feature_detection.go

@@ -151,6 +151,11 @@ func (d *detector) IssueFeatures() (IssueFeatures, error) {
 				Name string
 			} `graphql:"fields(includeDeprecated: true)"`
 		} `graphql:"Issue: __type(name: \"Issue\")"`
+		IssueClosedStateReason struct {
+			EnumValues []struct {
+				Name string
+			} `graphql:"enumValues(includeDeprecated: true)"`
+		} `graphql:"IssueClosedStateReason: __type(name: \"IssueClosedStateReason\")"`
 	}
 
 	gql := api.NewClientFromHTTP(d.httpClient)
@@ -165,27 +170,12 @@ func (d *detector) IssueFeatures() (IssueFeatures, error) {
 		}
 	}
 
-	if !features.StateReason {
-		return features, nil
-	}
-
-	var issueClosedStateReasonFeatureDetection struct {
-		IssueClosedStateReason struct {
-			EnumValues []struct {
-				Name string
-			} `graphql:"enumValues(includeDeprecated: true)"`
-		} `graphql:"IssueClosedStateReason: __type(name: \"IssueClosedStateReason\")"`
-	}
-
-	err = gql.Query(d.host, "IssueClosedStateReason_enumValues", &issueClosedStateReasonFeatureDetection, nil)
-	if err != nil {
-		return features, err
-	}
-
-	for _, enumValue := range issueClosedStateReasonFeatureDetection.IssueClosedStateReason.EnumValues {
-		if enumValue.Name == "DUPLICATE" {
-			features.StateReasonDuplicate = true
-			break
+	if features.StateReason {
+		for _, enumValue := range featureDetection.IssueClosedStateReason.EnumValues {
+			if enumValue.Name == "DUPLICATE" {
+				features.StateReasonDuplicate = true
+				break
+			}
 		}
 	}
 

internal/featuredetection/feature_detection_test.go

@@ -59,10 +59,7 @@ func TestIssueFeatures(t *testing.T) {
 				`query Issue_fields\b`: heredoc.Doc(`
 					{ "data": { "Issue": { "fields": [
 						{"name": "stateReason"}
-					] } } }
-				`),
-				`query IssueClosedStateReason_enumValues\b`: heredoc.Doc(`
-					{ "data": { "IssueClosedStateReason": { "enumValues": [
+					] }, "IssueClosedStateReason": { "enumValues": [
 						{"name": "COMPLETED"},
 						{"name": "NOT_PLANNED"}
 					] } } }
@@ -82,10 +79,7 @@ func TestIssueFeatures(t *testing.T) {
 				`query Issue_fields\b`: heredoc.Doc(`
 					{ "data": { "Issue": { "fields": [
 						{"name": "stateReason"}
-					] } } }
-				`),
-				`query IssueClosedStateReason_enumValues\b`: heredoc.Doc(`
-					{ "data": { "IssueClosedStateReason": { "enumValues": [
+					] }, "IssueClosedStateReason": { "enumValues": [
 						{"name": "COMPLETED"},
 						{"name": "NOT_PLANNED"},
 						{"name": "DUPLICATE"}