chore: wip

Author: chrisbbreuer

config/cloud.ts

@@ -32,8 +32,8 @@ export default {
   },
 
   ai: true, // deploys AI endpoints
-  docs: true, // deploys project documentation
-  api: true, // deploys project API
+  docs: true, // deploys documentation
+  api: true, // deploys API
   fileSystem: true, // enables file system
 
   // compute: {},

storage/framework/stacks/src/cloud/src/cloud/ai.ts

@@ -97,11 +97,11 @@ export class AiStack {
     // })
 
     new Output(scope, 'AiVanityAskApiUrl', {
-      value: `${api.url}/ask`,
+      value: `${api.url}ask`,
     })
 
     new Output(scope, 'AiVanitySummarizeApiUrl', {
-      value: `${api.url}/summarize`,
+      value: `${api.url}summarize`,
     })
 
     new Output(scope, 'AiAskApiUrl', {

storage/framework/stacks/src/cloud/src/cloud/cdn.ts

@@ -14,7 +14,7 @@ import { hasFiles } from '@stacksjs/storage'
 import { path as p } from '@stacksjs/path'
 import { env } from '@stacksjs/env'
 import type { NestedCloudProps } from '../types'
-import type { EnvKey } from '../../../../../stack/env'
+import type { EnvKey } from '../../../../../stacks/env'
 
 export interface CdnStackProps extends NestedCloudProps {
   certificate: acm.Certificate
@@ -23,6 +23,8 @@ export interface CdnStackProps extends NestedCloudProps {
   firewall: wafv2.CfnWebACL
   originRequestFunction: lambda.Function
   zone: route53.IHostedZone
+  webServer: lambda.Function
+  webServerUrl: lambda.FunctionUrl
 }
 
 export class CdnStack {
@@ -190,29 +192,25 @@ export class CdnStack {
   }
 
   apiBehaviorOptions(scope: Construct, props: CdnStackProps): Record<string, cloudfront.BehaviorOptions> {
-    const origin = new origins.HttpOrigin(props.lb.loadBalancerDnsName, {
+    const origin = (path: '/api' | '/api/*' = '/api') => new origins.HttpOrigin(props.webServerUrl.url, {
       originPath: path,
-      protocolPolicy: cloudfront.OriginProtocolPolicy.HTTP_ONLY,
+      protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
     })
-    // const origin = (path: '/api' | '/api/*' = '/api') => new origins.LoadBalancerV2Origin(props.lb, {
-    //   originPath: path,
-    //   protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
-    // })
 
     return {
       '/api': {
-        origin,
+        origin: origin(),
         compress: true,
         allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
-        // cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
+        cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
         cachePolicy: this.setApiCachePolicy(scope),
         viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
       },
       '/api/*': {
-        origin,
+        origin: origin('/api/*'),
         compress: true,
         allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
-        // cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
+        cachedMethods: cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS,
         cachePolicy: this.apiCachePolicy,
         viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
       },
@@ -252,13 +250,13 @@ export class CdnStack {
     return {
       '/ai/ask': {
         origin: new origins.HttpOrigin('9qp44a2b7e.execute-api.us-east-1.amazonaws.com', {
-          originPath: '/prod',
+          originPath: '/ai',
           protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
         }),
         compress: false,
         allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
         viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-        cachePolicy: new cloudfront.CachePolicy(scope, 'ApiCachePolicy', {
+        cachePolicy: new cloudfront.CachePolicy(scope, 'AiCachePolicy', {
           comment: 'Stacks AI Cache Policy',
           cachePolicyName: `${this.props.slug}-${this.props.appEnv}-ai-cache-policy`,
           defaultTtl: Duration.seconds(0),
@@ -300,7 +298,7 @@ export class CdnStack {
       const keysToRemove = ['_HANDLER', '_X_AMZN_TRACE_ID', 'AWS_REGION', 'AWS_EXECUTION_ENV', 'AWS_LAMBDA_FUNCTION_NAME', 'AWS_LAMBDA_FUNCTION_MEMORY_SIZE', 'AWS_LAMBDA_FUNCTION_VERSION', 'AWS_LAMBDA_INITIALIZATION_TYPE', 'AWS_LAMBDA_LOG_GROUP_NAME', 'AWS_LAMBDA_LOG_STREAM_NAME', 'AWS_ACCESS_KEY', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AWS_SESSION_TOKEN', 'AWS_LAMBDA_RUNTIME_API', 'LAMBDA_TASK_ROOT', 'LAMBDA_RUNTIME_DIR', '_']
       keysToRemove.forEach(key => delete env[key as EnvKey])
 
-      // behaviorOptions = this.apiBehaviorOptions(scope, props)
+      behaviorOptions = this.apiBehaviorOptions(scope, props)
     }
 
     // if docMode is used, we don't need to add a behavior for the docs

storage/framework/stacks/src/cloud/src/cloud/compute.ts

@@ -5,7 +5,7 @@ import type { Construct } from 'constructs'
 import { path as p } from '@stacksjs/path'
 import { env } from '@stacksjs/env'
 import type { NestedCloudProps } from '../types'
-import type { EnvKey } from '../../../../../stack/env'
+import type { EnvKey } from '../../../../../stacks/env'
 
 export interface ComputeStackProps extends NestedCloudProps {
   vpc: ec2.Vpc
@@ -15,6 +15,9 @@ export interface ComputeStackProps extends NestedCloudProps {
 }
 
 export class ComputeStack {
+  apiServer: lambda.Function
+  apiServerUrl: lambda.FunctionUrl
+
   constructor(scope: Construct, props: ComputeStackProps) {
     const vpc = props.vpc
     const fileSystem = props.fileSystem
@@ -26,7 +29,7 @@ export class ComputeStack {
     //   directory: p.cloudPath('src/server'),
     // })
 
-    const webServer = new lambda.Function(scope, 'WebServer', {
+    this.apiServer = new lambda.Function(scope, 'WebServer', {
       description: 'The web server for the Stacks application',
       code: lambda.Code.fromAssetImage(p.cloudPath('src/server')),
       handler: lambda.Handler.FROM_IMAGE,
@@ -51,18 +54,18 @@ export class ComputeStack {
       },
     })
 
-    secrets.grantRead(webServer)
-    webServer.addEnvironment('SECRETS_ARN', secrets.secretArn)
+    secrets.grantRead(this.apiServer)
+    this.apiServer.addEnvironment('SECRETS_ARN', secrets.secretArn)
 
-    const api = new lambda.FunctionUrl(scope, 'StacksServerUrl', {
-      function: webServer,
+    this.apiServerUrl = new lambda.FunctionUrl(scope, 'StacksServerUrl', {
+      function: this.apiServer,
       authType: lambda.FunctionUrlAuthType.NONE, // becomes a public API
       cors: {
         allowedOrigins: ['*'],
       },
     })
 
-    const apiVanityUrl = api.url
+    const apiVanityUrl = this.apiServerUrl.url
     const apiPrefix = 'api'
 
     new Output(scope, 'ApiUrl', {

storage/framework/stacks/src/cloud/src/cloud/index.ts

@@ -61,7 +61,7 @@ export class Cloud extends Stack {
 
     // new DashboardStack(this)
 
-    new ComputeStack(this, {
+    const api = new ComputeStack(this, {
       ...props,
       vpc: network.vpc,
       fileSystem: fileSystem.fileSystem,
@@ -79,6 +79,8 @@ export class Cloud extends Stack {
       firewall: security.firewall,
       originRequestFunction: docs.originRequestFunction,
       zone: dns.zone,
+      webServer: api.apiServer,
+      webServerUrl: api.apiServerUrl,
     })
 
     new DeploymentStack(this, {