[BACKPORT] feat(AWS Data Source): Remove features that require write access

ngui/ui/src/components/DataSourceCredentialFields/AwsBillingBucket/AwsBillingBucket.tsx

@@ -1,11 +1,9 @@
 import { Box, Stack } from "@mui/material";
 import { useFormContext } from "react-hook-form";
 import { FormattedMessage, useIntl } from "react-intl";
-import ButtonLoader from "components/ButtonLoader";
 import Input from "components/Input";
 import QuestionMark from "components/QuestionMark";
 import { DEFAULT_MAX_INPUT_LENGTH } from "utils/constants";
-import type { AwsBillingBucketProps } from "../types";
 
 export const FIELD_NAMES = Object.freeze({
   BUCKET_NAME: "bucketName",
@@ -16,7 +14,7 @@ export const FIELD_NAMES = Object.freeze({
 
 const DEFAULT_PATH_PREFIX = "reports";
 
-const AwsBillingBucket = ({ showRoleButton }: AwsBillingBucketProps) => {
+const AwsBillingBucket = () => {
   const intl = useIntl();
 
   const {
@@ -74,19 +72,6 @@ const AwsBillingBucket = ({ showRoleButton }: AwsBillingBucketProps) => {
             })}
           />
         </Box>
-        {showRoleButton && (
-          <Box sx={{ display: "flex", alignItems: "center" }}>
-            <ButtonLoader
-              sx={{ height: 40, position: "relative", top: 2 }}
-              messageId="showRole"
-              size="medium"
-              color="primary"
-              disabled={showRoleButton.isDisabled}
-              isLoading={showRoleButton.isLoading}
-              onClick={showRoleButton.onClick}
-            />
-          </Box>
-        )}
       </Stack>
       <Input
         required
@@ -113,25 +98,6 @@ const AwsBillingBucket = ({ showRoleButton }: AwsBillingBucketProps) => {
           }
         })}
       />
-      <Input
-        dataTestId="input_region_name"
-        key={FIELD_NAMES.REGION_NAME}
-        error={!!errors[FIELD_NAMES.REGION_NAME]}
-        helperText={errors[FIELD_NAMES.REGION_NAME] && errors[FIELD_NAMES.REGION_NAME].message}
-        InputProps={{
-          endAdornment: <QuestionMark messageId="exportRegionNameTooltip" dataTestId="qmark_region_name" />
-        }}
-        label={<FormattedMessage id="exportRegionName" />}
-        {...register(FIELD_NAMES.REGION_NAME, {
-          maxLength: {
-            value: DEFAULT_MAX_INPUT_LENGTH,
-            message: intl.formatMessage(
-              { id: "maxLength" },
-              { inputName: intl.formatMessage({ id: "exportRegionName" }), max: DEFAULT_MAX_INPUT_LENGTH }
-            )
-          }
-        })}
-      />
     </>
   );
 };

ngui/ui/src/components/DataSourceDetails/Properties/AwsProperties.tsx

@@ -65,6 +65,7 @@ const AwsProperties = ({ accountId, config, createdAt }: AwsPropertiesProps) =>
         }}
       />
       <KeyValueLabel
+        variant="property"
         keyMessageId="awsAuthenticationType"
         value={<FormattedMessage id={getAwsAuthenticationTypeMessageId()} />}
         dataTestIds={{ key: "p_authentication_type_key", value: "p_authentication_type_value" }}
