Skip to content

change: [STORIF-33] - Remove Object Storage Gen2 whitelisted regions #12945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

change: [STORIF-33] - Remove Object Storage Gen2 whitelisted regions #12945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions packages/manager/src/components/RegionSelect/RegionMultiSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {
disabled,
disabledRegions: disabledRegionsFromProps,
errorText,
forcefullyShownRegionIds,
helperText,
isClearable,
isGeckoLAEnabled,
Expand All @@ -65,7 +64,6 @@ export const RegionMultiSelect = React.memo((props: RegionMultiSelectProps) => {

const regionOptions = getRegionOptions({
currentCapability,
forcefullyShownRegionIds,
regions,
});

Expand Down
2 changes: 0 additions & 2 deletions packages/manager/src/components/RegionSelect/RegionSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export const RegionSelect = <
disabled,
disabledRegions: disabledRegionsFromProps,
errorText,
forcefullyShownRegionIds,
helperText,
isGeckoLAEnabled,
label,
Expand All @@ -62,7 +61,6 @@ export const RegionSelect = <

const regionOptions = getRegionOptions({
currentCapability,
forcefullyShownRegionIds,
regionFilter,
regions,
});
Expand Down
10 changes: 0 additions & 10 deletions packages/manager/src/components/RegionSelect/RegionSelect.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
/**
Expand Down
6 changes: 0 additions & 6 deletions packages/manager/src/components/RegionSelect/RegionSelect.utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 0 additions & 8 deletions ...manager/src/features/ObjectStorage/AccessKeyLanding/AccessKeyRegions/AccessKeyRegions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;

Expand All @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions packages/manager/src/features/ObjectStorage/BucketLanding/BucketRegions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -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}
Expand Down
9 changes: 0 additions & 9 deletions packages/manager/src/features/ObjectStorage/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down