eoapi-cdk 7.0.0 → 7.0.1

package/.github/pull_request_template.md

@@ -1,2 +1,4 @@
 ## :warning: Checklist if your PR is changing anything else than documentation
-- [ ] The manual deployment workflow ran successfully
+- [ ] Posted the link to a successful manually triggered deployment workflow (successful including the resources destruction)
+
+## Merge request description

package/.github/workflows/deploy.yaml

@@ -44,9 +44,16 @@ jobs:
           deactivate
           cd -
 
+      # use short commit SHA to name stacks
+      - uses: benjlevesque/short-sha@v3.0
+        id: short-sha
+        with:
+          length: 6
 
       - name: Deploy test stack
         id: deploy_step
+        env:
+          PROJECT_ID: ${{ steps.short-sha.outputs.sha }}
         run: |
           source .deployment_venv/bin/activate
           
@@ -61,6 +68,8 @@ jobs:
           
       - name: Tear down any infrastructure
         if: always()
+        env:
+          PROJECT_ID: ${{ steps.short-sha.outputs.sha }}
         run: |
           cd integration_tests/cdk
           # run this only if we find a 'cdk.out' directory, which means there might be things to tear down

package/.jsii

@@ -6,14 +6,11 @@
       "author"
     ]
   },
-  "bundled": {
-    "module": "^1.2.5"
-  },
   "dependencies": {
-    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "^2.47.0-alpha.0",
-    "@aws-cdk/aws-lambda-python-alpha": "^2.47.0-alpha.0",
-    "aws-cdk-lib": "^2.99.1",
-    "constructs": "^10.1.113"
+    "@aws-cdk/aws-apigatewayv2-alpha": "2.114.1-alpha.0",
+    "@aws-cdk/aws-apigatewayv2-integrations-alpha": "2.114.1-alpha.0",
+    "aws-cdk-lib": "2.130.0",
+    "constructs": "10.3.0"
   },
   "dependencyClosure": {
     "@aws-cdk/asset-awscli-v1": {
@@ -156,37 +153,6 @@
         }
       }
     },
-    "@aws-cdk/aws-lambda-python-alpha": {
-      "targets": {
-        "dotnet": {
-          "iconUrl": "https://raw.githubusercontent.com/aws/aws-cdk/main/logo/default-256-dark.png",
-          "namespace": "Amazon.CDK.AWS.Lambda.Python.Alpha",
-          "packageId": "Amazon.CDK.AWS.Lambda.Python.Alpha"
-        },
-        "go": {
-          "moduleName": "github.com/aws/aws-cdk-go",
-          "packageName": "awscdklambdapythonalpha"
-        },
-        "java": {
-          "maven": {
-            "artifactId": "lambda-python-alpha",
-            "groupId": "software.amazon.awscdk"
-          },
-          "package": "software.amazon.awscdk.services.lambda.python.alpha"
-        },
-        "js": {
-          "npm": "@aws-cdk/aws-lambda-python-alpha"
-        },
-        "python": {
-          "classifiers": [
-            "Framework :: AWS CDK",
-            "Framework :: AWS CDK :: 2"
-          ],
-          "distName": "aws-cdk.aws-lambda-python-alpha",
-          "module": "aws_cdk.aws_lambda_python_alpha"
-        }
-      }
-    },
     "aws-cdk-lib": {
       "submodules": {
         "aws-cdk-lib.alexa_ask": {
@@ -319,6 +285,8 @@
             }
           }
         },
