Skip to content

Commit

Permalink
Default to Basic dyno and fix spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
mraible committed Oct 28, 2023
1 parent 32804d4 commit c368971
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions generators/heroku/__snapshots__/heroku.spec.mts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ exports[`generator - Heroku microservice application with JAR deployment should
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down Expand Up @@ -232,7 +232,7 @@ exports[`generator - Heroku monolith application in the EU should match files sn
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down Expand Up @@ -445,7 +445,7 @@ exports[`generator - Heroku monolith application in the US should match files sn
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down Expand Up @@ -713,7 +713,7 @@ exports[`generator - Heroku monolith application with Git deployment should matc
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down Expand Up @@ -928,7 +928,7 @@ exports[`generator - Heroku monolith application with PostgreSQL should match fi
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down Expand Up @@ -1165,7 +1165,7 @@ exports[`generator - Heroku monolith application with an unavailable app name sh
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down Expand Up @@ -1391,7 +1391,7 @@ exports[`generator - Heroku monolith application with elasticsearch should match
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down Expand Up @@ -1595,7 +1595,7 @@ exports[`generator - Heroku monolith application with existing app should match
"stateCleared": "modified",
},
"Procfile": {
"contents": "web: java $JAVA_OPTS -jar target/*.jar --spring.profiles.active=prod,heroku
"contents": "web: java $JAVA_OPTS -Xmx256m -jar target/*.jar --spring.profiles.active=prod,heroku
",
"stateCleared": "modified",
},
Expand Down
6 changes: 3 additions & 3 deletions generators/heroku/generator.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default class HerokuGenerator extends BaseGenerator {

initializing() {
this.log.log(chalk.bold('Heroku configuration is starting'));
this.dynoSize = 'Free';
this.dynoSize = 'Basic';
this.herokuAppExists = Boolean(this.jhipsterConfig.herokuAppName);
},
});
Expand Down Expand Up @@ -257,7 +257,7 @@ export default class HerokuGenerator extends BaseGenerator {
const { stdout, stderr, exitCode } = await this.spawnHeroku(['create', this.herokuAppName, ...regionParams]);

if (stdout.includes('Heroku credentials')) {
throw new Error("Error: Not authenticated. Run 'heroku login' to login to your Heroku account and try again.");
throw new Error("Error: Not authenticated. Run 'heroku login' to log in to your Heroku account and try again.");
}

if (exitCode !== 0) {
Expand Down Expand Up @@ -294,7 +294,7 @@ export default class HerokuGenerator extends BaseGenerator {
this.jhipsterConfig.herokuAppName = this.herokuAppName;
}
} else if (stderr.includes('Invalid credentials')) {
this.log.error("Error: Not authenticated. Run 'heroku login' to login to your heroku account and try again.");
this.log.error("Error: Not authenticated. Run 'heroku login' to log in to your Heroku account and try again.");
} else {
throw new Error(stderr);
}
Expand Down

0 comments on commit c368971

Please sign in to comment.