npm package diff
Package: @forge/cli
Versions: 10.12.1-next.2 - 10.13.0-next.18
File: package/out/command-line/controller/deploy-controller.js
Index: package/out/command-line/controller/deploy-controller.js
===================================================================
--- package/out/command-line/controller/deploy-controller.js
+++ package/out/command-line/controller/deploy-controller.js
@@ -41,20 +41,22 @@
appConfigProvider;
configFile;
lintService;
installationsService;
+ roaService;
migrationKeysService;
customEntitiesService;
appEnvironmentClient;
deployView;
sandboxPackageUploadDeployCommand;
nodePackageUploadDeployCommand;
createEnvironmentCommand;
- constructor(appConfigProvider, configFile, lintService, installationsService, migrationKeysService, customEntitiesService, appEnvironmentClient, deployView, sandboxPackageUploadDeployCommand, nodePackageUploadDeployCommand, createEnvironmentCommand) {
+ constructor(appConfigProvider, configFile, lintService, installationsService, roaService, migrationKeysService, customEntitiesService, appEnvironmentClient, deployView, sandboxPackageUploadDeployCommand, nodePackageUploadDeployCommand, createEnvironmentCommand) {
this.appConfigProvider = appConfigProvider;
this.configFile = configFile;
this.lintService = lintService;
this.installationsService = installationsService;
+ this.roaService = roaService;
this.migrationKeysService = migrationKeysService;
this.customEntitiesService = customEntitiesService;
this.appEnvironmentClient = appEnvironmentClient;
this.deployView = deployView;
@@ -125,19 +127,26 @@
}
}
}
}
- async verifyPostDeployment(environment) {
- const needsVersionUpdate = await this.installationsService.hasOutdatedProductInstallation(environment);
+ async verifyPostDeployment(environmentKey, environmentType, majorVersion) {
+ const needsVersionUpdate = await this.installationsService.hasOutdatedProductInstallation(environmentKey);
if (needsVersionUpdate) {
this.deployView.displayOutdatedInstallationsMessage();
}
+ const roaEligibility = await this.roaService.getEligibilityStatus(environmentKey, majorVersion);
+ if (!roaEligibility.isEligible) {
+ this.deployView.displayRoaEligibilityFailureMessage(roaEligibility.appVersion, environmentKey, environmentType);
+ }
+ else {
+ this.deployView.displayRoaEligibilitySuccessMessage(roaEligibility.appVersion, environmentKey, environmentType);
+ }
const manifest = await this.configFile.readConfig();
if (manifest?.app?.storage?.entities) {
- if (await this.customEntitiesService.isReindexingInProgress(environment)) {
+ if (await this.customEntitiesService.isReindexingInProgress(environmentKey)) {
this.deployView.displaySuccessfulDeploymentWhileReindexing();
}
- this.deployView.displayIndexingCommand(environment);
+ this.deployView.displayIndexingCommand(environmentKey);
}
}
async confirmAndCreateEnvironment(environment, nonInteractive) {
if (!nonInteractive) {
@@ -215,9 +224,9 @@
modules: config.modules,
i18nConfig: config.translations
}));
if (verify) {
- await this.verifyPostDeployment(environment);
+ await this.verifyPostDeployment(environment, appDetails.environmentType, majorVersion);
}
try {
analytics.analytics.egressPermissionList = await this.configFile.getEgressPermissions();
analytics.analytics.connectKey = hasConnectKeyChanged