upstash · yunusemreozdemir · Aug 1, 2024 · Jul 18, 2024 · Jul 18, 2024 · Jul 18, 2024
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -39,7 +39,7 @@ jobs:
       - name: Build
         run: bun run build
 
-  nextjs-local:
+  vercel-functions-app-router-local:
     needs:
       - test
 
@@ -63,25 +63,25 @@ jobs:
         run: |
           bun install
           bun add @upstash/redis@../../dist
-        working-directory: ./examples/nextjs
+        working-directory: ./examples/vercel-functions-app-router
 
       - name: Build example
         run: bun run build
-        working-directory: ./examples/nextjs
+        working-directory: ./examples/vercel-functions-app-router
 
       - name: Start example
         run: bun run start &
-        working-directory: ./examples/nextjs
+        working-directory: ./examples/vercel-functions-app-router
         env:
           NEXT_PUBLIC_UPSTASH_REDIS_REST_URL: ${{ secrets.UPSTASH_REDIS_REST_URL }}
           NEXT_PUBLIC_UPSTASH_REDIS_REST_TOKEN: ${{ secrets.UPSTASH_REDIS_REST_TOKEN }}
 
       - name: Test
-        run: bun test examples/nextjs/ci.test.ts
+        run: bun test examples/vercel-functions-app-router/ci.test.ts
         env:
           DEPLOYMENT_URL: http://localhost:3000
 
-  nextjs-edge-local:
+  vercel-functions-pages-router-local:
     needs:
       - test
 
@@ -105,26 +105,26 @@ jobs:
         run: |
           bun install
           bun add @upstash/redis@../../dist
-        working-directory: ./examples/nextjs_edge
+        working-directory: ./examples/vercel-functions-pages-router
 
       - name: Build example
         run: bun run build
-        working-directory: ./examples/nextjs_edge
+        working-directory: ./examples/vercel-functions-pages-router
 
       - name: Start example
         run: bun run start & sleep 5
-        working-directory: ./examples/nextjs_edge
+        working-directory: ./examples/vercel-functions-pages-router
         env:
           NEXT_PUBLIC_UPSTASH_REDIS_REST_URL: ${{ secrets.UPSTASH_REDIS_REST_URL }}
           NEXT_PUBLIC_UPSTASH_REDIS_REST_TOKEN: ${{ secrets.UPSTASH_REDIS_REST_TOKEN }}
 
       - name: Test
-        run: bun test examples/nextjs_edge/ci.test.ts
+        run: bun test examples/vercel-functions-pages-router/ci.test.ts
         env:
           DEPLOYMENT_URL: http://localhost:3000
 
-  nextjs-deployed:
-    concurrency: nextjs-deployed
+  vercel-functions-app-router-deployed:
+    concurrency: vercel-functions-app-router-deployed
     runs-on: ubuntu-latest
     needs:
       - release
@@ -147,19 +147,19 @@ jobs:
 
       - name: Deploy
         run: |
-          pnpm --dir=examples/nextjs add @upstash/redis@${{needs.release.outputs.version}}
+          pnpm --dir=examples/vercel-functions-app-router add @upstash/redis@${{needs.release.outputs.version}}
           DEPLOYMENT_URL=$(npx vercel --token=${{ secrets.VERCEL_TOKEN }})
           echo "DEPLOYMENT_URL=${DEPLOYMENT_URL}" >> $GITHUB_ENV
         env:
           VERCEL_ORG_ID: ${{secrets.VERCEL_TEAM_ID}}
           VERCEL_PROJECT_ID: "prj_pFFK1XgNIlnW014iiuqAIQmBBuZA"
 
       - name: Test
-        run: bun test examples/nextjs/ci.test.ts
-        working-directory: examples/nextjs
+        run: bun test examples/vercel-functions-app-router/ci.test.ts
+        working-directory: examples/vercel-functions-app-router
 
-  nextjs-edge-deployed:
-    concurrency: nextjs-edge-deployed
+  vercel-functions-pages-router-deployed:
+    concurrency: vercel-functions-pages-router-deployed
     runs-on: ubuntu-latest
     needs:
       - release
@@ -182,15 +182,15 @@ jobs:
 
       - name: Deploy
         run: |
-          pnpm --dir=examples/nextjs_edge add @upstash/redis@${{needs.release.outputs.version}}
+          pnpm --dir=examples/vercel-functions-pages-router add @upstash/redis@${{needs.release.outputs.version}}
           DEPLOYMENT_URL=$(npx vercel --token=${{ secrets.VERCEL_TOKEN }})
           echo "DEPLOYMENT_URL=${DEPLOYMENT_URL}" >> $GITHUB_ENV
         env:
           VERCEL_ORG_ID: ${{secrets.VERCEL_TEAM_ID}}
           VERCEL_PROJECT_ID: "prj_bc5kMFz6ifbAaA7U3N86YSYqUUUI"
 
       - name: Test
-        run: bun test examples/nextjs_edge/ci.test.ts
+        run: bun test examples/vercel-functions-pages-router/ci.test.ts
 
   deno-deployed:
     concurrency: deno-deployed
