Skip to content
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.

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

Add prompt before applying migration #5390

Draft
wants to merge 1 commit into
base: zl/migrate_scopes_to_required_scopes
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions packages/app/src/cli/models/app/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {ApplicationURLs} from '../../services/dev/urls.js'
import appHomeSpec from '../extensions/specifications/app_config_app_home.js'
import appProxySpec from '../extensions/specifications/app_config_app_proxy.js'
import {replaceScopesWithRequiredScopesInToml} from '../../services/app/patch-app-configuration-file.js'
import {confirmApplyPendingMigrations} from '../../prompts/deprecation-warnings.js'
import {ZodObjectOf, zod} from '@shopify/cli-kit/node/schema'
import {DotEnvFile} from '@shopify/cli-kit/node/dot-env'
import {getDependencies, PackageManager, readAndParsePackageJson} from '@shopify/cli-kit/node/node-package-manager'
Expand All @@ -25,6 +26,7 @@ import {AbortError} from '@shopify/cli-kit/node/error'
import {normalizeDelimitedString} from '@shopify/cli-kit/common/string'
import {JsonMapType} from '@shopify/cli-kit/node/toml'
import {getArrayRejectingUndefined} from '@shopify/cli-kit/common/array'
import {renderText, renderSuccess} from '@shopify/cli-kit/node/ui'

// Schemas for loading app configuration

Expand Down Expand Up @@ -319,7 +321,8 @@ type AppConstructor<
export class App<
TConfig extends AppConfiguration = AppConfiguration,
TModuleSpec extends ExtensionSpecification = ExtensionSpecification,
> implements AppInterface<TConfig, TModuleSpec> {
> implements AppInterface<TConfig, TModuleSpec>
{
name: string
idEnvironmentVariableName: 'SHOPIFY_API_KEY' = 'SHOPIFY_API_KEY' as const
directory: string
Expand Down Expand Up @@ -424,12 +427,25 @@ export class App<
}

async migratePendingSchemaChanges() {
await this.migrateScopesToRequiredScopes()
await Promise.all([this.realExtensions.map((ext) => ext.migratePendingSchemaChanges())])
const pendingMigrations = this.getPendingMigrationMessages()
if (pendingMigrations.length > 0) {
const shouldMigrate = await confirmApplyPendingMigrations(pendingMigrations)
if (shouldMigrate) {
await this.migrateScopesToRequiredScopes()
await Promise.all([this.realExtensions.map((ext) => ext.migratePendingSchemaChanges())])
renderSuccess({headline: 'Migration completed locally, run `shopify app deploy` to push the changes.'})
}
}
}

getPendingMigrationMessages(): string[] {
return this.realExtensions.map((ext) => ext.pendingSchemaChanges()).flat()
}

async migrateScopesToRequiredScopes() {
if (isCurrentAppSchema(this.configuration) && this.configuration.access_scopes?.scopes) {
renderText({text: 'Migration: Replacing `scopes` with `required_scopes` locally.'})

const accessConfig = this.configuration as {
access_scopes: {scopes?: string; required_scopes?: string[]}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,11 @@
return this.specification.migratePendingSchemaChanges(this)
}

pendingSchemaChanges(): string[] {
if (!this.specification.pendingSchemaChanges) return []
return this.specification.pendingSchemaChanges(this)
}

buildValidation(): Promise<void> {
if (!this.specification.buildValidation) return Promise.resolve()
return this.specification.buildValidation(this)
Expand Down Expand Up @@ -269,7 +274,7 @@
}

hasExtensionPointTarget(target: string): boolean {
return this.specification.hasExtensionPointTarget?.(this.configuration, target) || false

Check warning on line 277 in packages/app/src/cli/models/extensions/extension-instance.ts

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

packages/app/src/cli/models/extensions/extension-instance.ts#L277

[@typescript-eslint/prefer-nullish-coalescing] Prefer using nullish coalescing operator (`??`) instead of a logical or (`||`), as it is a safer operator.
}

// Functions specific properties
Expand Down
3 changes: 3 additions & 0 deletions packages/app/src/cli/models/extensions/specification.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export interface ExtensionSpecification<TConfiguration extends BaseConfigType =
hasExtensionPointTarget?(config: TConfiguration, target: string): boolean
appModuleFeatures: (config?: TConfiguration) => ExtensionFeature[]
migratePendingSchemaChanges?: (extension: ExtensionInstance<TConfiguration>) => Promise<void>
pendingSchemaChanges?: (extension: ExtensionInstance<TConfiguration>) => string[]
getDevSessionActionUpdateMessage?: (
config: TConfiguration,
appConfig: CurrentAppConfiguration,
Expand Down Expand Up @@ -235,6 +236,7 @@ export function createConfigExtensionSpecification<TConfiguration extends BaseCo
storeFqdn: string,
) => Promise<string>
migratePendingSchemaChanges?: (extension: ExtensionInstance<TConfiguration>) => Promise<void>
pendingSchemaChanges?: (extension: ExtensionInstance<TConfiguration>) => string[]
}): ExtensionSpecification<TConfiguration> {
const appModuleFeatures = spec.appModuleFeatures ?? (() => [])
return createExtensionSpecification({
Expand All @@ -249,6 +251,7 @@ export function createConfigExtensionSpecification<TConfiguration extends BaseCo
uidStrategy: spec.uidStrategy ?? 'single',
getDevSessionActionUpdateMessage: spec.getDevSessionActionUpdateMessage,
migratePendingSchemaChanges: spec.migratePendingSchemaChanges,
pendingSchemaChanges: spec.pendingSchemaChanges,
})
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {ExtensionInstance} from '../extension-instance.js'
import {outputContent, outputToken} from '@shopify/cli-kit/node/output'
import {normalizeDelimitedString} from '@shopify/cli-kit/common/string'
import {zod} from '@shopify/cli-kit/node/schema'
import {AbortError} from '@shopify/cli-kit/node/error'

const AppAccessSchema = zod.object({
access: zod
Expand Down Expand Up @@ -56,6 +55,9 @@ const appAccessSpec = createConfigExtensionSpecification({
migratePendingSchemaChanges: async (extension) => {
return migrateScopesToRequiredScopes(extension)
},
pendingSchemaChanges: (extension) => {
return pendingSchemaChanges(extension)
},
})

async function migrateScopesToRequiredScopes(extension: ExtensionInstance) {
Expand All @@ -71,4 +73,17 @@ async function migrateScopesToRequiredScopes(extension: ExtensionInstance) {
}
}

function pendingSchemaChanges(extension: ExtensionInstance): string[] {
const accessConfig = extension.configuration as {
access_scopes?: {scopes?: string}
}

const migrationMessages = []
if (accessConfig.access_scopes?.scopes) {
migrationMessages.push('Replace `scopes(string)` with `required_scopes(string array)`.')
}

return migrationMessages
}

export default appAccessSpec
10 changes: 10 additions & 0 deletions packages/app/src/cli/prompts/deprecation-warnings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ export async function showApiKeyDeprecationWarning() {
body: ['The flag', {command: 'api-key'}, 'has been deprecated in favor of', {command: 'client-id'}],
})
}

export async function confirmApplyPendingMigrations(migrations: string[]): Promise<boolean> {
return renderConfirmationPrompt({
message: `There are pending migrations, would you like to apply them now?`,
infoTable: {'': migrations},
confirmationMessage: 'Yes, apply migrations',
cancellationMessage: 'No, apply migrations later',
defaultValue: true,
})
}
Loading