From 63cada99c470311fae1d3e2107f87d1d41448381 Mon Sep 17 00:00:00 2001 From: Scott Schreckengaust Date: Thu, 11 Jan 2024 01:11:24 +0000 Subject: [PATCH] fix: use definition instead of schema Closes #186 Signed-off-by: Scott Schreckengaust --- .projen/deps.json | 2 +- .projenrc.ts | 2 +- package.json | 4 ++-- .../gen-ai/aws-qa-appsync-opensearch/index.ts | 2 +- .../aws-rag-appsync-stepfn-opensearch/index.ts | 4 +++- .../aws-summarization-appsync-stepfn/index.ts | 4 +++- yarn.lock | 18 +++++++++--------- 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 9e03456c..e75cb5b6 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -87,7 +87,7 @@ }, { "name": "aws-cdk-lib", - "version": "^2.88.0", + "version": "^2.94.0", "type": "peer" }, { diff --git a/.projenrc.ts b/.projenrc.ts index 6de58c41..8cdb596d 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -27,7 +27,7 @@ import { const GITHUB_USER = 'awslabs'; const PUBLICATION_NAMESPACE = 'cdklabs'; const PROJECT_NAME = 'generative-ai-cdk-constructs'; -const CDK_VERSION: string = '2.88.0'; +const CDK_VERSION: string = '2.94.0'; const project = new awscdk.AwsCdkConstructLibrary({ author: 'Amazon Web Services - Prototyping and Cloud Engineering', diff --git a/package.json b/package.json index ecb7d92a..debf5f13 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@types/node": "^18", "@typescript-eslint/eslint-plugin": "^6", "@typescript-eslint/parser": "^6", - "aws-cdk-lib": "2.88.0", + "aws-cdk-lib": "2.94.0", "constructs": "10.3.0", "eslint": "^8", "eslint-import-resolver-typescript": "^3.6.1", @@ -58,7 +58,7 @@ "typescript": "^5.3.3" }, "peerDependencies": { - "aws-cdk-lib": "^2.88.0", + "aws-cdk-lib": "^2.94.0", "constructs": "^10.3.0" }, "dependencies": { diff --git a/src/patterns/gen-ai/aws-qa-appsync-opensearch/index.ts b/src/patterns/gen-ai/aws-qa-appsync-opensearch/index.ts index 6c282485..8298d04d 100644 --- a/src/patterns/gen-ai/aws-qa-appsync-opensearch/index.ts +++ b/src/patterns/gen-ai/aws-qa-appsync-opensearch/index.ts @@ -294,7 +294,7 @@ export class QaAppsyncOpensearch extends Construct { 'questionAnsweringGraphqlApi', { name: 'questionAnsweringGraphqlApi' + stage, - schema: appsync.SchemaFile.fromAsset( + definition: appsync.Definition.fromFile( path.join( __dirname, '../../../../resources/gen-ai/aws-qa-appsync-opensearch/schema.graphql', diff --git a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/index.ts b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/index.ts index e89117a5..fc9f015f 100644 --- a/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/index.ts +++ b/src/patterns/gen-ai/aws-rag-appsync-stepfn-opensearch/index.ts @@ -347,7 +347,9 @@ export class RagAppsyncStepfnOpensearch extends Construct { 'ingestionGraphqlApi', { name: 'ingestionGraphqlApi'+stage, - schema: appsync.SchemaFile.fromAsset(path.join(__dirname, '../../../../resources/gen-ai/aws-rag-appsync-stepfn-opensearch/schema.graphql')), + definition: appsync.Definition.fromFile( + path.join(__dirname, '../../../../resources/gen-ai/aws-rag-appsync-stepfn-opensearch/schema.graphql'), + ), authorizationConfig: { defaultAuthorization: { authorizationType: appsync.AuthorizationType.USER_POOL, diff --git a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/index.ts b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/index.ts index d01f8430..9807d9d1 100644 --- a/src/patterns/gen-ai/aws-summarization-appsync-stepfn/index.ts +++ b/src/patterns/gen-ai/aws-summarization-appsync-stepfn/index.ts @@ -415,7 +415,9 @@ export class SummarizationAppsyncStepfn extends Construct { { name: apiName+stage, logConfig: api_log_config, - schema: appsync.SchemaFile.fromAsset(path.join(__dirname, '../../../../resources/gen-ai/aws-summarization-appsync-stepfn/schema.graphql')), + definition: appsync.Definition.fromFile( + path.join(__dirname, '../../../../resources/gen-ai/aws-summarization-appsync-stepfn/schema.graphql'), + ), authorizationConfig: authorizationConfig, xrayEnabled: enable_xray, }); diff --git a/yarn.lock b/yarn.lock index 248ec432..ccaf9a88 100644 --- a/yarn.lock +++ b/yarn.lock @@ -25,10 +25,10 @@ resolved "https://registry.yarnpkg.com/@aws-cdk/asset-kubectl-v20/-/asset-kubectl-v20-2.1.2.tgz#d8e20b5f5dc20128ea2000dc479ca3c7ddc27248" integrity sha512-3M2tELJOxQv0apCIiuKQ4pAbncz9GuLwnKFqxifWfe77wuMxyTRPmxssYHs42ePqzap1LT6GDcPygGs+hHstLg== -"@aws-cdk/asset-node-proxy-agent-v5@^2.0.165": - version "2.0.166" - resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v5/-/asset-node-proxy-agent-v5-2.0.166.tgz#467507db141cd829ff8aa9d6ea5519310a4276b8" - integrity sha512-j0xnccpUQHXJKPgCwQcGGNu4lRiC1PptYfdxBIH1L4dRK91iBxtSQHESRQX+yB47oGLaF/WfNN/aF3WXwlhikg== +"@aws-cdk/asset-node-proxy-agent-v6@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@aws-cdk/asset-node-proxy-agent-v6/-/asset-node-proxy-agent-v6-2.0.1.tgz#6dc9b7cdb22ff622a7176141197962360c33e9ac" + integrity sha512-DDt4SLdLOwWCjGtltH4VCST7hpOI5DzieuhGZsBpZ+AgJdSI2GCjklCXm0GCTwJG/SolkL5dtQXyUKgg9luBDg== "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": version "7.23.5" @@ -1173,14 +1173,14 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-cdk-lib@2.88.0: - version "2.88.0" - resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.88.0.tgz#72d165cb7dc168c5fa3b22caaacd8d33364866fc" - integrity sha512-bmhokh30HVeqlotWaoEmK7mKB9SJbJwpbsiVgmYe3JcMu8DposHQqaIPI7LnC+dg015tZaxUsExxOYBEw+vntQ== +aws-cdk-lib@2.94.0: + version "2.94.0" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.94.0.tgz#b0e5be87611ff6628bc631dcc1f4569104124885" + integrity sha512-pB/UzKeM+p/wY9WuFYkEewOFUh2r8qwaML63is4vUChXY2G2Bj3pGyfJ97Xir2Q5KIhgJPJz5igdouI4+F9A+g== dependencies: "@aws-cdk/asset-awscli-v1" "^2.2.200" "@aws-cdk/asset-kubectl-v20" "^2.1.2" - "@aws-cdk/asset-node-proxy-agent-v5" "^2.0.165" + "@aws-cdk/asset-node-proxy-agent-v6" "^2.0.1" "@balena/dockerignore" "^1.0.2" case "1.6.3" fs-extra "^11.1.1"