@@ -572,8 +572,8 @@ jobs:
     needs:
       - nodejs-local
       # - fastly-local - not working in ci for some reason, local is fine
-      - nextjs-local
-      - nextjs-edge-local
+      - vercel-functions-app-router-local
+      - vercel-functions-pages-router-local
       - cloudflare-workers-with-typescript-local
       - cloudflare-workers-local
 

diff --git a/examples/aws-cdk-python/.gitignore b/examples/aws-cdk-python/.gitignore
@@ -0,0 +1,8 @@
+*.js
+!jest.config.js
+*.d.ts
+node_modules
+
+# CDK asset staging directory
+.cdk.staging
+cdk.out
diff --git a/examples/aws-cdk-python/.npmignore b/examples/aws-cdk-python/.npmignore
@@ -0,0 +1,6 @@
+*.ts
+!*.d.ts
+
+# CDK asset staging directory
+.cdk.staging
+cdk.out
diff --git a/examples/aws-cdk-python/README.md b/examples/aws-cdk-python/README.md
@@ -0,0 +1,36 @@
+# AWS CDK TypeScript Example
+
+### Prerequisites
+
+- Complete all steps in [Getting started with the AWS CDK](https://docs.aws.amazon.com/cdk/v2/guide/getting_started.html)
+
+### Project Setup
+
+Clone the example and install dependencies
+
+```shell
+git clone https://github.com/upstash/redis-js.git
+cd redis-js/examples/aws-cdk-python
+npm install
+```
+
+### Database Setup
+
+Create a Redis database using [Upstash Console](https://console.upstash.com) or [Upstash CLI](https://github.com/upstash/cli) and export `UPSTASH_REDIS_REST_URL` and `UPSTASH_REDIS_REST_TOKEN` to your environment.
+
+```shell
+export UPSTASH_REDIS_REST_URL=<YOUR_URL>
+export UPSTASH_REDIS_REST_TOKEN=<YOUR_TOKEN>
+```
+
+### Deploy
+
+Run in the top folder:
+
+```shell
+cdk synth
+cdk bootstrap
+cdk deploy
+```
+
+Visit the output url.
diff --git a/examples/aws-cdk-python/bin/aws-cdk-python.ts b/examples/aws-cdk-python/bin/aws-cdk-python.ts
@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+import 'source-map-support/register';
+import * as cdk from 'aws-cdk-lib';
+import { AwsCdkPythonStack } from '../lib/aws-cdk-python-stack';
+
+const app = new cdk.App();
+new AwsCdkPythonStack(app, 'AwsCdkPythonStack', {
+  /* If you don't specify 'env', this stack will be environment-agnostic.
+   * Account/Region-dependent features and context lookups will not work,
+   * but a single synthesized template can be deployed anywhere. */
+
+  /* Uncomment the next line to specialize this stack for the AWS Account
+   * and Region that are implied by the current CLI configuration. */
+  // env: { account: process.env.CDK_DEFAULT_ACCOUNT, region: process.env.CDK_DEFAULT_REGION },
+
+  /* Uncomment the next line if you know exactly what Account and Region you
+   * want to deploy the stack to. */
+  // env: { account: '123456789012', region: 'us-east-1' },
+
+  /* For more information, see https://docs.aws.amazon.com/cdk/latest/guide/environments.html */
+});
diff --git a/examples/aws-cdk-python/cdk.json b/examples/aws-cdk-python/cdk.json
@@ -0,0 +1,72 @@
+{
+  "app": "npx ts-node --prefer-ts-exts bin/aws-cdk-python.ts",
+  "watch": {
+    "include": [
+      "**"
+    ],
+    "exclude": [
+      "README.md",
+      "cdk*.json",
+      "**/*.d.ts",
+      "**/*.js",
+      "tsconfig.json",
+      "package*.json",
+      "yarn.lock",
+      "node_modules",
+      "test"
+    ]
+  },
+  "context": {
+    "@aws-cdk/aws-lambda:recognizeLayerVersion": true,
+    "@aws-cdk/core:checkSecretUsage": true,
+    "@aws-cdk/core:target-partitions": [
+      "aws",
+      "aws-cn"
+    ],
+    "@aws-cdk-containers/ecs-service-extensions:enableDefaultLogDriver": true,
+    "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true,
+    "@aws-cdk/aws-ecs:arnFormatIncludesClusterName": true,
+    "@aws-cdk/aws-iam:minimizePolicies": true,
+    "@aws-cdk/core:validateSnapshotRemovalPolicy": true,
+    "@aws-cdk/aws-codepipeline:crossAccountKeyAliasStackSafeResourceName": true,
+    "@aws-cdk/aws-s3:createDefaultLoggingPolicy": true,
+    "@aws-cdk/aws-sns-subscriptions:restrictSqsDescryption": true,
+    "@aws-cdk/aws-apigateway:disableCloudWatchRole": true,
+    "@aws-cdk/core:enablePartitionLiterals": true,
+    "@aws-cdk/aws-events:eventsTargetQueueSameAccount": true,
+    "@aws-cdk/aws-iam:standardizedServicePrincipals": true,
+    "@aws-cdk/aws-ecs:disableExplicitDeploymentControllerForCircuitBreaker": true,
+    "@aws-cdk/aws-iam:importedRoleStackSafeDefaultPolicyName": true,
+    "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
+    "@aws-cdk/aws-route53-patters:useCertificate": true,
+    "@aws-cdk/customresources:installLatestAwsSdkDefault": false,
+    "@aws-cdk/aws-rds:databaseProxyUniqueResourceName": true,
+    "@aws-cdk/aws-codedeploy:removeAlarmsFromDeploymentGroup": true,
+    "@aws-cdk/aws-apigateway:authorizerChangeDeploymentLogicalId": true,
+    "@aws-cdk/aws-ec2:launchTemplateDefaultUserData": true,
+    "@aws-cdk/aws-secretsmanager:useAttachedSecretResourcePolicyForSecretTargetAttachments": true,
+    "@aws-cdk/aws-redshift:columnId": true,
+    "@aws-cdk/aws-stepfunctions-tasks:enableEmrServicePolicyV2": true,
+    "@aws-cdk/aws-ec2:restrictDefaultSecurityGroup": true,
+    "@aws-cdk/aws-apigateway:requestValidatorUniqueId": true,
+    "@aws-cdk/aws-kms:aliasNameRef": true,
+    "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true,
+    "@aws-cdk/core:includePrefixInUniqueNameGeneration": true,
+    "@aws-cdk/aws-efs:denyAnonymousAccess": true,
+    "@aws-cdk/aws-opensearchservice:enableOpensearchMultiAzWithStandby": true,
+    "@aws-cdk/aws-lambda-nodejs:useLatestRuntimeVersion": true,
+    "@aws-cdk/aws-efs:mountTargetOrderInsensitiveLogicalId": true,
+    "@aws-cdk/aws-rds:auroraClusterChangeScopeOfInstanceParameterGroupWithEachParameters": true,
+    "@aws-cdk/aws-appsync:useArnForSourceApiAssociationIdentifier": true,
+    "@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials": true,
+    "@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource": true,
+    "@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction": true,
+    "@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse": true,
+    "@aws-cdk/aws-codepipeline:defaultPipelineTypeToV2": true,
+    "@aws-cdk/aws-kms:reduceCrossAccountRegionPolicyScope": true,
+    "@aws-cdk/aws-eks:nodegroupNameAttribute": true,
+    "@aws-cdk/aws-ec2:ebsDefaultGp3Volume": true,
+    "@aws-cdk/aws-ecs:removeDefaultDeploymentAlarm": true,
+    "@aws-cdk/custom-resources:logApiResponseDataPropertyTrueDefault": false
+  }
+}
diff --git a/examples/aws-cdk-python/jest.config.js b/examples/aws-cdk-python/jest.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+  testEnvironment: 'node',
+  roots: ['<rootDir>/test'],
+  testMatch: ['**/*.test.ts'],
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest'
+  }
+};
diff --git a/examples/aws-cdk-python/lib/api/index.py b/examples/aws-cdk-python/lib/api/index.py
@@ -0,0 +1,10 @@
+from upstash_redis import Redis
+
+redis = Redis.from_env()
+
+def handler(event, context):
+    count = redis.incr('counter')
+    return {
+        'statusCode': 200,
+        'body': f'Counter: {count}'
+    }
diff --git a/examples/aws-cdk-python/lib/api/requirements.txt b/examples/aws-cdk-python/lib/api/requirements.txt
@@ -0,0 +1 @@
+upstash-redis
diff --git a/examples/aws-cdk-python/lib/aws-cdk-python-stack.ts b/examples/aws-cdk-python/lib/aws-cdk-python-stack.ts
@@ -0,0 +1,36 @@
+import * as cdk from 'aws-cdk-lib';
+import { Construct } from 'constructs';
+import * as lambda from 'aws-cdk-lib/aws-lambda';
+import * as path from 'path';
+
+export class AwsCdkPythonStack extends cdk.Stack {
+  constructor(scope: Construct, id: string, props?: cdk.StackProps) {
+    super(scope, id, props);
+
+    const counterFunction = new lambda.Function(this, 'CounterFunction', {
+      code: lambda.Code.fromAsset(path.join(__dirname, 'api'), {
+        bundling: {
+          image: lambda.Runtime.PYTHON_3_9.bundlingImage,
+          command: [
+            'bash', '-c',
+            'pip install -r requirements.txt -t /asset-output && cp -au . /asset-output'
+          ],
+        },
+      }),
+      runtime: lambda.Runtime.PYTHON_3_9,
+      handler: 'index.handler',
+      environment: {
+        UPSTASH_REDIS_REST_URL: process.env.UPSTASH_REDIS_REST_URL || '',
+        UPSTASH_REDIS_REST_TOKEN: process.env.UPSTASH_REDIS_REST_TOKEN || '',
+      },
+    });
+
+    const counterFunctionUrl = counterFunction.addFunctionUrl({
+      authType: lambda.FunctionUrlAuthType.NONE,
+    });
+
+    new cdk.CfnOutput(this, "counterFunctionUrlOutput", {
+      value: counterFunctionUrl.url,
+    })
+  }
+}