fix(infra): fail deployments if something goes wrong (#2410)

* fix(infra): fail deployments if something goes wrong

* fix(infra): remove failing logic

* fix(infra): need to have at least 1 key not 2

Author: blacha

packages/_infra/src/index.ts

@@ -75,4 +75,7 @@ async function main(): Promise<void> {
   new CogBuilderStack(basemaps, 'CogBuilder', { env: { region: BaseMapsRegion, account } });
 }
 
-main().catch((e) => console.error(e));
+main().catch((e) => {
+  console.error(e);
+  process.exit(1);
+});

packages/_infra/src/parameters.ts

@@ -7,14 +7,10 @@ export interface ParametersEdge {
 }
 
 export interface ParametersServe {
-  LambdaXyzAlb: string;
   LambdaXyzUrl: string;
-  LambdaXyzDns: string;
 }
 export const ParametersServeKeys: Record<keyof ParametersServe, string> = {
-  LambdaXyzAlb: 'LambdaXyzAlb',
   LambdaXyzUrl: 'LambdaXyzUrl',
-  LambdaXyzDns: 'LambdaXyzDns',
 };
 
 export const ParametersEdgeKeys: Record<keyof ParametersEdge, string> = {
@@ -53,6 +49,7 @@ export async function getParameters<T extends ParameterKeys>(
 
     output[param as keyof T] = edgeParam as any;
   }
-  if (Object.keys(output).length > 1) return output as T;
+
+  if (Object.keys(output).length > 0) return output as T;
   return null;
 }

packages/_infra/src/serve/index.ts

@@ -21,7 +21,6 @@ export class ServeStack extends cdk.Stack {
 
     const lambda = new LambdaTiler(this, 'LambdaTiler', { staticBucketName: props.staticBucketName });
     const table = new TileMetadataTable(this, 'TileMetadata');
-    table.table.grantReadData(lambda.lambdaVpc);
     table.table.grantReadData(lambda.lambdaNoVpc);
 
     new cdk.CfnOutput(this, ParametersServeKeys.LambdaXyzUrl, { value: lambda.functionUrl.url });

packages/_infra/src/serve/lambda.tiler.ts

@@ -17,12 +17,10 @@ export interface LambdaTilerProps {
  * Create a API Key validation edge lambda
  */
 export class LambdaTiler extends Construct {
-  public lambda: lambda.Function[];
   public version: lambda.Version;
   public functionUrl: lambda.FunctionUrl;
 
   public lambdaNoVpc: lambda.Function;
-  public lambdaVpc: lambda.Function;
 
   public constructor(scope: cdk.Stack, id: string, props: LambdaTilerProps) {
     super(scope, id);
@@ -61,13 +59,11 @@ export class LambdaTiler extends Construct {
     if (props.staticBucketName) {
       const staticBucket = s3.Bucket.fromBucketName(this, 'StaticBucket', props.staticBucketName);
       staticBucket.grantRead(this.lambdaNoVpc);
-      staticBucket.grantRead(this.lambdaVpc);
     }
 
     for (const bucketName of config.CogBucket) {
       const cogBucket = s3.Bucket.fromBucketName(this, `CogBucket${bucketName}`, bucketName);
       cogBucket.grantRead(this.lambdaNoVpc);
-      cogBucket.grantRead(this.lambdaVpc);
     }
   }
 }