Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Remove references to fly (#48648)

Joshen Lima0cec24f499b
diff --git a/apps/studio/components/interfaces/Billing/Subscription/Subscription.utils.ts b/apps/studio/components/interfaces/Billing/Subscription/Subscription.utils.ts
index 1b1536bce61..a97104d3163 100644
--- a/apps/studio/components/interfaces/Billing/Subscription/Subscription.utils.ts
+++ b/apps/studio/components/interfaces/Billing/Subscription/Subscription.utils.ts
@@ -22,8 +22,6 @@ export const billingPartnerLabel = (billingPartner?: string) => {
if (!billingPartner) return billingPartner
switch (billingPartner) {
- case 'fly':
- return 'Fly.io'
case 'aws':
return 'AWS'
case 'vercel_marketplace':
diff --git a/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx b/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx
index dee242222e1..3afc8d9edc4 100644
--- a/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/DatabaseBackupsNav.tsx
@@ -9,7 +9,7 @@ type Props = {
}
function DatabaseBackupsNav({ active }: Props) {
- const { ref, cloud_provider } = useSelectedProjectQuery()?.data || {}
+ const { ref } = useSelectedProjectQuery()?.data || {}
const { databaseRestoreToNewProject } = useIsFeatureEnabled(['database:restore_to_new_project'])
const navMenuItems = [
@@ -26,7 +26,7 @@ function DatabaseBackupsNav({ active }: Props) {
href: `/project/${ref}/database/backups/pitr`,
},
{
- enabled: databaseRestoreToNewProject && cloud_provider !== 'FLY',
+ enabled: databaseRestoreToNewProject,
id: 'rtnp',
label: (
<div className="flex items-center gap-2">
diff --git a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
index b16f953cf45..74458383ac0 100644
--- a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
+++ b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
@@ -157,23 +157,6 @@ export const EnableExtensionModal = ({
</Admonition>
)}
- {extension.name === 'pg_cron' && project?.cloud_provider === 'FLY' && (
- <Admonition
- type="warning"
- title="The pg_cron extension is not fully supported for Fly projects"
- className="border-x-0 border-t-0 rounded-none"
- >
- <p>
- You can still enable the extension, but pg_cron jobs may not run due to the behavior
- of Fly projects.
- </p>
- <DocsButton
- className="mt-2"
- href={`${DOCS_URL}/guides/platform/fly-postgres#limitations`}
- />
- </Admonition>
- )}
-
<DialogSection>
<Form {...form}>
<form id="enable-extensions-form" onSubmit={form.handleSubmit(onSubmit)}>
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagement.schema.ts b/apps/studio/components/interfaces/DiskManagement/DiskManagement.schema.ts
index ff1743668c9..1eaca89eb59 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagement.schema.ts
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagement.schema.ts
@@ -57,11 +57,10 @@ export const CreateDiskStorageSchema = ({
cloudProvider: CloudProvider
isSpendCapEnabled: boolean
}) => {
- const isFlyProject = cloudProvider === 'FLY'
const isAwsNimbusProject = cloudProvider === 'AWS_NIMBUS'
const isAwsK8sProject = cloudProvider === 'AWS_K8S'
- const validateDiskConfiguration = !isFlyProject && !isAwsNimbusProject && !isAwsK8sProject
+ const validateDiskConfiguration = !isAwsNimbusProject && !isAwsK8sProject
const schema = baseSchema.superRefine((data, ctx) => {
const { storageType, totalSize, provisionedIOPS, throughput, maxSizeGb, computeSize } = data
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagement.test.ts b/apps/studio/components/interfaces/DiskManagement/DiskManagement.test.ts
index 74a67404a06..84d3719eb78 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagement.test.ts
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagement.test.ts
@@ -267,7 +267,7 @@ describe('CreateDiskStorageSchema', () => {
)
})
- test.each(['FLY', 'AWS_NIMBUS', 'AWS_K8S'] as const)(
+ test.each(['AWS_NIMBUS', 'AWS_K8S'] as const)(
'skips platform disk constraints for %s projects',
(cloudProvider) => {
const schema = CreateDiskStorageSchema({
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx
index 8acdbfccf65..c7ab026d82d 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.sections.tsx
@@ -102,7 +102,7 @@ function getDiskNoticeDescription({
if (isBranch) {
return 'Delete and recreate your Preview Branch to configure disk size. It was deployed on an older branching infrastructure.'
}
- return 'The Fly Postgres offering is deprecated - please migrate your instance to the AWS cloud provider to configure your disk.'
+ return undefined
}
export function DiskSection({
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
index b019b69a5f7..29e24c6c040 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
@@ -73,8 +73,7 @@ export function DiskManagementForm({ chartsClassName }: { chartsClassName?: stri
const computeSettingsRef = useRef<HTMLDivElement>(null)
const diskSizeSettingsRef = useRef<HTMLDivElement>(null)
- const isSpendCapEnabled =
- org?.plan.id !== 'free' && !org?.usage_billing_enabled && project?.cloud_provider !== 'FLY'
+ const isSpendCapEnabled = org?.plan.id !== 'free' && !org?.usage_billing_enabled
const { data: resourceWarnings } = useResourceWarningsQuery({ ref: projectRef })
// [Joshen Cleanup] JFYI this client side filtering can be cleaned up once BE changes are live which will only return the warnings based on the provided ref
diff --git a/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsx b/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsx
index 8b4342b999f..98018d5d9c7 100644
--- a/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsx
@@ -38,7 +38,7 @@ export function DiskSizeField({ form, disableInput }: DiskSizeFieldProps) {
const { error: diskAttributesError, isError: isDiskAttributesError } = useDiskAttributesQuery(
{ projectRef },
- { enabled: project && project.cloud_provider !== 'FLY' }
+ { enabled: !!project }
)
const {
diff --git a/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsx b/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsx
index 284c0cbc53f..867315fea75 100644
--- a/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsx
@@ -4,7 +4,6 @@ import { AlertDescription, AlertTitle, buttonVariants, cn } from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
interface SpendCapDisabledSectionProps {
currentDiskSizeGb?: number
@@ -12,14 +11,8 @@ interface SpendCapDisabledSectionProps {
export function SpendCapDisabledSection({ currentDiskSizeGb }: SpendCapDisabledSectionProps) {
const { data: org, isPending: isOrgPending } = useSelectedOrganizationQuery()
- const { data: project, isPending: isProjectPending } = useSelectedProjectQuery()
- const isSpendCapEnabled =
- !isOrgPending &&
- !isProjectPending &&
- org?.plan.id !== 'free' &&
- !org?.usage_billing_enabled &&
- project?.cloud_provider !== 'FLY'
+ const isSpendCapEnabled = !isOrgPending && org?.plan.id !== 'free' && !org?.usage_billing_enabled
const showAutoExpandNotice =
isSpendCapEnabled &&
diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts b/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts
index c77d48d680b..a316856a645 100644
--- a/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts
+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectCreation.utils.ts
@@ -1,5 +1,5 @@
import type { CloudProvider, Region } from 'shared-data'
-import { AWS_REGIONS, FLY_REGIONS } from 'shared-data'
+import { AWS_REGIONS } from 'shared-data'
import { SMART_REGION_TO_EXACT_REGION_MAP } from 'shared-data/regions'
import { DesiredInstanceSize, instanceSizeSpecs } from '@/data/projects/new-project.constants'
@@ -25,8 +25,6 @@ export function getAvailableRegions(cloudProvider: CloudProvider): Region {
return {
EAST_US: AWS_REGIONS.EAST_US,
}
- case 'FLY':
- return FLY_REGIONS
default:
throw new Error('Invalid cloud provider')
}
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts
index 79a3b89516e..25736d4eb57 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants.ts
@@ -89,12 +89,7 @@ export const AWS_REGIONS_COORDINATES: { [key: string]: [number, number] } = {
WEST_EU_3: [2.35, 48.86],
}
-export const FLY_REGIONS_COORDINATES: { [key: string]: [number, number] } = {
- SOUTHEAST_ASIA: [103.8, 1.37],
-}
-
// [Joshen] Just to make sure that we just depend on AWS_REGIONS to determine available
-// regions for replicas. Just FYI - might need to update this if we support Fly in future
export const AVAILABLE_REPLICA_REGIONS: Region[] = Object.keys(AWS_REGIONS)
.map((key) => {
return {
diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts
index ee48ae2564c..87f9d424722 100644
--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts
+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.utils.ts
@@ -78,10 +78,7 @@ export const generateNodes = ({
type: 'PRIMARY',
data: {
id: primary.identifier,
- region:
- primary.cloud_provider === 'FLY'
- ? { name: 'Singapore (sin)', key: 'SOUTHEAST_ASIA' }
- : (primaryRegion ?? { name: primary.region }),
+ region: primaryRegion ?? { name: primary.region },
provider: primary.cloud_provider,
inserted_at: primary.inserted_at,
computeSize: primary.size,
diff --git a/apps/studio/data/misc/get-default-region-query.ts b/apps/studio/data/misc/get-default-region-query.ts
index 98e5be1c18e..d2c17c15060 100644
--- a/apps/studio/data/misc/get-default-region-query.ts
+++ b/apps/studio/data/misc/get-default-region-query.ts
@@ -1,14 +1,11 @@
import { useQuery } from '@tanstack/react-query'
import { useFlag } from 'common'
import type { CloudProvider } from 'shared-data'
-import { AWS_REGIONS, FLY_REGIONS } from 'shared-data'
+import { AWS_REGIONS } from 'shared-data'
import { miscKeys } from './keys'
import { COUNTRY_LAT_LON } from '@/components/interfaces/ProjectCreation/ProjectCreation.constants'
-import {
- AWS_REGIONS_COORDINATES,
- FLY_REGIONS_COORDINATES,
-} from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'
+import { AWS_REGIONS_COORDINATES } from '@/components/interfaces/Settings/Infrastructure/InfrastructureConfiguration/InstanceConfiguration.constants'
import { fetchHandler } from '@/data/fetchers'
import { getDistanceLatLonKM, tryParseJson } from '@/lib/helpers'
import type { ResponseError, UseCustomQueryOptions } from '@/types'
@@ -37,15 +34,12 @@ export async function getDefaultRegionOption({
if (locLatLon === undefined) return undefined
- const isAWSProvider = ['AWS', 'AWS_K8S'].includes(cloudProvider)
-
- const allRegions = isAWSProvider ? AWS_REGIONS_COORDINATES : FLY_REGIONS_COORDINATES
const locations =
useRestrictedPool && restrictedPool
- ? Object.entries(allRegions)
+ ? Object.entries(AWS_REGIONS_COORDINATES)
.filter((x) => restrictedPool.includes(x[0]))
.reduce((o, val) => ({ ...o, [val[0]]: val[1] }), {})
- : allRegions
+ : AWS_REGIONS_COORDINATES
const distances = Object.keys(locations).map((reg) => {
const region: { lat: number; lon: number } = {
@@ -57,9 +51,7 @@ export async function getDefaultRegionOption({
const shortestDistance = Math.min(...distances)
const closestRegion = Object.keys(locations)[distances.indexOf(shortestDistance)]
- return isAWSProvider
- ? AWS_REGIONS[closestRegion as keyof typeof AWS_REGIONS].displayName
- : FLY_REGIONS[closestRegion as keyof typeof FLY_REGIONS].displayName
+ return AWS_REGIONS[closestRegion as keyof typeof AWS_REGIONS].displayName
} catch (error) {
throw error
}
diff --git a/apps/studio/data/projects/new-project.constants.ts b/apps/studio/data/projects/new-project.constants.ts
index 3f67dd7e373..ca08d47059a 100644
--- a/apps/studio/data/projects/new-project.constants.ts
+++ b/apps/studio/data/projects/new-project.constants.ts
@@ -32,12 +32,7 @@ export const instanceSizeSpecs: Record<
cpu: '2-core',
priceHourly: 0.01344,
priceMonthly: 10,
- cloud_providers: [
- PROVIDERS.AWS.id,
- PROVIDERS.AWS_K8S.id,
- PROVIDERS.AWS_NIMBUS.id,
- PROVIDERS.FLY.id,
- ],
+ cloud_providers: [PROVIDERS.AWS.id, PROVIDERS.AWS_K8S.id, PROVIDERS.AWS_NIMBUS.id],
},
small: {
label: 'Small',
@@ -45,12 +40,7 @@ export const instanceSizeSpecs: Record<
cpu: '2-core',
priceHourly: 0.0206,
priceMonthly: 15,
- cloud_providers: [
- PROVIDERS.AWS.id,
- PROVIDERS.AWS_K8S.id,
- PROVIDERS.AWS_NIMBUS.id,
- PROVIDERS.FLY.id,
- ],
+ cloud_providers: [PROVIDERS.AWS.id, PROVIDERS.AWS_K8S.id, PROVIDERS.AWS_NIMBUS.id],
},
medium: {
label: 'Medium',
@@ -58,12 +48,7 @@ export const instanceSizeSpecs: Record<
cpu: '2-core',
priceHourly: 0.0822,
priceMonthly: 60,
- cloud_providers: [
- PROVIDERS.AWS.id,
- PROVIDERS.AWS_K8S.id,
- PROVIDERS.AWS_NIMBUS.id,
- PROVIDERS.FLY.id,
- ],
+ cloud_providers: [PROVIDERS.AWS.id, PROVIDERS.AWS_K8S.id, PROVIDERS.AWS_NIMBUS.id],
},
large: {
label: 'Large',
@@ -71,12 +56,7 @@ export const instanceSizeSpecs: Record<
cpu: '2-core',
priceHourly: 0.1517,
priceMonthly: 110,
- cloud_providers: [
- PROVIDERS.AWS.id,
- PROVIDERS.AWS_K8S.id,
- PROVIDERS.AWS_NIMBUS.id,
- PROVIDERS.FLY.id,
- ],
+ cloud_providers: [PROVIDERS.AWS.id, PROVIDERS.AWS_K8S.id, PROVIDERS.AWS_NIMBUS.id],
},
xlarge: {
label: 'XL',
@@ -84,12 +64,7 @@ export const instanceSizeSpecs: Record<
cpu: '4-core',
priceHourly: 0.2877,
priceMonthly: 210,
- cloud_providers: [
- PROVIDERS.AWS.id,
- PROVIDERS.AWS_K8S.id,
- PROVIDERS.AWS_NIMBUS.id,
- PROVIDERS.FLY.id,
- ],
+ cloud_providers: [PROVIDERS.AWS.id, PROVIDERS.AWS_K8S.id, PROVIDERS.AWS_NIMBUS.id],
},
'2xlarge': {
label: '2XL',
@@ -97,12 +72,7 @@ export const instanceSizeSpecs: Record<
cpu: '8-core',
priceHourly: 0.562,
priceMonthly: 410,
- cloud_providers: [
- PROVIDERS.AWS.id,
- PROVIDERS.AWS_K8S.id,
- PROVIDERS.AWS_NIMBUS.id,
- PROVIDERS.FLY.id,
- ],
+ cloud_providers: [PROVIDERS.AWS.id, PROVIDERS.AWS_K8S.id, PROVIDERS.AWS_NIMBUS.id],
},
'4xlarge': {
label: '4XL',
@@ -110,12 +80,7 @@ export const instanceSizeSpecs: Record<
cpu: '16-core',
priceHourly: 1.32,
priceMonthly: 960,
- cloud_providers: [
- PROVIDERS.AWS.id,
- PROVIDERS.AWS_K8S.id,
- PROVIDERS.AWS_NIMBUS.id,
- PROVIDERS.FLY.id,
- ],
+ cloud_providers: [PROVIDERS.AWS.id, PROVIDERS.AWS_K8S.id, PROVIDERS.AWS_NIMBUS.id],
},
'8xlarge': {
label: '8XL',
diff --git a/apps/studio/lib/constants/infrastructure.ts b/apps/studio/lib/constants/infrastructure.ts
index 6da86976f6d..d25d74cf125 100644
--- a/apps/studio/lib/constants/infrastructure.ts
+++ b/apps/studio/lib/constants/infrastructure.ts
@@ -1,4 +1,4 @@
-import { AWS_REGIONS, FLY_REGIONS } from 'shared-data'
+import { AWS_REGIONS } from 'shared-data'
import type { components } from '@/data/api'
import { useCustomContent } from '@/hooks/custom-content/useCustomContent'
@@ -8,9 +8,6 @@ export const AWS_REGIONS_DEFAULT =
? AWS_REGIONS.SOUTHEAST_ASIA
: AWS_REGIONS.EAST_US_2
-// TO DO, change default to US region for prod
-export const FLY_REGIONS_DEFAULT = FLY_REGIONS.SOUTHEAST_ASIA
-
export const MANAGED_BY = {
VERCEL_MARKETPLACE: 'vercel-marketplace',
AWS_MARKETPLACE: 'aws-marketplace',
@@ -47,12 +44,6 @@ export function useDefaultProvider() {
}
export const PROVIDERS = {
- FLY: {
- id: 'FLY',
- name: 'Fly.io',
- default_region: FLY_REGIONS_DEFAULT,
- regions: { ...FLY_REGIONS },
- },
AWS: {
id: 'AWS',
name: 'AWS',
diff --git a/apps/studio/pages/project/[ref]/observability/database.tsx b/apps/studio/pages/project/[ref]/observability/database.tsx
index 980782d0b92..86956d32ab5 100644
--- a/apps/studio/pages/project/[ref]/observability/database.tsx
+++ b/apps/studio/pages/project/[ref]/observability/database.tsx
@@ -136,10 +136,7 @@ const DatabaseUsage = () => {
)
const entitledFeatures = getEntitlementSetValues()
- const isSpendCapEnabled =
- entitledFeatures.includes('database') &&
- !org?.usage_billing_enabled &&
- project?.cloud_provider !== 'FLY'
+ const isSpendCapEnabled = entitledFeatures.includes('database') && !org?.usage_billing_enabled
const showDiskIOBurstBalanceChart = useFlag('showDiskIOBurstBalanceChart')
const showMemoryCommitmentChart = useFlag('showMemoryCommitmentChart')
diff --git a/packages/shared-data/index.ts b/packages/shared-data/index.ts
index e3f00b89ba9..3af6c105e2c 100644
--- a/packages/shared-data/index.ts
+++ b/packages/shared-data/index.ts
@@ -16,7 +16,7 @@ import { pricing } from './pricing'
import { PRODUCT_MODULES, products } from './products'
import questions from './questions'
import type { AWS_REGIONS_KEYS, CloudProvider, Region } from './regions'
-import { AWS_REGIONS, FLY_REGIONS } from './regions'
+import { AWS_REGIONS } from './regions'
import tweets, { topTweets } from './tweets'
export {
@@ -32,7 +32,6 @@ export {
ERROR_CODES,
HTTP_ERROR_CODES,
extensions,
- FLY_REGIONS,
logConstants,
plans,
pricing,
diff --git a/packages/shared-data/regions.ts b/packages/shared-data/regions.ts
index 5efd51c8719..7ba8ac9ae72 100644
--- a/packages/shared-data/regions.ts
+++ b/packages/shared-data/regions.ts
@@ -1,5 +1,5 @@
-export type CloudProvider = 'FLY' | 'AWS' | 'AWS_K8S' | 'AWS_NIMBUS'
-export type Region = Partial<typeof AWS_REGIONS> | Partial<typeof FLY_REGIONS>
+export type CloudProvider = 'AWS' | 'AWS_K8S' | 'AWS_NIMBUS'
+export type Region = Partial<typeof AWS_REGIONS>
export const AWS_REGIONS = {
WEST_US: {
@@ -79,10 +79,6 @@ export const AWS_REGIONS = {
export type AWS_REGIONS_KEYS = keyof typeof AWS_REGIONS
-export const FLY_REGIONS = {
- SOUTHEAST_ASIA: { code: 'sin', displayName: 'Singapore', location: [1.3521, 103.8198] },
-} as const
-
export const SMART_REGION_TO_EXACT_REGION_MAP = new Map([
['Americas', 'East US (North Virginia)'],
['Europe', 'Central EU (Frankfurt)'],