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

chore: update data deps #13328

Merged
merged 5 commits into from
Oct 24, 2023
Merged

chore: update data deps #13328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c44cd1c
chore: update data deps
dpilch Oct 12, 2023
34641d7
chore: yarn dedupe
dpilch Oct 19, 2023
6917c9b
chore: update codegen dependency
phani-srikar Oct 20, 2023
b93d232
chore(cli): update data dep after 5.7.6 release
sundersc Oct 21, 2023
fa288c6
test(cli): fix admin auth iam tests
sundersc Oct 23, 2023
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
2 changes: 1 addition & 1 deletion packages/amplify-category-function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"folder-hash": "^4.0.2",
"fs-extra": "^8.1.0",
"globby": "^11.0.3",
"graphql-transformer-core": "^8.1.12",
"graphql-transformer-core": "^8.1.13",
"inquirer": "^7.3.3",
"inquirer-datepicker": "^2.0.0",
"jstreemap": "^1.28.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@aws-amplify/amplify-cli-logger": "1.3.6",
"@aws-amplify/amplify-function-plugin-interface": "1.11.0",
"@aws-amplify/amplify-prompts": "2.8.4",
"@aws-amplify/graphql-transformer-interfaces": "^3.2.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.2.1",
"@aws-sdk/util-arn-parser": "^3.310.0",
"@yarnpkg/lockfile": "^1.1.0",
"ajv": "^6.12.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/amplify-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"@aws-amplify/amplify-app": "5.0.21",
"@aws-amplify/amplify-category-analytics": "5.0.22",
"@aws-amplify/amplify-category-api": "^5.7.2",
"@aws-amplify/amplify-category-api": "^5.7.6",
"@aws-amplify/amplify-category-auth": "3.7.1",
"@aws-amplify/amplify-category-custom": "3.1.10",
"@aws-amplify/amplify-category-function": "5.6.1",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@aws-amplify/amplify-util-mock": "5.8.0",
"@aws-amplify/amplify-util-uibuilder": "1.13.0",
"@aws-cdk/cloudformation-diff": "~2.68.0",
"amplify-codegen": "^4.7.0",
"amplify-codegen": "^4.7.2",
"amplify-dotnet-function-runtime-provider": "2.0.15",
"amplify-go-function-runtime-provider": "2.3.33",
"amplify-java-function-runtime-provider": "2.3.33",
Expand All @@ -87,7 +87,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.12",
"graphql-transformer-core": "^8.1.13",
"gunzip-maybe": "^1.4.2",
"hidefile": "^3.0.0",
"ini": "^1.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-container-hosting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"extract-api": "ts-node ../../scripts/extract-api.ts"
},
"dependencies": {
"@aws-amplify/amplify-category-api": "^5.7.2",
"@aws-amplify/amplify-category-api": "^5.7.6",
"@aws-amplify/amplify-cli-core": "4.2.10",
"@aws-amplify/amplify-environment-parameters": "1.9.1",
"fs-extra": "^8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-dotnet-function-template-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dependencies": {
"@aws-amplify/amplify-cli-core": "4.2.10",
"@aws-amplify/amplify-function-plugin-interface": "1.11.0",
"graphql-transformer-core": "^8.1.12"
"graphql-transformer-core": "^8.1.13"
},
"devDependencies": {
"@types/inquirer": "^6.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-e2e-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dotenv": "^8.2.0",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.1.12",
"graphql-transformer-core": "^8.1.13",
"ini": "^1.3.5",
"jest-circus": "^27.0.0",
"jest-environment-node": "^26.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-e2e-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@aws-amplify/amplify-cli-core": "4.2.10",
"@aws-amplify/amplify-e2e-core": "5.4.1",
"@aws-amplify/amplify-opensearch-simulator": "1.7.1",
"@aws-amplify/graphql-transformer-core": "^2.2.1",
"@aws-amplify/graphql-transformer-core": "^2.2.3",
"@aws-sdk/client-appsync": "^3.303.0",
"@aws-sdk/client-dynamodb": "^3.303.0",
"@aws-sdk/client-s3": "^3.303.0",
Expand All @@ -53,7 +53,7 @@
"get-port": "^5.1.1",
"glob": "^8.0.3",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "8.1.12",
"graphql-transformer-core": "8.1.13",
"isomorphic-fetch": "^3.0.0",
"lodash": "^4.17.21",
"moment": "^2.24.0",
Expand Down
6 changes: 2 additions & 4 deletions packages/amplify-e2e-tests/src/__tests__/__snapshots__/api_10.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ $util.qr($ctx.stash.put("hasAuth", true))
#set( $isAuthorized = false )
#set( $allowedFields = [] )
#if( $util.authType() == "IAM Authorization" )
#set( $adminRoles = ["myAdminRoleName"] )
#foreach( $adminRole in $adminRoles )
#foreach( $adminRole in $ctx.stash.adminRoles )
#if( $ctx.identity.userArn.contains($adminRole) && $ctx.identity.userArn != $ctx.stash.authRole && $ctx.identity.userArn != $ctx.stash.unauthRole )
#return($util.toJson({}))
#end
Expand Down Expand Up @@ -175,8 +174,7 @@ $util.qr($ctx.stash.put("hasAuth", true))
#set( $isAuthorized = false )
#set( $allowedFields = [] )
#if( $util.authType() == "IAM Authorization" )
#set( $adminRoles = ["myAdminRoleName"] )
#foreach( $adminRole in $adminRoles )
#foreach( $adminRole in $ctx.stash.adminRoles )
#if( $ctx.identity.userArn.contains($adminRole) && $ctx.identity.userArn != $ctx.stash.authRole && $ctx.identity.userArn != $ctx.stash.unauthRole )
#return($util.toJson({}))
#end
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-migration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"aws-cdk-lib": "~2.80.0",
"constructs": "^10.0.5",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.1.12",
"graphql-transformer-core": "^8.1.13",
"lodash": "^4.17.21",
"semver": "^7.5.4",
"strip-ansi": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-nodejs-function-template-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@aws-amplify/amplify-cli-core": "4.2.10",
"@aws-amplify/amplify-function-plugin-interface": "1.11.0",
"@aws-amplify/amplify-prompts": "2.8.4",
"graphql-transformer-core": "^8.1.12",
"graphql-transformer-core": "^8.1.13",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/amplify-provider-awscloudformation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"@aws-amplify/amplify-prompts": "2.8.4",
"@aws-amplify/amplify-util-import": "2.8.1",
"@aws-amplify/cli-extensibility-helper": "3.0.20",
"@aws-amplify/graphql-transformer-core": "^2.2.1",
"@aws-amplify/graphql-transformer-interfaces": "^3.2.0",
"amplify-codegen": "^4.7.0",
"@aws-amplify/graphql-transformer-core": "^2.2.3",
"@aws-amplify/graphql-transformer-interfaces": "^3.2.1",
"amplify-codegen": "^4.7.2",
"archiver": "^5.3.0",
"aws-cdk-lib": "~2.80.0",
"aws-sdk": "^2.1464.0",
Expand All @@ -53,7 +53,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.12",
"graphql-transformer-core": "^8.1.13",
"ignore": "^5.2.0",
"ini": "^1.3.5",
"inquirer": "^7.3.3",
Expand All @@ -71,7 +71,7 @@
"xstate": "^4.14.0"
},
"devDependencies": {
"@aws-amplify/graphql-transformer-interfaces": "^3.2.0",
"@aws-amplify/graphql-transformer-interfaces": "^3.2.1",
"@types/columnify": "^1.5.0",
"@types/deep-diff": "^1.0.0",
"@types/folder-hash": "^4.0.1",
Expand Down
42 changes: 21 additions & 21 deletions packages/amplify-util-mock/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@aws-amplify/amplify-prompts": "2.8.4",
"@aws-amplify/amplify-provider-awscloudformation": "8.8.0",
"@hapi/topo": "^5.0.0",
"amplify-codegen": "^4.7.0",
"amplify-codegen": "^4.7.2",
"amplify-dynamodb-simulator": "2.9.5",
"amplify-storage-simulator": "1.11.1",
"chokidar": "^3.5.3",
Expand All @@ -55,20 +55,20 @@
},
"devDependencies": {
"@aws-amplify/amplify-function-plugin-interface": "^1.11.0",
"@aws-amplify/graphql-auth-transformer": "^3.1.5",
"@aws-amplify/graphql-default-value-transformer": "^2.1.5",
"@aws-amplify/graphql-function-transformer": "^2.1.4",
"@aws-amplify/graphql-http-transformer": "^2.1.4",
"@aws-amplify/graphql-index-transformer": "^2.1.5",
"@aws-amplify/graphql-maps-to-transformer": "^3.2.2",
"@aws-amplify/graphql-model-transformer": "^2.2.1",
"@aws-amplify/graphql-predictions-transformer": "^2.1.4",
"@aws-amplify/graphql-relational-transformer": "^2.1.5",
"@aws-amplify/graphql-searchable-transformer": "^2.2.1",
"@aws-amplify/graphql-auth-transformer": "^3.1.9",
"@aws-amplify/graphql-default-value-transformer": "^2.1.7",
"@aws-amplify/graphql-function-transformer": "^2.1.6",
"@aws-amplify/graphql-http-transformer": "^2.1.6",
"@aws-amplify/graphql-index-transformer": "^2.1.7",
"@aws-amplify/graphql-maps-to-transformer": "^3.2.4",
"@aws-amplify/graphql-model-transformer": "^2.2.3",
"@aws-amplify/graphql-predictions-transformer": "^2.1.6",
"@aws-amplify/graphql-relational-transformer": "^2.1.7",
"@aws-amplify/graphql-searchable-transformer": "^2.2.3",
"@aws-amplify/graphql-transformer": "^1.1.0",
"@aws-amplify/graphql-transformer-core": "^2.2.1",
"@aws-amplify/graphql-transformer-interfaces": "^3.2.0",
"@aws-amplify/graphql-transformer-migrator": "^2.2.4",
"@aws-amplify/graphql-transformer-core": "^2.2.3",
"@aws-amplify/graphql-transformer-interfaces": "^3.2.1",
"@aws-amplify/graphql-transformer-migrator": "^2.2.7",
"@types/detect-port": "^1.3.0",
"@types/jest": "^29.0.0",
"@types/lodash": "^4.14.149",
Expand All @@ -83,14 +83,14 @@
"axios": "^0.26.0",
"constructs": "^10.0.5",
"graphql": "^15.5.0",
"graphql-auth-transformer": "^7.2.66",
"graphql-connection-transformer": "^5.2.65",
"graphql-dynamodb-transformer": "^7.2.65",
"graphql-function-transformer": "^3.3.56",
"graphql-key-transformer": "^3.2.65",
"graphql-auth-transformer": "^7.2.67",
"graphql-connection-transformer": "^5.2.66",
"graphql-dynamodb-transformer": "^7.2.66",
"graphql-function-transformer": "^3.3.57",
"graphql-key-transformer": "^3.2.66",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "^8.1.12",
"graphql-versioned-transformer": "^5.2.65",
"graphql-transformer-core": "^8.1.13",
"graphql-versioned-transformer": "^5.2.66",
"isomorphic-fetch": "^3.0.0",
"jest": "^29.0.0",
"jsonwebtoken": "^9.0.0",
Expand Down
15 changes: 10 additions & 5 deletions packages/amplify-util-mock/src/__tests__/v2-test-synthesizer/test-transform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AppSyncAuthConfiguration, TransformerPluginProvider, TransformerLogLevel } from '@aws-amplify/graphql-transformer-interfaces';
import type { TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
import type { SynthParameters, TransformParameters } from '@aws-amplify/graphql-transformer-interfaces';
import {
DatasourceType,
GraphQLTransform,
Expand All @@ -19,6 +19,7 @@ export type TestTransformParameters = {
stackMapping?: Record<string, string>;
modelToDatasourceMap?: Map<string, DatasourceType>;
datasourceSecretParameterLocations?: Map<string, RDSConnectionSecrets>;
synthParameters?: Partial<SynthParameters>;
};

/**
Expand All @@ -36,6 +37,7 @@ export const testTransform = (params: TestTransformParameters): DeploymentResour
userDefinedSlots,
stackMapping,
transformParameters,
synthParameters: overrideSynthParameters,
} = params;

const transform = new GraphQLTransform({
Expand All @@ -57,10 +59,13 @@ export const testTransform = (params: TestTransformParameters): DeploymentResour
scope: transformManager.getTransformScope(),
nestedStackProvider: transformManager.getNestedStackProvider(),
assetProvider: transformManager.getAssetProvider(),
synthParameters: transformManager.getSynthParameters(
authConfigTypes.some((type) => type === 'AWS_IAM'),
authConfigTypes.some((type) => type === 'AMAZON_COGNITO_USER_POOLS'),
),
synthParameters: {
...transformManager.getSynthParameters(
authConfigTypes.some((type) => type === 'AWS_IAM'),
authConfigTypes.some((type) => type === 'AMAZON_COGNITO_USER_POOLS'),
),
...overrideSynthParameters,
},
schema,
datasourceConfig: {
modelToDatasourceMap,
Expand Down
28 changes: 12 additions & 16 deletions packages/amplify-util-mock/src/__tests__/velocity/admin-auth.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jest.mock('@aws-amplify/amplify-prompts');

describe('admin roles query checks', () => {
const ADMIN_UI_ROLE = 'us-fake-1_uuid_Full-access/CognitoIdentityCredentials';
const MOCK_BEFORE_TEMPLATE = `$util.qr($ctx.stash.put("adminRoles", ["${ADMIN_UI_ROLE}"]))`;

let vtlTemplate: VelocityTemplateSimulator;
let transformer: TestTransform;
const adminFullAccessRequest: AppSyncGraphQLExecutionContext = {
Expand All @@ -38,12 +40,8 @@ describe('admin roles query checks', () => {
testTransform({
schema,
authConfig,
transformers: [
new ModelTransformer(),
new AuthTransformer({
adminRoles: [ADMIN_UI_ROLE],
}),
],
synthParameters: { adminRoles: [ADMIN_UI_ROLE] },
transformers: [new ModelTransformer(), new AuthTransformer()],
}),
};

Expand All @@ -61,7 +59,7 @@ describe('admin roles query checks', () => {
const out = transformer.transform(validSchema);

// field resolver
const secretValueTemplate = out.resolvers['Student.secretValue.req.vtl'];
const secretValueTemplate = [MOCK_BEFORE_TEMPLATE, out.resolvers['Student.secretValue.req.vtl']].join('\n');
const iamFieldContext: AppSyncVTLContext = {
source: {
secretValue: 'secretValue001',
Expand All @@ -76,7 +74,7 @@ describe('admin roles query checks', () => {
expect(secretValueResponse.result).toEqual('secretValue001');

// mutation resolver
const createStudentTemplate = out.resolvers['Mutation.createStudent.auth.1.req.vtl'];
const createStudentTemplate = [MOCK_BEFORE_TEMPLATE, out.resolvers['Mutation.createStudent.auth.1.req.vtl']].join('\n');
const iamCreateContext: AppSyncVTLContext = {
arguments: {
input: {
Expand All @@ -100,6 +98,8 @@ describe('admin roles query checks', () => {
describe('identity claim feature flag disabled', () => {
describe('admin roles query checks', () => {
const ADMIN_UI_ROLE = 'us-fake-1_uuid_Full-access/CognitoIdentityCredentials';
const MOCK_BEFORE_TEMPLATE = `$util.qr($ctx.stash.put("adminRoles", ["${ADMIN_UI_ROLE}"]))`;

let vtlTemplate: VelocityTemplateSimulator;
let transformer: TestTransform;
const adminFullAccessRequest: AppSyncGraphQLExecutionContext = {
Expand All @@ -124,12 +124,8 @@ describe('identity claim feature flag disabled', () => {
testTransform({
schema,
authConfig,
transformers: [
new ModelTransformer(),
new AuthTransformer({
adminRoles: [ADMIN_UI_ROLE],
}),
],
synthParameters: { adminRoles: [ADMIN_UI_ROLE] },
transformers: [new ModelTransformer(), new AuthTransformer()],
}),
};

Expand All @@ -147,7 +143,7 @@ describe('identity claim feature flag disabled', () => {
const out = transformer.transform(validSchema);

// field resolver
const secretValueTemplate = out.resolvers['Student.secretValue.req.vtl'];
const secretValueTemplate = [MOCK_BEFORE_TEMPLATE, out.resolvers['Student.secretValue.req.vtl']].join('\n');
const iamFieldContext: AppSyncVTLContext = {
source: {
secretValue: 'secretValue001',
Expand All @@ -162,7 +158,7 @@ describe('identity claim feature flag disabled', () => {
expect(secretValueResponse.result).toEqual('secretValue001');

// mutation resolver
const createStudentTemplate = out.resolvers['Mutation.createStudent.auth.1.req.vtl'];
const createStudentTemplate = [MOCK_BEFORE_TEMPLATE, out.resolvers['Mutation.createStudent.auth.1.req.vtl']].join('\n');
const iamCreateContext: AppSyncVTLContext = {
arguments: {
input: {
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-util-uibuilder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"access": "public"
},
"dependencies": {
"@aws-amplify/amplify-category-api": "^5.7.2",
"@aws-amplify/amplify-category-api": "^5.7.6",
"@aws-amplify/amplify-cli-core": "4.2.10",
"@aws-amplify/amplify-prompts": "2.8.4",
"@aws-amplify/codegen-ui": "2.14.2",
"@aws-amplify/codegen-ui-react": "2.14.2",
"amplify-codegen": "^4.7.0",
"amplify-codegen": "^4.7.2",
"aws-sdk": "^2.1464.0",
"fs-extra": "^8.1.0",
"node-fetch": "^2.6.7",
Expand Down
Loading