+        "aws-cdk-lib.aws_apigatewayv2_authorizers": {},
+        "aws-cdk-lib.aws_apigatewayv2_integrations": {},
         "aws-cdk-lib.aws_appconfig": {
           "targets": {
             "dotnet": {
@@ -449,6 +417,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_arczonalshift": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.ARCZonalShift"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.arczonalshift"
+            },
+            "python": {
+              "module": "aws_cdk.aws_arczonalshift"
+            }
+          }
+        },
         "aws-cdk-lib.aws_athena": {
           "targets": {
             "dotnet": {
@@ -527,6 +508,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_b2bi": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.B2BI"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.b2bi"
+            },
+            "python": {
+              "module": "aws_cdk.aws_b2bi"
+            }
+          }
+        },
         "aws-cdk-lib.aws_backup": {
           "targets": {
             "dotnet": {
@@ -546,7 +540,7 @@
               "package": "Amazon.CDK.AWS.BackupGateway"
             },
             "java": {
-              "package": "services.backupgateway"
+              "package": "software.amazon.awscdk.services.backupgateway"
             },
             "python": {
               "module": "aws_cdk.aws_backupgateway"
@@ -566,6 +560,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_bedrock": {
+          "targets": {
+            "dotnet": {
+              "namespace": "Amazon.CDK.AWS.Bedrock"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.bedrock"
+            },
+            "python": {
+              "module": "aws_cdk.aws_bedrock"
+            }
+          }
+        },
         "aws-cdk-lib.aws_billingconductor": {
           "targets": {
             "dotnet": {
@@ -650,7 +657,7 @@
               "package": "Amazon.CDK.AWS.CleanRooms"
             },
             "java": {
-              "package": "services.cleanrooms"
+              "package": "software.amazon.awscdk.services.cleanrooms"
             },
             "python": {
               "module": "aws_cdk.aws_cleanrooms"
@@ -1035,6 +1042,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_datazone": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.DataZone"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.datazone"
+            },
+            "python": {
+              "module": "aws_cdk.aws_datazone"
+            }
+          }
+        },
         "aws-cdk-lib.aws_dax": {
           "targets": {
             "dotnet": {
@@ -1392,7 +1412,7 @@
               "package": "Amazon.CDK.AWS.EntityResolution"
             },
             "java": {
-              "package": "services.entityresolution"
+              "package": "software.amazon.awscdk.services.entityresolution"
             },
             "python": {
               "module": "aws_cdk.aws_entityresolution"
@@ -1652,7 +1672,7 @@
               "package": "Amazon.CDK.AWS.HealthImaging"
             },
             "java": {
-              "package": "services.healthimaging"
+              "package": "software.amazon.awscdk.services.healthimaging"
             },
             "python": {
               "module": "aws_cdk.aws_healthimaging"
@@ -2315,7 +2335,7 @@
               "package": "Amazon.CDK.AWS.MediaPackageV2"
             },
             "java": {
-              "package": "services.mediapackagev2"
+              "package": "software.amazon.awscdk.services.mediapackagev2"
             },
             "python": {
               "module": "aws_cdk.aws_mediapackagev2"
@@ -2400,6 +2420,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_neptunegraph": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.NeptuneGraph"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.neptunegraph"
+            },
+            "python": {
+              "module": "aws_cdk.aws_neptunegraph"
+            }
+          }
+        },
         "aws-cdk-lib.aws_networkfirewall": {
           "targets": {
             "dotnet": {
@@ -2536,7 +2569,7 @@
               "package": "Amazon.CDK.AWS.OSIS"
             },
             "java": {
-              "package": "services.osis"
+              "package": "software.amazon.awscdk.services.osis"
             },
             "python": {
               "module": "aws_cdk.aws_osis"
@@ -2562,7 +2595,7 @@
               "package": "Amazon.CDK.AWS.PCAConnectorAD"
             },
             "java": {
-              "package": "services.pcaconnectorad"
+              "package": "software.amazon.awscdk.services.pcaconnectorad"
             },
             "python": {
               "module": "aws_cdk.aws_pcaconnectorad"
@@ -2627,7 +2660,7 @@
               "package": "Amazon.CDK.AWS.Proton"
             },
             "java": {
-              "package": "services.proton"
+              "package": "software.amazon.awscdk.services.proton"
             },
             "python": {
               "module": "aws_cdk.aws_proton"
@@ -2946,6 +2979,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_s3express": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.S3Express"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.s3express"
+            },
+            "python": {
+              "module": "aws_cdk.aws_s3express"
+            }
+          }
+        },
         "aws-cdk-lib.aws_s3objectlambda": {
           "targets": {
             "dotnet": {
@@ -3121,7 +3167,7 @@
               "package": "Amazon.CDK.AWS.Shield"
             },
             "java": {
-              "package": "services.shield"
+              "package": "software.amazon.awscdk.services.shield"
             },
             "python": {
               "module": "aws_cdk.aws_shield"
@@ -3342,7 +3388,7 @@
               "package": "Amazon.CDK.AWS.VerifiedPermissions"
             },
             "java": {
-              "package": "services.verifiedpermissions"
+              "package": "software.amazon.awscdk.services.verifiedpermissions"
             },
             "python": {
               "module": "aws_cdk.aws_verifiedpermissions"
@@ -3440,13 +3486,26 @@
             }
           }
         },
+        "aws-cdk-lib.aws_workspacesthinclient": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.WorkSpacesThinClient"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.workspacesthinclient"
+            },
+            "python": {
+              "module": "aws_cdk.aws_workspacesthinclient"
+            }
+          }
+        },
         "aws-cdk-lib.aws_workspacesweb": {
           "targets": {
             "dotnet": {
               "package": "Amazon.CDK.AWS.WorkSpacesWeb"
             },
             "java": {
-              "package": "services.workspacesweb"
+              "package": "software.amazon.awscdk.services.workspacesweb"
             },
             "python": {
               "module": "aws_cdk.aws_workspacesweb"
@@ -3654,7 +3713,7 @@
     "stability": "experimental"
   },
   "homepage": "https://github.com/developmentseed/eoapi-cdk.git",
-  "jsiiVersion": "1.69.0 (build f656c31)",
+  "jsiiVersion": "5.3.20 (build b624106)",
   "keywords": [],
   "license": "ISC",
   "metadata": {
@@ -5443,6 +5502,6 @@
       "symbolId": "lib/titiler-pgstac-api/index:TitilerPgstacApiLambda"
     }
   },
-  "version": "7.0.0",
-  "fingerprint": "LAh6wDS4tvXQXXgBJ+fgTd9aSpIFHDpLIFNtwmhgL/o="
+  "version": "7.0.1",
+  "fingerprint": "6WkO4jh/XFrvHuPqHle0S/Dhi6EN2V26FMImXyoXVuI="
 }

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [7.0.1](https://github.com/developmentseed/eoapi-cdk/compare/v7.0.0...v7.0.1) (2024-02-23)
+
+
+### Bug Fixes
+
+* dependencies ([#97](https://github.com/developmentseed/eoapi-cdk/issues/97)) ([b09b510](https://github.com/developmentseed/eoapi-cdk/commit/b09b51002b1b2d7fd73ec27d763cd3a511fec2dc))
+
 # [7.0.0](https://github.com/developmentseed/eoapi-cdk/compare/v6.1.0...v7.0.0) (2024-02-22)
 
 

package/integration_tests/cdk/README.md

@@ -1,7 +1,7 @@
 
 # Deployment CDK code for eoapi-cdk deployment tests
 
-This is a wrapper CDK code that is used to test a deployment of the `eoapi-cdk` constructs before a release happens.
+This is a wrapper CDK code that is used to test a deployment of the `eoapi-cdk` constructs.
 
 ## Requirements
 

package/integration_tests/cdk/app.py

@@ -1,17 +1,154 @@
-from aws_cdk import App
+from config import build_app_config, AppConfig
+from aws_cdk import (
+    Stack,
+    aws_ec2,
+    aws_rds,
+    App,
+    RemovalPolicy
+)
+from constructs import Construct
+from eoapi_cdk import (
+    PgStacApiLambda,
+    PgStacDatabase,
+    TitilerPgstacApiLambda,
+    TiPgApiLambda,
+)
+
+
+class VpcStack(Stack):
+    def __init__(self, scope: Construct, app_config: AppConfig, id: str, **kwargs) -> None:
+        super().__init__(
+            scope,
+            id=id,
+            tags=app_config.tags,
+            **kwargs
+        )
+
+        self.vpc = aws_ec2.Vpc(
+            self,
+            "vpc",
+            subnet_configuration=[
+                aws_ec2.SubnetConfiguration(
+                    name="ingress", subnet_type=aws_ec2.SubnetType.PUBLIC, cidr_mask=24
+                ),
+            ]
+        )
+
+        self.vpc.add_interface_endpoint(
+            "SecretsManagerEndpoint",
+            service=aws_ec2.InterfaceVpcEndpointAwsService.SECRETS_MANAGER,
+        )
+
+        self.vpc.add_interface_endpoint(
+            "CloudWatchEndpoint",
+            service=aws_ec2.InterfaceVpcEndpointAwsService.CLOUDWATCH_LOGS,
+        )
+
+        self.vpc.add_gateway_endpoint(
+            "S3", service=aws_ec2.GatewayVpcEndpointAwsService.S3
+        )
+
+        self.export_value(
+            self.vpc.select_subnets(subnet_type=aws_ec2.SubnetType.PUBLIC)
+            .subnets[0]
+            .subnet_id
+        )
+        self.export_value(
+            self.vpc.select_subnets(subnet_type=aws_ec2.SubnetType.PUBLIC)
+            .subnets[1]
+            .subnet_id
+        )
+
+
+class pgStacInfraStack(Stack):
+    def __init__(
+        self,
+        scope: Construct,
+        vpc: aws_ec2.Vpc,
+        id: str,
+        app_config: AppConfig,
+        **kwargs,
+    ) -> None:
+        super().__init__(
+            scope,
+            id=id,
+            tags=app_config.tags,
+            **kwargs,
+        )
+
+        pgstac_db = PgStacDatabase(
+            self,
+            "pgstac-db",
+            vpc=vpc,
+            engine=aws_rds.DatabaseInstanceEngine.postgres(
+                version=aws_rds.PostgresEngineVersion.VER_14
+            ),
+            vpc_subnets=aws_ec2.SubnetSelection(
+                subnet_type=aws_ec2.SubnetType.PUBLIC,
+            ),
+            allocated_storage=app_config.db_allocated_storage,
+            instance_type=aws_ec2.InstanceType(app_config.db_instance_type),
+            removal_policy=RemovalPolicy.DESTROY
+        )
+
+        pgstac_db.db.connections.allow_default_port_from_any_ipv4()
+
+        PgStacApiLambda(
+            self,
+            "pgstac-api",
+            api_env={
+                "NAME": app_config.build_service_name("STAC API"),
+                "description": f"{app_config.stage} STAC API",
+            },
+            db=pgstac_db.db,
+            db_secret=pgstac_db.pgstac_secret
+        )
+
+        TitilerPgstacApiLambda(
+            self,
+            "titiler-pgstac-api",
+            api_env={
+                "NAME": app_config.build_service_name("titiler pgSTAC API"),
+                "description": f"{app_config.stage} titiler pgstac API",
+            },
+            db=pgstac_db.db,
+            db_secret=pgstac_db.pgstac_secret,
+            buckets=[],
+            lambda_function_options={
+                "allow_public_subnet": True,
+            },
+        )
+
+        TiPgApiLambda(
+            self,
+            "tipg-api",
+            db=pgstac_db.db,
+            db_secret=pgstac_db.pgstac_secret,
+            api_env={
+                "NAME": app_config.build_service_name("tipg API"),
+                "description": f"{app_config.stage} tipg API",
+            },
+            lambda_function_options={
+                "allow_public_subnet": True,
+            },
+        )
 
-from config import build_app_config
-from eoapi_template import pgStacInfra, vpc
 
 app = App()
 
 app_config = build_app_config()
 
-vpc_stack = vpc.VpcStack(scope=app, app_config=app_config)
+vpc_stack_id = f"vpc{app_config.project_id}"
+
+vpc_stack = VpcStack(scope=app, app_config=app_config, id=vpc_stack_id)
 
-pgstac_infra_stack = pgStacInfra.pgStacInfraStack(
+pgstac_infra_stack_id = f"pgstac{app_config.project_id}"
+
+pgstac_infra_stack = pgStacInfraStack(
     scope=app,
     vpc=vpc_stack.vpc,
     app_config=app_config,
+    id=pgstac_infra_stack_id
 )
+
 app.synth()

package/integration_tests/cdk/config.py

@@ -14,7 +14,7 @@ class AppConfig(BaseSettings):
         description="AWS account ID"
     )
     project_id: str = pydantic.Field(
-        description="Project ID", default="eoapi-cdk"
+        description="Project ID", default="eoapicdk"
     )
     stage: str = pydantic.Field(description="Stage of deployment", default="test")
     # because of its validator, `tags` should always come after `project_id` and `stage`

package/integration_tests/cdk/package-lock.json

@@ -8,13 +8,13 @@
             "name": "eoapi-template",
             "version": "0.1.0",
             "dependencies": {
-                "aws-cdk": "^2.99.1"
+                "aws-cdk": "2.130.0"
             }
         },
         "node_modules/aws-cdk": {
-            "version": "2.128.0",
-            "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.128.0.tgz",
-            "integrity": "sha512-epOAr/0WKqmyaKqBc7N0Ky5++93pu+v6yVN9jNOa4JYkAkGbeTS3vR9bj/W0o94jnlgWevG3HNHr83jtRvw/4A==",
+            "version": "2.130.0",
+            "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.130.0.tgz",
+            "integrity": "sha512-MsjGzQ2kZv0FEfXvpW7FTJRnefew0GrYt9M2SMN2Yn45+yjugGl2X8to416kABeFz1OFqW56hq8Y5BiLuFDVLQ==",
             "bin": {
                 "cdk": "bin/cdk"
             },

package/integration_tests/cdk/package.json

@@ -2,7 +2,7 @@
     "name": "eoapi-template",
     "version": "0.1.0",
     "dependencies": {
-      "aws-cdk": "^2.99.1"
+      "aws-cdk": "2.130.0"
     }
   }
   

package/integration_tests/cdk/requirements.txt

@@ -1,5 +1,5 @@
-aws-cdk-lib>=2.99.1
-constructs>=10.0.0,<11.0.0
+aws-cdk-lib==2.130.0
+constructs==10.3.0
 pydantic==2.0.2
 pydantic-settings==2.0.1
 python-dotenv==1.0.0

package/lib/bastion-host/index.js

@@ -158,5 +158,5 @@ class BastionHost extends constructs_1.Construct {
 }
 exports.BastionHost = BastionHost;
 _a = JSII_RTTI_SYMBOL_1;
-BastionHost[_a] = { fqn: "eoapi-cdk.BastionHost", version: "7.0.0" };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Stack,\n  aws_ec2 as ec2,\n  aws_iam as iam,\n  aws_rds as rds,\n  CfnOutput,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\n/**\n * The database is located in an isolated subnet, meaning that it is not accessible from the public internet. As such, to interact with the database directly, a user must tunnel through a bastion host.\n *\n * ### Configuring\n *\n * This codebase controls _who_ is allowed to connect to the bastion host. This requires two steps:\n *\n * 1. Adding the IP address from which you are connecting to the `ipv4Allowlist` array\n * 1. Creating a bastion host system user by adding the user's configuration inform to `userdata.yaml`\n *\n * #### Adding an IP address to the `ipv4Allowlist` array\n *\n * The `BastionHost` construct takes in an `ipv4Allowlist` array as an argument. Find your IP address (eg `curl api.ipify.org`) and add that to the array along with the trailing CIDR block (likely `/32` to indicate that you are adding a single IP address).\n *\n * #### Creating a user via `userdata.yaml`\n *\n * Add an entry to the `users` array with a username (likely matching your local systems username, which you can get by running the `whoami` command in your terminal) and a public key (likely your default public key, which you can get by running `cat ~/.ssh/id_*.pub` in your terminal).\n *\n * #### Tips & Tricks when using the Bastion Host\n *\n * **Connecting to RDS Instance via SSM**\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID \\\n * --document-name AWS-StartPortForwardingSessionToRemoteHost \\\n * --parameters '{\n * \"host\": [\n * \"example-db.c5abcdefghij.us-west-2.rds.amazonaws.com\"\n * ],\n * \"portNumber\": [\n * \"5432\"\n * ],\n * \"localPortNumber\": [\n * \"9999\"\n * ]\n * }' \\\n * --profile $AWS_PROFILE\n * ```\n *\n * ```sh\n * psql -h localhost -p 9999 # continue adding username (-U) and db (-d) here...\n * ```\n *\n * Connect directly to Bastion Host:\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID --profile $AWS_PROFILE\n * ```\n *\n * **Setting up an SSH tunnel**\n *\n * In your `~/.ssh/config` file, add an entry like:\n *\n * ```\n * Host db-tunnel\n * Hostname {the-bastion-host-address}\n * LocalForward 9999 {the-db-hostname}:5432\n * ```\n *\n * Then a tunnel can be opened via:\n *\n * ```\n * ssh -N db-tunnel\n * ```\n *\n * And a connection to the DB can be made via:\n *\n * ```\n * psql -h 127.0.0.1 -p 9999 -U {username} -d {database}\n * ```\n *\n * **Handling `REMOTE HOST IDENTIFICATION HAS CHANGED!` error**\n *\n * If you've redeployed a bastion host that you've previously connected to, you may see an error like:\n *\n * ```\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * @    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\n * Someone could be eavesdropping on you right now (man-in-the-middle attack)!\n * It is also possible that a host key has just been changed.\n * The fingerprint for the ECDSA key sent by the remote host is\n * SHA256:mPnxAOXTpb06PFgI1Qc8TMQ2e9b7goU8y2NdS5hzIr8.\n * Please contact your system administrator.\n * Add correct host key in /Users/username/.ssh/known_hosts to get rid of this message.\n * Offending ECDSA key in /Users/username/.ssh/known_hosts:28\n * ECDSA host key for ec2-12-34-56-789.us-west-2.compute.amazonaws.com has changed and you have requested strict checking.\n * Host key verification failed.\n * ```\n *\n * This is due to the server's fingerprint changing. We can scrub the fingerprint from our system with a command like:\n *\n * ```\n * ssh-keygen -R 12.34.56.789\n * ```\n *\n */\nexport class BastionHost extends Construct {\n  instance: ec2.Instance;\n\n  constructor(scope: Construct, id: string, props: BastionHostProps) {\n    super(scope, id);\n\n    const { stackName } = Stack.of(this);\n\n    // Build ec2 instance\n    this.instance = new ec2.Instance(this, \"bastion-host\", {\n      vpc: props.vpc,\n      vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC },\n      instanceName: `${stackName} bastion host`,\n      instanceType: ec2.InstanceType.of(\n        ec2.InstanceClass.BURSTABLE4_GRAVITON,\n        ec2.InstanceSize.NANO\n      ),\n      machineImage: ec2.MachineImage.latestAmazonLinux({\n        generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2,\n        cpuType: ec2.AmazonLinuxCpuType.ARM_64,\n      }),\n      userData: props.userData,\n      userDataCausesReplacement: true,\n    });\n\n    // Assign elastic IP\n    if (props.createElasticIp ?? true) {\n      new ec2.CfnEIP(this, \"IP\", {\n        instanceId: this.instance.instanceId,\n        tags: [{ key: \"Name\", value: stackName }],\n      });\n    }\n\n    // Allow bastion host to connect to db\n    this.instance.connections.allowTo(\n      props.db.connections.securityGroups[0],\n      ec2.Port.tcp(5432),\n      \"Allow connection from bastion host\"\n    );\n\n    // Allow IP access to bastion host\n    for (const ipv4 of props.ipv4Allowlist) {\n      this.instance.connections.allowFrom(\n        ec2.Peer.ipv4(ipv4),\n        ec2.Port.tcp(props.sshPort || 22),\n        \"SSH Access\"\n      );\n    }\n\n    // Integrate with SSM\n    this.instance.addToRolePolicy(\n      new iam.PolicyStatement({\n        actions: [\n          \"ssmmessages:*\",\n          \"ssm:UpdateInstanceInformation\",\n          \"ec2messages:*\",\n        ],\n        resources: [\"*\"],\n      })\n    );\n\n    new CfnOutput(this, \"instance-id-output\", {\n      value: this.instance.instanceId,\n      exportName: `${stackName}-instance-id`,\n    });\n    new CfnOutput(this, \"instance-public-ip-output\", {\n      value: this.instance.instancePublicIp,\n      exportName: `${stackName}-instance-public-ip`,\n    });\n    new CfnOutput(this, \"instance-public-dns-name-output\", {\n      value: this.instance.instancePublicDnsName,\n      exportName: `${stackName}-public-dns-name`,\n    });\n  }\n}\n\nexport interface BastionHostProps {\n  readonly vpc: ec2.IVpc;\n  readonly db: rds.IDatabaseInstance;\n  readonly userData: ec2.UserData;\n  readonly ipv4Allowlist: string[];\n  readonly sshPort?: number;\n\n  /**\n   * Whether or not an elastic IP should be created for the bastion host.\n   *\n   * @default false\n   */\n  readonly createElasticIp?: boolean;\n}\n"]}
+BastionHost[_a] = { fqn: "eoapi-cdk.BastionHost", version: "7.0.1" };
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Stack,\n  aws_ec2 as ec2,\n  aws_iam as iam,\n  aws_rds as rds,\n  CfnOutput,\n} from \"aws-cdk-lib\";\nimport { Construct } from \"constructs\";\n\n/**\n * The database is located in an isolated subnet, meaning that it is not accessible from the public internet. As such, to interact with the database directly, a user must tunnel through a bastion host.\n *\n * ### Configuring\n *\n * This codebase controls _who_ is allowed to connect to the bastion host. This requires two steps:\n *\n * 1. Adding the IP address from which you are connecting to the `ipv4Allowlist` array\n * 1. Creating a bastion host system user by adding the user's configuration inform to `userdata.yaml`\n *\n * #### Adding an IP address to the `ipv4Allowlist` array\n *\n * The `BastionHost` construct takes in an `ipv4Allowlist` array as an argument. Find your IP address (eg `curl api.ipify.org`) and add that to the array along with the trailing CIDR block (likely `/32` to indicate that you are adding a single IP address).\n *\n * #### Creating a user via `userdata.yaml`\n *\n * Add an entry to the `users` array with a username (likely matching your local systems username, which you can get by running the `whoami` command in your terminal) and a public key (likely your default public key, which you can get by running `cat ~/.ssh/id_*.pub` in your terminal).\n *\n * #### Tips & Tricks when using the Bastion Host\n *\n * **Connecting to RDS Instance via SSM**\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID \\\n * --document-name AWS-StartPortForwardingSessionToRemoteHost \\\n * --parameters '{\n * \"host\": [\n * \"example-db.c5abcdefghij.us-west-2.rds.amazonaws.com\"\n * ],\n * \"portNumber\": [\n * \"5432\"\n * ],\n * \"localPortNumber\": [\n * \"9999\"\n * ]\n * }' \\\n * --profile $AWS_PROFILE\n * ```\n *\n * ```sh\n * psql -h localhost -p 9999 # continue adding username (-U) and db (-d) here...\n * ```\n *\n * Connect directly to Bastion Host:\n *\n * ```sh\n * aws ssm start-session --target $INSTANCE_ID --profile $AWS_PROFILE\n * ```\n *\n * **Setting up an SSH tunnel**\n *\n * In your `~/.ssh/config` file, add an entry like:\n *\n * ```\n * Host db-tunnel\n * Hostname {the-bastion-host-address}\n * LocalForward 9999 {the-db-hostname}:5432\n * ```\n *\n * Then a tunnel can be opened via:\n *\n * ```\n * ssh -N db-tunnel\n * ```\n *\n * And a connection to the DB can be made via:\n *\n * ```\n * psql -h 127.0.0.1 -p 9999 -U {username} -d {database}\n * ```\n *\n * **Handling `REMOTE HOST IDENTIFICATION HAS CHANGED!` error**\n *\n * If you've redeployed a bastion host that you've previously connected to, you may see an error like:\n *\n * ```\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * @    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\n * @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n * IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!\n * Someone could be eavesdropping on you right now (man-in-the-middle attack)!\n * It is also possible that a host key has just been changed.\n * The fingerprint for the ECDSA key sent by the remote host is\n * SHA256:mPnxAOXTpb06PFgI1Qc8TMQ2e9b7goU8y2NdS5hzIr8.\n * Please contact your system administrator.\n * Add correct host key in /Users/username/.ssh/known_hosts to get rid of this message.\n * Offending ECDSA key in /Users/username/.ssh/known_hosts:28\n * ECDSA host key for ec2-12-34-56-789.us-west-2.compute.amazonaws.com has changed and you have requested strict checking.\n * Host key verification failed.\n * ```\n *\n * This is due to the server's fingerprint changing. We can scrub the fingerprint from our system with a command like:\n *\n * ```\n * ssh-keygen -R 12.34.56.789\n * ```\n *\n */\nexport class BastionHost extends Construct {\n  instance: ec2.Instance;\n\n  constructor(scope: Construct, id: string, props: BastionHostProps) {\n    super(scope, id);\n\n    const { stackName } = Stack.of(this);\n\n    // Build ec2 instance\n    this.instance = new ec2.Instance(this, \"bastion-host\", {\n      vpc: props.vpc,\n      vpcSubnets: { subnetType: ec2.SubnetType.PUBLIC },\n      instanceName: `${stackName} bastion host`,\n      instanceType: ec2.InstanceType.of(\n        ec2.InstanceClass.BURSTABLE4_GRAVITON,\n        ec2.InstanceSize.NANO\n      ),\n      machineImage: ec2.MachineImage.latestAmazonLinux({\n        generation: ec2.AmazonLinuxGeneration.AMAZON_LINUX_2,\n        cpuType: ec2.AmazonLinuxCpuType.ARM_64,\n      }),\n      userData: props.userData,\n      userDataCausesReplacement: true,\n    });\n\n    // Assign elastic IP\n    if (props.createElasticIp ?? true) {\n      new ec2.CfnEIP(this, \"IP\", {\n        instanceId: this.instance.instanceId,\n        tags: [{ key: \"Name\", value: stackName }],\n      });\n    }\n\n    // Allow bastion host to connect to db\n    this.instance.connections.allowTo(\n      props.db.connections.securityGroups[0],\n      ec2.Port.tcp(5432),\n      \"Allow connection from bastion host\"\n    );\n\n    // Allow IP access to bastion host\n    for (const ipv4 of props.ipv4Allowlist) {\n      this.instance.connections.allowFrom(\n        ec2.Peer.ipv4(ipv4),\n        ec2.Port.tcp(props.sshPort || 22),\n        \"SSH Access\"\n      );\n    }\n\n    // Integrate with SSM\n    this.instance.addToRolePolicy(\n      new iam.PolicyStatement({\n        actions: [\n          \"ssmmessages:*\",\n          \"ssm:UpdateInstanceInformation\",\n          \"ec2messages:*\",\n        ],\n        resources: [\"*\"],\n      })\n    );\n\n    new CfnOutput(this, \"instance-id-output\", {\n      value: this.instance.instanceId,\n      exportName: `${stackName}-instance-id`,\n    });\n    new CfnOutput(this, \"instance-public-ip-output\", {\n      value: this.instance.instancePublicIp,\n      exportName: `${stackName}-instance-public-ip`,\n    });\n    new CfnOutput(this, \"instance-public-dns-name-output\", {\n      value: this.instance.instancePublicDnsName,\n      exportName: `${stackName}-public-dns-name`,\n    });\n  }\n}\n\nexport interface BastionHostProps {\n  readonly vpc: ec2.IVpc;\n  readonly db: rds.IDatabaseInstance;\n  readonly userData: ec2.UserData;\n  readonly ipv4Allowlist: string[];\n  readonly sshPort?: number;\n\n  /**\n   * Whether or not an elastic IP should be created for the bastion host.\n   *\n   * @default false\n   */\n  readonly createElasticIp?: boolean;\n}\n"]}