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

fix: skip admin queries when consolidating REST APIs #7142

Merged
merged 1 commit into from
Apr 20, 2021
Merged

fix: skip admin queries when consolidating REST APIs #7142

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
6 changes: 5 additions & 1 deletion packages/amplify-provider-awscloudformation/src/utils/consolidate-apigw-policies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ export function consolidateApiGatewayPolicies(context: $TSContext, stackName: st
const apis = amplifyMeta?.api ?? {};

Object.keys(apis).forEach(resourceName => {
if (resourceName === 'AdminQueries') {
return;
}

const resource = apis[resourceName];
const apiParams = loadApiWithPrivacyParams(context, resourceName, resource);

Expand Down Expand Up @@ -231,7 +235,7 @@ export function loadApiWithPrivacyParams(context: $TSContext, name: string, reso
}

function updateExistingApiCfn(context: $TSContext, api: $TSObject): void {
const { resourceName } = api.params;
const resourceName = api.resourceName || api.params.resourceName;
Copy link
Contributor

Choose a reason for hiding this comment

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

should we have any defensive logic here to early return if resourceName is undefined?

const resourceDir = getResourceDirPath(context, 'api', resourceName);
const cfnTemplate = path.join(resourceDir, `${resourceName}-cloudformation-template.json`);
const paramsFile = path.join(resourceDir, 'parameters.json');
Expand Down