Chore: Mark downstream errors and fix error with no package selected (#337)

Author: ivanahuckova

pkg/github/client/errorsourcehandling.go

@@ -14,19 +14,28 @@ import (
 )
 
 var statusErrorStringFromGraphQLPackage = "non-200 OK status code: "
+// Identified downstream errors. Unfortunately, could not find a better way to identify them.
+var (
+	downstreamErrors = []string{
+		"Could not resolve to",
+		"Your token has not been granted the required scopes to execute this query",
+	}
+)
 
 func addErrorSourceToError(err error, resp *googlegithub.Response) error {
 	// If there is no error then return nil
 	if err == nil {
 		return nil
 	}
 
-	if errors.Is(err, syscall.ECONNREFUSED) {
+	if errors.Is(err, syscall.ECONNREFUSED) || errors.Is(err, context.Canceled)  {
 		return errorsource.DownstreamError(err, false)
 	}
 
-	if errors.Is(err, context.Canceled) {	
-		return errorsource.DownstreamError(err, false)
+	for _, downstreamError := range downstreamErrors {
+		if strings.Contains(err.Error(), downstreamError) {
+			return errorsource.DownstreamError(err, false)
+		}
 	}
 	// Unfortunately graphql library that is used is not returning original error from the client.
 	// It creates a new error with "non-200 OK status code: ..." error message. It includes status code

pkg/github/client/errorsourcehandling_test.go

@@ -38,6 +38,12 @@ func TestAddErrorSourceToError(t *testing.T) {
 			resp:     nil,
 			expected: errorsource.SourceError(backend.ErrorSourceFromHTTPStatus(404), errors.New("non-200 OK status code: 404 Not Found"), false),
 		},
+		{
+			name:     "identified downstream graphql error",
+			err:      errors.New("Your token has not been granted the required scopes to execute this query"),
+			resp:     nil,
+			expected: errorsource.DownstreamError(errors.New("Your token has not been granted the required scopes to execute this query"),false),
+		},
 		{
 			name:     "response with non-2xx status code",
 			err:      errors.New("some other error"),

src/views/QueryEditorPackages.test.tsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import QueryEditorIssues, { DefaultPackageType } from './QueryEditorPackages';
+import { render } from '@testing-library/react';
+import { PackageType } from 'types';
+
+describe('QueryEditorPackages', () => {
+  it('should update package type to default one if no package is selected', async () => {
+    const props = {
+      onChange: jest.fn(),
+      packageType: undefined,
+    };
+    render(<QueryEditorIssues {...props} />);
+    expect(props.onChange).toHaveBeenCalledTimes(1);
+    expect(props.onChange).toHaveBeenCalledWith({ packageType: DefaultPackageType, onChange: props.onChange });
+  });
+  it('should not update package type to default one if package type is provided ', async () => {
+    const props = {
+      onChange: jest.fn(),
+      packageType: PackageType.DOCKER,
+    };
+    render(<QueryEditorIssues {...props} />);
+    expect(props.onChange).not.toHaveBeenCalled();
+  });
+});

src/views/QueryEditorPackages.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { Input, Select, InlineField } from '@grafana/ui';
 import { SelectableValue } from '@grafana/data';
@@ -10,7 +10,7 @@ interface Props extends PackagesOptions {
   onChange: (value: PackagesOptions) => void;
 }
 
-const DefaultPackageType = PackageType.NPM;
+export const DefaultPackageType = PackageType.NPM;
 
 const packageTypeOptions: Array<SelectableValue<string>> = Object.keys(PackageType).map((v) => {
   return {
@@ -22,6 +22,16 @@ const packageTypeOptions: Array<SelectableValue<string>> = Object.keys(PackageTy
 const QueryEditorPackages = (props: Props) => {
   const [names, setNames] = useState<string>(props.names || '');
 
+  // Set default package type if not set
+  useEffect(() => {
+    if (!props.packageType) {
+      props.onChange({
+        ...props,
+        packageType: DefaultPackageType,
+      });
+    }
+  }, [props]);
+
   return (
     <>
       <InlineField labelWidth={LeftColumnWidth * 2} label="Package type">