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

update fallback for backend id resolvers if stack, app id, or branch are in args #2034

Merged
merged 2 commits into from
Sep 20, 2024

Conversation

rtpascual
Copy link
Contributor

Problem

Came from #2028 (comment).

If stack, app id, or branch are passed in as an argument for generate commands, there is no intention to run these commands against a sandbox.

Issue number, if available:

Changes

Only fallback to resolving sandbox backend identifier if stack, app id, and branch are not passed in as arguments to generate commands.

Corresponding docs PR, if applicable:

Validation

Updated unit test.

Checklist

  • If this PR includes a functional change to the runtime behavior of the code, I have added or updated automated test coverage for this change.
  • If this PR requires a change to the Project Architecture README, I have included that update in this PR.
  • If this PR requires a docs update, I have linked to that docs PR above.
  • If this PR modifies E2E tests, makes changes to resource provisioning, or makes SDK calls, I have run the PR checks with the run-e2e label set.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@rtpascual rtpascual requested a review from a team as a code owner September 20, 2024 18:00
Copy link

changeset-bot bot commented Sep 20, 2024

🦋 Changeset detected

Latest commit: 249206c

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@aws-amplify/backend-cli Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

sobolk
sobolk previously approved these changes Sep 20, 2024
@@ -18,23 +18,25 @@ export class BackendIdentifierResolverWithFallback
private fallbackResolver: SandboxBackendIdResolver
) {}
/**
* resolves the backend id, falling back to the sandbox id if there is an error
* resolves to deployed backend id, falling back to the sandbox id if there is an error and stack, appId, and branch are not provided
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are not falling back on errors

Suggested change
* resolves to deployed backend id, falling back to the sandbox id if there is an error and stack, appId, and branch are not provided
* resolves to deployed backend id, falling back to the sandbox id if stack or appId and branch inputs are not provided

(await this.fallbackResolver.resolve())
);
if (args.stack || args.appId || args.branch) {
return await this.defaultResolver.resolveDeployedBackendIdentifier(args);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to await if we are not doing error handling.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could possibly be throwing an error in the namespace resolver.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that will be caught by the caller when they await this method.

@rtpascual rtpascual merged commit 7aad5e8 into main Sep 20, 2024
38 checks passed
@rtpascual rtpascual deleted the fallback-backendid-resolvers branch September 20, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants