chore: wip

chore: wip

Author: chrisbbreuer

config/cloud.ts

@@ -32,6 +32,7 @@ export default {
   },
 
   ai: true, // deploys AI endpoints
+  cli: true, // deploys CLI setup endpoint
   docs: true, // deploys documentation
   api: true, // deploys API
   fileSystem: true, // enables file system

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

@@ -18,6 +18,7 @@ export interface CdnStackProps extends NestedCloudProps {
   zone: route53.IHostedZone
   webServer: lambda.Function
   webServerUrl: lambda.FunctionUrl
+  cliSetupUrl: lambda.FunctionUrl
 }
 
 export class CdnStack {
@@ -279,10 +280,41 @@ export class CdnStack {
     }
   }
 
+  cliSetupBehaviorOptions(scope: Construct, props: CdnStackProps): Record<string, cloudfront.BehaviorOptions> {
+    // const url = new URL()
+    const hostname = Fn.select(2, Fn.split('/', props.cliSetupUrl.url))
+
+    return {
+      '/install': {
+        origin: new origins.HttpOrigin(hostname, {
+        // origin: new origins.HttpOrigin('tipevv3dfx35fb7ptyq7nrxtga0qkcgc.lambda-url.us-east-1.on.aws', {
+          originPath: '/cli-setup',
+          protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
+        }),
+        compress: false,
+        allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
+        viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+        cachePolicy: new cloudfront.CachePolicy(scope, 'CliSetupCachePolicy', {
+          comment: 'Stacks CLI Setup Cache Policy',
+          cachePolicyName: `${this.props.slug}-${this.props.appEnv}-cli-setup-cache-policy`,
+          defaultTtl: Duration.seconds(0),
+          // minTtl: config.cloud.cdn?.minTtl ? Duration.seconds(config.cloud.cdn.minTtl) : undefined,
+          cookieBehavior: cloudfront.CacheCookieBehavior.none(),
+          headerBehavior: cloudfront.CacheHeaderBehavior.none(),
+          queryStringBehavior: cloudfront.CacheQueryStringBehavior.none(),
+        }),
+      },
+    }
+  }
+
   shouldDeployAiEndpoints() {
     return config.cloud.ai
   }
 
+  shouldDeployCliSetup() {
+    return config.cloud.cli
+  }
+
   shouldDeployDocs() {
     return hasFiles(p.projectPath('docs'))
   }
@@ -313,6 +345,13 @@ export class CdnStack {
       }
     }
 
+    if (this.shouldDeployCliSetup()) {
+      behaviorOptions = {
+        ...this.cliSetupBehaviorOptions(scope, props),
+        ...behaviorOptions,
+      }
+    }
+
     return behaviorOptions
   }
 

storage/framework/core/cloud/src/cloud/cli.ts

@@ -7,6 +7,8 @@ export interface CliStackProps extends NestedCloudProps {
 }
 
 export class CliStack {
+  cliSetupUrl: lambda.FunctionUrl
+
   constructor(scope: Construct, props: CliStackProps) {
     const cliSetupFunc = new lambda.Function(scope, 'CliSetupFunction', {
       functionName: `${props.slug}-${props.appEnv}-cli-setup`,
@@ -19,7 +21,7 @@ export class CliStack {
 
     // create a Lambda.FunctionUrl to be used in the CloudFront OriginRequestPolicy
     // this will be used to trigger the function
-    const cliSetupUrl = new lambda.FunctionUrl(scope, 'CliSetupFunctionUrl', {
+    this.cliSetupUrl = new lambda.FunctionUrl(scope, 'CliSetupFunctionUrl', {
       function: cliSetupFunc,
       authType: lambda.FunctionUrlAuthType.NONE,
       cors: {
@@ -28,7 +30,7 @@ export class CliStack {
     })
 
     new Output(scope, 'CliSetupVanityUrl', {
-      value: `${cliSetupUrl.url}cli-setup`,
+      value: `${this.cliSetupUrl.url}cli-setup`,
     })
 
     // once deployed, need to create logic in the cdn origin request to check if the request is for the cli

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

@@ -72,6 +72,8 @@ export class Cloud extends Stack {
 
     new AiStack(this, props)
 
+    const cli = new CliStack(this, props)
+
     const cdn = new CdnStack(this, {
       ...props,
       publicBucket: storage.publicBucket,
@@ -82,6 +84,7 @@ export class Cloud extends Stack {
       zone: dns.zone,
       webServer: api.apiServer,
       webServerUrl: api.apiServerUrl,
+      cliSetupUrl: cli.cliSetupUrl,
     })
 
     new DeploymentStack(this, {
@@ -90,7 +93,5 @@ export class Cloud extends Stack {
       privateBucket: storage.privateBucket,
       cdn: cdn.distribution,
     })
-
-    new CliStack(this, props)
   }
 }

storage/framework/core/types/src/cloud.ts

@@ -74,6 +74,7 @@ export interface CloudOptions {
   }
 
   ai: boolean
+  cli: boolean
   docs: boolean
   api: boolean
   fileSystem: boolean