change: [STORIF-33] Whitelisted regions removed.

Author: dchyrva-akamai

packages/manager/src/components/RegionSelect/RegionMultiSelect.tsx

@@ -45,7 +45,6 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
     disabled,
     disabledRegions: disabledRegionsFromProps,
     errorText,
-    forcefullyShownRegionIds,
     helperText,
     isClearable,
     isGeckoLAEnabled,
@@ -65,7 +64,6 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
 
   const regionOptions = getRegionOptions({
     currentCapability,
-    forcefullyShownRegionIds,
     regions,
   });
 

packages/manager/src/components/RegionSelect/RegionSelect.tsx

@@ -41,7 +41,6 @@ export const RegionSelect = <
     disabled,
     disabledRegions: disabledRegionsFromProps,
     errorText,
-    forcefullyShownRegionIds,
     helperText,
     isGeckoLAEnabled,
     label,
@@ -62,7 +61,6 @@ export const RegionSelect = <
 
   const regionOptions = getRegionOptions({
     currentCapability,
-    forcefullyShownRegionIds,
     regionFilter,
     regions,
   });

packages/manager/src/components/RegionSelect/RegionSelect.types.ts

@@ -39,11 +39,6 @@ export interface RegionSelectProps<
    * A key/value object for disabling regions by their ID.
    */
   disabledRegions?: Record<string, DisableItemOption>;
-  /**
-   * Used to override filtering done by the `currentCapability` prop
-   * @todo Remove this after Object Storage Gen2.
-   */
-  forcefullyShownRegionIds?: Set<string>;
   helperText?: string;
   /**
    * `isGeckoLAEnabled` flag from `useIsGeckoEnabled` hook
@@ -73,11 +68,6 @@ export interface RegionMultiSelectProps
   > {
   currentCapability: Capabilities | undefined;
   disabledRegions?: Record<string, DisableItemOption>;
-  /**
-   * Used to override filtering done by the `currentCapability` prop
-   * @todo Remove this after Object Storage Gen2.
-   */
-  forcefullyShownRegionIds?: Set<string>;
   helperText?: string;
   isClearable?: boolean;
   /**

packages/manager/src/components/RegionSelect/RegionSelect.utils.tsx

@@ -15,23 +15,17 @@ const NORTH_AMERICA = CONTINENT_CODE_TO_CONTINENT.NA;
 
 interface RegionSelectOptions {
   currentCapability: Capabilities | undefined;
-  forcefullyShownRegionIds?: Set<string>;
   regionFilter?: RegionFilterValue;
   regions: Region[];
 }
 
 export const getRegionOptions = ({
   currentCapability,
-  forcefullyShownRegionIds,
   regionFilter,
   regions,
 }: RegionSelectOptions) => {
   return regions
     .filter((region) => {
-      if (forcefullyShownRegionIds?.has(region.id)) {
-        return true;
-      }
-
       if (
         currentCapability &&
         !region.capabilities.includes(currentCapability)

packages/manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyRegions/AccessKeyRegions.tsx

@@ -6,9 +6,6 @@ import { RegionMultiSelect } from 'src/components/RegionSelect/RegionMultiSelect
 import { useObjectStorageRegions } from 'src/features/ObjectStorage/hooks/useObjectStorageRegions';
 import { useFlags } from 'src/hooks/useFlags';
 
-import { useIsObjectStorageGen2Enabled } from '../../hooks/useIsObjectStorageGen2Enabled';
-import { WHITELISTED_REGIONS } from '../../utilities';
-
 import type { Region } from '@linode/api-v4';
 
 interface Props {
@@ -35,8 +32,6 @@ export const AccessKeyRegions = (props: Props) => {
   const { allRegionsError, availableStorageRegions } =
     useObjectStorageRegions();
 
-  const { isObjectStorageGen2Enabled } = useIsObjectStorageGen2Enabled();
-
   // Error could be: 1. General Regions error, 2. Field error, 3. Nothing
   const errorText = error || allRegionsError?.[0]?.reason;
 
@@ -45,9 +40,6 @@ export const AccessKeyRegions = (props: Props) => {
       currentCapability="Object Storage"
       disabled={disabled}
       errorText={errorText}
-      forcefullyShownRegionIds={
-        isObjectStorageGen2Enabled ? WHITELISTED_REGIONS : undefined
-      }
       isClearable={false}
       isGeckoLAEnabled={isGeckoLAEnabled}
       label="Regions"

packages/manager/src/features/ObjectStorage/BucketLanding/BucketRegions.tsx

@@ -5,9 +5,6 @@ import { RegionSelect } from 'src/components/RegionSelect/RegionSelect';
 import { useObjectStorageRegions } from 'src/features/ObjectStorage/hooks/useObjectStorageRegions';
 import { useFlags } from 'src/hooks/useFlags';
 
-import { useIsObjectStorageGen2Enabled } from '../hooks/useIsObjectStorageGen2Enabled';
-import { WHITELISTED_REGIONS } from '../utilities';
-
 interface Props {
   disabled?: boolean;
   error?: string;
@@ -23,8 +20,6 @@ export const BucketRegions = (props: Props) => {
   const { allRegionsError, availableStorageRegions } =
     useObjectStorageRegions();
 
-  const { isObjectStorageGen2Enabled } = useIsObjectStorageGen2Enabled();
-
   const flags = useFlags();
   const { isGeckoLAEnabled } = useIsGeckoEnabled(
     flags.gecko2?.enabled,
@@ -40,9 +35,6 @@ export const BucketRegions = (props: Props) => {
       disableClearable
       disabled={disabled}
       errorText={errorText}
-      forcefullyShownRegionIds={
-        isObjectStorageGen2Enabled ? WHITELISTED_REGIONS : undefined
-      }
       isGeckoLAEnabled={isGeckoLAEnabled}
       label="Region"
       onBlur={onBlur}

packages/manager/src/features/ObjectStorage/utilities.ts

@@ -168,15 +168,6 @@ export const objectACLHelperText: Record<string, string> = {
   'public-read-write': 'Public Read/Write ACL',
 };
 
-// @TODO: OBJ Gen2: This should be removed once these regions obtain the `Object Storage` capability.
-export const WHITELISTED_REGIONS = new Set([
-  'gb-lon',
-  'au-mel',
-  'in-bom-2',
-  'de-fra-2',
-  'sg-sin-2',
-]);
-
 /**
  * For OBJ Gen2 users, filter regions based on available Object Storage endpoints.
  * Otherwise, we return the regions as is.