@@ -121,6 +122,7 @@ const AwsProperties = ({ accountId, config, createdAt }: AwsPropertiesProps) =>
           />
           {!!regionName && (
             <KeyValueLabel
+              variant="property"
               keyMessageId="exportRegionName"
               value={regionName}
               dataTestIds={{ key: "p_region_name_key", value: "p_region_name_value" }}

ngui/ui/src/components/forms/ConnectCloudAccountForm/ConnectCloudAccountForm.tsx

@@ -71,7 +71,6 @@ import {
   getAwsConnectionTypeDescriptions,
   useAuthenticationType,
   AUTHENTICATION_TYPES,
-  AWS_ROOT_INPUTS_FIELD_NAMES,
   AuthenticationType
 } from "./FormElements/AwsConnectionForm";
 import { FIELD_NAME as DATA_SOURCE_NAME_FIELD_NAME } from "./FormElements/DataSourceNameField";
@@ -158,7 +157,7 @@ const getAwsRootParameters = (formData: FieldValues, connectionType: string) =>
           bucket_prefix: formData[AWS_BILLING_BUCKET_FIELD_NAMES.BUCKET_PREFIX],
           report_name: formData[AWS_BILLING_BUCKET_FIELD_NAMES.EXPORT_NAME],
           region_name: formData[AWS_BILLING_BUCKET_FIELD_NAMES.REGION_NAME] || undefined,
-          config_scheme: formData[AWS_ROOT_INPUTS_FIELD_NAMES.CONFIG_SCHEME]
+          config_scheme: AWS_ROOT_CONNECT_CONFIG_SCHEMES.BUCKET_ONLY
         };
 
   const extraParams = {

ngui/ui/src/components/forms/ConnectCloudAccountForm/FormElements/AwsConnectionForm/AwsConnectionAccessKeyInputs.tsx

@@ -7,67 +7,24 @@ import {
   AwsRootCredentials,
   AwsUseAwsEdpDiscount
 } from "components/DataSourceCredentialFields";
-import { RadioGroup, Switch } from "components/forms/common/fields";
-import QuestionMark from "components/QuestionMark";
-import { AWS_ROOT_CONNECT_CONFIG_SCHEMES } from "utils/constants";
 import { AWS_ROOT_INPUTS_FIELD_NAMES } from "./constants";
 
 export const AwsConnectionAccessKeyInputs = ({ showAdvancesOptions = true }) => (
   <ConnectForm>
     {({ watch }) => {
-      const isFindReportWatch = watch(AWS_ROOT_INPUTS_FIELD_NAMES.IS_FIND_REPORT, true);
-      const configScheme =
-        watch(AWS_ROOT_INPUTS_FIELD_NAMES.CONFIG_SCHEME, AWS_ROOT_CONNECT_CONFIG_SCHEMES.CREATE_REPORT) ||
-        AWS_ROOT_CONNECT_CONFIG_SCHEMES.CREATE_REPORT;
+      const isFindReportWatch = watch(AWS_ROOT_INPUTS_FIELD_NAMES.IS_FIND_REPORT, false);
+
       return (
         <>
           <AwsRootCredentials />
           {showAdvancesOptions && (
             <>
               <AwsUseAwsEdpDiscount />
+              <Typography gutterBottom data-test-id="p_cost_and_usage_report_parameters_description">
+                <FormattedMessage id="costAndUsageReportParametersDescription" />
+              </Typography>
               <AwsExportType />
-              <Switch
-                name={AWS_ROOT_INPUTS_FIELD_NAMES.IS_FIND_REPORT}
-                label={<FormattedMessage id="dataExportDetection" />}
-                defaultValue={isFindReportWatch}
-                adornment={
-                  <QuestionMark
-                    messageId="dataExportDetectionTooltip"
-                    messageValues={{
-                      break: <br />
-                    }}
-                    dataTestId="qmark_data_export_detection"
-                  />
-                }
-              />
-              {!isFindReportWatch && (
-                <>
-                  <RadioGroup
-                    name={AWS_ROOT_INPUTS_FIELD_NAMES.CONFIG_SCHEME}
-                    defaultValue={configScheme}
-                    radioButtons={[
-                      {
-                        value: AWS_ROOT_CONNECT_CONFIG_SCHEMES.CREATE_REPORT,
-                        label: <FormattedMessage id="createNewCostUsageReport" />
-                      },
-                      {
-                        value: AWS_ROOT_CONNECT_CONFIG_SCHEMES.BUCKET_ONLY,
-                        label: <FormattedMessage id="connectOnlyToDataInBucket" />
-                      }
-                    ]}
-                  />
-                  <Typography gutterBottom data-test-id="p_data_export_detection_description">
-                    <FormattedMessage
-                      id={
-                        configScheme === AWS_ROOT_CONNECT_CONFIG_SCHEMES.CREATE_REPORT
-                          ? "dataExportDetectionDescription1"
-                          : "dataExportDetectionDescription2"
-                      }
-                    />
-                  </Typography>
-                  <AwsBillingBucket />
-                </>
-              )}
+              {!isFindReportWatch && <AwsBillingBucket />}
             </>
           )}
         </>

ngui/ui/src/components/forms/UpdateDataSourceCredentialsForm/FormElements/Credentials/AwsCredentials.tsx

@@ -1,6 +1,5 @@
 import { useState } from "react";
 import { Typography } from "@mui/material";
-import { useFormContext } from "react-hook-form";
 import { FormattedMessage } from "react-intl";
 import {
   AwsAssumedRoleInputs,
@@ -11,39 +10,21 @@ import {
   AwsUseAwsEdpDiscount,
   AWS_ROLE_CREDENTIALS_FIELD_NAMES
 } from "components/DataSourceCredentialFields";
-import { Switch } from "components/forms/common/fields";
 import {
   AUTHENTICATION_TYPES,
   AuthenticationTypeSelector
 } from "components/forms/ConnectCloudAccountForm/FormElements/AwsConnectionForm";
 import AwsDescription from "./AwsDescription";
-export const AWS_POOL_UPDATE_DATA_EXPORT_PARAMETERS = "updateDataExportParameters";
-
-const CostAndUsageReport = () => {
-  const { watch } = useFormContext();
-
-  const checked = watch(AWS_POOL_UPDATE_DATA_EXPORT_PARAMETERS);
-
-  return (
-    <>
-      <Switch
-        name={AWS_POOL_UPDATE_DATA_EXPORT_PARAMETERS}
-        label={
-          <Typography>
-            <FormattedMessage id="updateDataExportParameters" />
-          </Typography>
-        }
-      />
-      {checked && (
-        <>
-          <AwsExportType />
-          <AwsBillingBucket />
-        </>
-      )}
-    </>
-  );
-};
 
+const CostAndUsageReport = () => (
+  <>
+    <Typography gutterBottom data-test-id="p_cost_and_usage_report_parameters_description">
+      <FormattedMessage id="costAndUsageReportParametersDescription" />
+    </Typography>
+    <AwsExportType />
+    <AwsBillingBucket />
+  </>
+);
 const getAwsAuthType = (config) => {
   if (config.assume_role_account_id && config.assume_role_name) {
     return AUTHENTICATION_TYPES.ASSUMED_ROLE;

ngui/ui/src/translations/en-US/appOverride.json

@@ -4,6 +4,7 @@
   "abandonedInstancesTitle": "Abandoned instances",
   "abandonedKinesisStreams": "Abandoned kinesis Streams",
   "acceptInvitationTitle": "User <strong>{ownerName}</strong> ({ownerEmail}) has invited you to join the organization",
+  "accessKey": "Access key",
   "accountManagementTitle": "Account management",
   "accountType": "Account type",
   "addArtifactTitle": "Add artifact",
@@ -118,6 +119,7 @@
   "assignmentRulesPageDescription": "Allocate your resources easily — FinOps for Cloud will assign newly detected resources automatically according to the rules listed above. Rules are evaluated according to the priority. You can also force re-apply them for the whole organization or a specific pool if you need to reflect allocation policies changes immediately.",
   "assignmentRulesTabDescription": "Here you can see assignment rules that have this pool as a target. <assignmentRulesLink>See all assignment rules.</assignmentRulesLink>",
   "assignmentRulesTitle": "Assignment rules",
+  "assumedRole": "Assumed role",
   "atLeastOneBreakdownMustBeSelected": "At least one breakdown must be selected",
   "atLeastOneBucketMustBeSelected": "At least one bucket must be selected",
   "atLeastOneConditionMustBeMet": "At least <strong>one condition</strong> must be met",