Merge pull request #4203 from dlabrecq/ocp

Use openshift query param only for account only

Author: dlabrecq

src/api/resources/awsOcpResource.ts

@@ -15,7 +15,7 @@ export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
 
 export function runResource(resourceType: ResourceType, query: string) {
   const path = ResourceTypePaths[resourceType];
-  const openshiftParam = resourceType === ResourceType.aws_category ? '' : 'openshift=true';
+  const openshiftParam = resourceType === ResourceType.account ? 'openshift=true' : '';
   let queryString;
 
   if (openshiftParam && query) {

src/api/resources/azureOcpResource.test.ts

@@ -5,5 +5,5 @@ import { ResourceType } from './resource';
 
 test('runExport API request for OCP on Azure', () => {
   runResource(ResourceType.subscriptionGuid, '');
-  expect(axiosInstance.get).toBeCalledWith('resource-types/azure-subscription-guids/?');
+  expect(axiosInstance.get).toBeCalledWith('resource-types/azure-subscription-guids/?openshift=true');
 });

src/api/resources/azureOcpResource.ts

@@ -14,5 +14,15 @@ export const ResourceTypePaths: Partial<Record<ResourceType, string>> = {
 
 export function runResource(resourceType: ResourceType, query: string) {
   const path = ResourceTypePaths[resourceType];
-  return axiosInstance.get<Resource>(`${path}?${query}`);
+  const openshiftParam = resourceType === ResourceType.subscriptionGuid ? 'openshift=true' : '';
+  let queryString;
+
+  if (openshiftParam && query) {
+    queryString = `?${openshiftParam}&${query}`;
+  } else if (openshiftParam) {
+    queryString = `?${openshiftParam}`;
+  } else if (query) {
+    queryString = `?${query}`;
+  }
+  return axiosInstance.get<Resource>(`${path}${queryString}`);
 }