Merge pull request cli#4087 from cli/graphql-error-fix

mislav · web-flow · commit 95a515ecf0d9 · 2021-08-04T15:43:00.000+02:00
Fix unmarshalling GraphQL error type
diff --git a/api/client.go b/api/client.go
@@ -123,8 +123,8 @@ type graphQLResponse struct {
 // GraphQLError is a single error returned in a GraphQL response
 type GraphQLError struct {
 	Type    string
-	Path    []string
 	Message string
+	// Path []interface // mixed strings and numbers
 }
 
 // GraphQLErrorResponse contains errors returned in a GraphQL response
diff --git a/pkg/cmd/secret/set/http.go b/pkg/cmd/secret/set/http.go
@@ -130,17 +130,7 @@ func mapRepoNameToID(client *api.Client, host, orgName string, repositoryNames [
 		DatabaseID int `json:"databaseId"`
 	})
 
-	err := client.GraphQL(host, query, nil, &graphqlResult)
-
-	gqlErr, isGqlErr := err.(*api.GraphQLErrorResponse)
-	if isGqlErr {
-		for _, ge := range gqlErr.Errors {
-			if ge.Type == "NOT_FOUND" {
-				return nil, fmt.Errorf("could not find %s/%s", orgName, ge.Path[0])
-			}
-		}
-	}
-	if err != nil {
+	if err := client.GraphQL(host, query, nil, &graphqlResult); err != nil {
 		return nil, fmt.Errorf("failed to look up repositories: %w", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -123,8 +123,8 @@ type graphQLResponse struct {`
`123`	`123`	`// GraphQLError is a single error returned in a GraphQL response`
`124`	`124`	`type GraphQLError struct {`
`125`	`125`	`Type string`
`126`		`- Path []string`
`127`	`126`	`Message string`
	`127`	`+ // Path []interface // mixed strings and numbers`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`// GraphQLErrorResponse contains errors returned in a GraphQL response`