Merge pull request RedHatInsights#918 from rvsia/updateCommandsForAzureCost

Update commands for Azure + Cost

Author: Hyperkid123

src/components/addSourceWizard/hardcodedComponents/azure/costManagement.js

@@ -14,6 +14,7 @@ import {
 
 import { HCCM_DOCS_PREFIX } from '../../stringConstants';
 import useFormApi from '@data-driven-forms/react-form-renderer/use-form-api';
+import FormSpy from '@data-driven-forms/react-form-renderer/form-spy';
 
 const CREATE_AZURE_STORAGE = `${HCCM_DOCS_PREFIX}/html-single/adding_a_microsoft_azure_source_to_cost_management/index#creating-an-azure-storage-account_adding-an-azure-source`;
 const AZURE_CREDS_URL = `${HCCM_DOCS_PREFIX}/html-single/adding_a_microsoft_azure_source_to_cost_management/index#configuring-azure-roles_adding-an-azure-source`;
@@ -72,6 +73,9 @@ export const SubscriptionID = () => {
 export const ConfigureRolesDescription = () => {
   const intl = useIntl();
 
+  const { getState } = useFormApi();
+  const values = getState().values;
+
   return (
     <TextContent>
       <Text component={TextVariants.p}>
@@ -100,15 +104,15 @@ export const ConfigureRolesDescription = () => {
             'Run the following command in Cloud Shell to create a Cost Management Storage Account Contributor role. From the output enter the values in the fields below:',
         })}
       </Text>
-      <ClipboardCopy>{`az ad sp create-for-rbac -n "CostManagement" --role "Storage Account Contributor" --query '{"tenant": tenant, "client_id": appId, "secret": password}'`}</ClipboardCopy>
+      <ClipboardCopy>{`az ad sp create-for-rbac -n "CostManagement" --role "Storage Account Contributor"  --scope /subscriptions/${values?.application?.extra?.subscription_id}/resourceGroups/${values?.application?.extra?.resource_group} --query '{"tenant": tenant, "client_id": appId, "secret": password}'`}</ClipboardCopy>
     </TextContent>
   );
 };
 
-export const ReaderRoleDescription = () => {
+const InternalReaderRoleDescription = () => {
   const form = useFormApi();
   const {
-    values: { application },
+    values: { authentication },
   } = form.getState();
   const intl = useIntl();
 
@@ -120,11 +124,17 @@ export const ReaderRoleDescription = () => {
           defaultMessage: 'Run the following command in Cloud Shell to create a Cost Management Reader role:',
         })}
       </Text>
-      <ClipboardCopy>{`az role assignment create --role "Cost Management Reader" --assignee http://CostManagement --subscription ${application.extra.subscription_id}`}</ClipboardCopy>
+      <ClipboardCopy>
+        {`az role assignment create --assignee "${authentication?.username}" --role "Cost Management Reader"`}
+      </ClipboardCopy>
     </TextContent>
   );
 };
 
+export const ReaderRoleDescription = () => (
+  <FormSpy subscription={{ values: true }}>{() => <InternalReaderRoleDescription />}</FormSpy>
+);
+
 export const ExportSchedule = () => {
   const intl = useIntl();
 

src/test/addSourceWizard/addSourceWizard/hardCodedComponents/cost_management_azure.test.js

@@ -4,6 +4,7 @@ import { screen } from '@testing-library/react';
 
 import * as Cm from '.../../../../components/addSourceWizard/hardcodedComponents/azure/costManagement';
 import RenderContext from '@data-driven-forms/react-form-renderer/renderer-context';
+import Form from '@data-driven-forms/react-form-renderer/form';
 import render from '../../__mocks__/render';
 
 describe('Cost Management Azure steps components', () => {
@@ -32,7 +33,19 @@ describe('Cost Management Azure steps components', () => {
   });
 
   it('Configure Roles description', () => {
-    render(<Cm.ConfigureRolesDescription />);
+    render(
+      <RenderContext.Provider
+        value={{
+          formOptions: {
+            getState: () => ({
+              values: { application: { extra: { subscription_id: 'my-sub-id-1', resource_group: 'my-resource-group-1' } } },
+            }),
+          },
+        }}
+      >
+        <Cm.ConfigureRolesDescription />
+      </RenderContext.Provider>
+    );
 
     expect(
       screen.getByText(
@@ -47,24 +60,30 @@ describe('Cost Management Azure steps components', () => {
       )
     ).toBeInTheDocument();
     expect(screen.getByLabelText('Copyable input')).toHaveValue(
-      `az ad sp create-for-rbac -n "CostManagement" --role "Storage Account Contributor" --query '{"tenant": tenant, "client_id": appId, "secret": password}'`
+      `az ad sp create-for-rbac -n "CostManagement" --role "Storage Account Contributor"  --scope /subscriptions/my-sub-id-1/resourceGroups/my-resource-group-1 --query '{"tenant": tenant, "client_id": appId, "secret": password}'`
     );
   });
 
   it('Read Role description', () => {
     render(
-      <RenderContext.Provider
-        value={{ formOptions: { getState: () => ({ values: { application: { extra: { subscription_id: 'my-sub-id-1' } } } }) } }}
-      >
-        <Cm.ReaderRoleDescription />
-      </RenderContext.Provider>
+      <Form onSubmit={jest.fn()}>
+        {() => (
+          <RenderContext.Provider
+            value={{
+              formOptions: { getState: () => ({ values: { authentication: { username: 'some-user-name' } } }) },
+            }}
+          >
+            <Cm.ReaderRoleDescription />
+          </RenderContext.Provider>
+        )}
+      </Form>
     );
 
     expect(
       screen.getByText('Run the following command in Cloud Shell to create a Cost Management Reader role:')
     ).toBeInTheDocument();
     expect(screen.getByLabelText('Copyable input')).toHaveValue(
-      `az role assignment create --role "Cost Management Reader" --assignee http://CostManagement --subscription my-sub-id-1`
+      `az role assignment create --assignee "some-user-name" --role "Cost Management Reader"`
     );
   });