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.

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

Improve scaling copy for production #202

Closed
wants to merge 1 commit into from
Closed

Improve scaling copy for production #202

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
8 changes: 4 additions & 4 deletions frontend/src/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ describe("<App />", () => {
).toHaveClass("is-disabled");

expect(
screen.getByText("4. Merge staging into production").parentElement
screen.getByText("4. Merge changes into production & scale up").parentElement
?.parentElement,
).toHaveClass("is-disabled");

Expand Down Expand Up @@ -171,7 +171,7 @@ describe("<App />", () => {
).not.toHaveClass("is-disabled");

expect(
screen.getByText("4. Merge staging into production").parentElement
screen.getByText("4. Merge changes into production & scale up").parentElement
?.parentElement,
).toHaveClass("is-disabled");

Expand Down Expand Up @@ -210,7 +210,7 @@ describe("<App />", () => {
).toHaveClass("is-disabled");

expect(
screen.getByText("4. Merge staging into production").parentElement
screen.getByText("4. Merge changes into production & scale up").parentElement
?.parentElement,
).not.toHaveClass("is-disabled");

Expand Down Expand Up @@ -249,7 +249,7 @@ describe("<App />", () => {
).toHaveClass("is-disabled");

expect(
screen.getByText("4. Merge staging into production").parentElement
screen.getByText("4. Merge changes into production & scale up").parentElement
?.parentElement,
).toHaveClass("is-disabled");

Expand Down
15 changes: 5 additions & 10 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ services:
<FeatureStep
ref={stepMergeProduction}
icon={<MergeIcon className="w-10 h-10" />}
title={"4. Merge staging into production"}
title={"4. Merge changes into production & scale up"}
isDisabled={currentStep !== "merge-production"}
hideContent={currentStepProgress < 3}
>
Expand Down Expand Up @@ -404,17 +404,12 @@ services:
</p>
</li>
<li>
<p className="mb-2 mt-2">
The previous step will complete, but exit with the
message:{" "}
<span className="text-red-400 font-mono">
Resources must be configured before deployment
</span>
.
</p>
<p className="mb-2 mt-2">
<span>
Allocate resources to Redis in production.
Now, use <code className="px-1">resources:set</code> with
<code className="px-1">--count backend:2</code> to horizontally scale the backend app
and <code className="px-1">--size redis_service:0.5</code> to vertically scale
the <code className="px-1">redis_service</code> service.
</span>
<CodeExample
wrapLines
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/commands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"merge_production": {
"user": {
"merge": "upsun merge staging",
"resources_set": "upsun resources:set \\\n\t--size redis_service:0.5 \\\n\t-e main",
"resources_set": "upsun resources:set \\\n\t--count backend:2 \\\n\t--size redis_service:0.5 \\\n\t-e main",
"get_url": "upsun url --primary -e main"
},
"test": {
"merge": "upsun merge $STAGING_BRANCH",
"resources_set": "upsun resources:set \\\n\t--size redis_service:0.5 \\\n\t-e $DEFAULT_BRANCH"
"resources_set": "upsun resources:set \\\n\t--count backend:2 \\\n\t--size redis_service:0.5 \\\n\t-e $DEFAULT_BRANCH"
}
},
"scale": {
Expand Down
Loading