eoapi-cdk 8.0.0 → 8.0.2

package/.jsii

@@ -3932,7 +3932,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/database/index.ts",
-        "line": 280
+        "line": 279
       },
       "name": "DatabaseParameters",
       "properties": [
@@ -3945,7 +3945,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 296
+            "line": 295
           },
           "name": "effectiveCacheSize",
           "type": {
@@ -3961,7 +3961,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 306
+            "line": 305
           },
           "name": "maintenanceWorkMem",
           "type": {
@@ -3977,7 +3977,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 284
+            "line": 283
           },
           "name": "maxConnections",
           "type": {
@@ -3993,7 +3993,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 311
+            "line": 310
           },
           "name": "maxLocksPerTransaction",
           "type": {
@@ -4009,7 +4009,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 326
+            "line": 325
           },
           "name": "randomPageCost",
           "type": {
@@ -4025,7 +4025,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 321
+            "line": 320
           },
           "name": "seqPageCost",
           "type": {
@@ -4042,7 +4042,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 291
+            "line": 290
           },
           "name": "sharedBuffers",
           "type": {
@@ -4058,7 +4058,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 316
+            "line": 315
           },
           "name": "tempBuffers",
           "type": {
@@ -4074,7 +4074,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 301
+            "line": 300
           },
           "name": "workMem",
           "type": {
@@ -4097,7 +4097,7 @@
         },
         "locationInModule": {
           "filename": "lib/stac-api/index.ts",
-          "line": 21
+          "line": 47
         },
         "parameters": [
           {
@@ -4123,7 +4123,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/stac-api/index.ts",
-        "line": 17
+        "line": 43
       },
       "name": "PgStacApiLambda",
       "properties": [
@@ -4134,7 +4134,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 18
+            "line": 44
           },
           "name": "url",
           "type": {
@@ -4147,7 +4147,7 @@
           },
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 19
+            "line": 45
           },
           "name": "stacApiLambdaFunction",
           "type": {
@@ -4167,7 +4167,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/stac-api/index.ts",
-        "line": 76
+        "line": 138
       },
       "name": "PgStacApiLambdaProps",
       "properties": [
@@ -4180,7 +4180,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 85
+            "line": 147
           },
           "name": "db",
           "type": {
@@ -4205,7 +4205,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 95
+            "line": 157
           },
           "name": "dbSecret",
           "type": {
@@ -4221,7 +4221,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 100
+            "line": 162
           },
           "name": "apiEnv",
           "optional": true,
@@ -4234,6 +4234,29 @@
             }
           }
         },
+        {
+          "abstract": true,
+          "docs": {
+            "default": "- query, sort, fields, filter, free_text, pagniation, collection_search",
+            "stability": "experimental",
+            "summary": "List of STAC API extensions to enable."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/stac-api/index.ts",
+            "line": 174
+          },
+          "name": "enabledExtensions",
+          "optional": true,
+          "type": {
+            "collection": {
+              "elementtype": {
+                "primitive": "string"
+              },
+              "kind": "array"
+            }
+          }
+        },
         {
           "abstract": true,
           "docs": {
@@ -4244,7 +4267,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 112
+            "line": 181
           },
           "name": "lambdaFunctionOptions",
           "optional": true,
@@ -4261,7 +4284,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 105
+            "line": 167
           },
           "name": "stacApiDomainName",
           "optional": true,
@@ -4278,7 +4301,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 90
+            "line": 152
           },
           "name": "subnetSelection",
           "optional": true,
@@ -4295,7 +4318,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/stac-api/index.ts",
-            "line": 80
+            "line": 142
           },
           "name": "vpc",
           "optional": true,
@@ -4321,7 +4344,7 @@
         },
         "locationInModule": {
           "filename": "lib/database/index.ts",
-          "line": 44
+          "line": 43
         },
         "parameters": [
           {
@@ -4347,7 +4370,7 @@
       "kind": "class",
       "locationInModule": {
         "filename": "lib/database/index.ts",
-        "line": 35
+        "line": 34
       },
       "methods": [
         {
@@ -4356,7 +4379,7 @@
           },
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 186
+            "line": 185
           },
           "name": "getParameters",
           "parameters": [
@@ -4395,7 +4418,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 40
+            "line": 39
           },
           "name": "connectionTarget",
           "type": {
@@ -4418,7 +4441,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 42
+            "line": 41
           },
           "name": "secretBootstrapper",
           "optional": true,
@@ -4433,7 +4456,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 41
+            "line": 40
           },
           "name": "securityGroup",
           "optional": true,
@@ -4447,7 +4470,7 @@
           },
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 36
+            "line": 35
           },
           "name": "db",
           "type": {
@@ -4460,7 +4483,7 @@
           },
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 37
+            "line": 36
           },
           "name": "pgstacSecret",
           "type": {
@@ -4483,7 +4506,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/database/index.ts",
-        "line": 226
+        "line": 225
       },
       "name": "PgStacDatabaseProps",
       "properties": [
@@ -4497,7 +4520,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 260
+            "line": 259
           },
           "name": "addPgbouncer",
           "optional": true,
@@ -4515,7 +4538,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 277
+            "line": 276
           },
           "name": "bootstrapperLambdaFunctionOptions",
           "optional": true,
@@ -4533,7 +4556,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 268
+            "line": 267
           },
           "name": "customResourceProperties",
           "optional": true,
@@ -4556,7 +4579,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 232
+            "line": 231
           },
           "name": "pgstacDbName",
           "optional": true,
@@ -4574,7 +4597,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 253
+            "line": 252
           },
           "name": "pgstacUsername",
           "optional": true,
@@ -4592,7 +4615,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 239
+            "line": 238
           },
           "name": "pgstacVersion",
           "optional": true,
@@ -4610,7 +4633,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/database/index.ts",
-            "line": 246
+            "line": 245
           },
           "name": "secretsPrefix",
           "optional": true,
@@ -4917,7 +4940,7 @@
       "kind": "interface",
       "locationInModule": {
         "filename": "lib/ingestor-api/index.ts",
-        "line": 265
+        "line": 273
       },
       "name": "StacIngestorProps",
       "properties": [
@@ -4930,7 +4953,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 269
+            "line": 277
           },
           "name": "dataAccessRole",
           "type": {
@@ -4946,7 +4969,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 284
+            "line": 292
           },
           "name": "stacDbSecret",
           "type": {
@@ -4962,7 +4985,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 294
+            "line": 302
           },
           "name": "stacDbSecurityGroup",
           "type": {
@@ -4978,7 +5001,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 274
+            "line": 282
           },
           "name": "stacUrl",
           "type": {
@@ -4994,7 +5017,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 279
+            "line": 287
           },
           "name": "stage",
           "type": {
@@ -5010,7 +5033,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 309
+            "line": 317
           },
           "name": "apiEndpointConfiguration",
           "optional": true,
@@ -5027,7 +5050,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 304
+            "line": 312
           },
           "name": "apiEnv",
           "optional": true,
@@ -5050,7 +5073,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 326
+            "line": 334
           },
           "name": "apiLambdaFunctionOptions",
           "optional": true,
@@ -5067,7 +5090,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 314
+            "line": 322
           },
           "name": "apiPolicy",
           "optional": true,
@@ -5084,7 +5107,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 319
+            "line": 327
           },
           "name": "ingestorDomainNameOptions",
           "optional": true,
@@ -5102,7 +5125,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 333
+            "line": 341
           },
           "name": "ingestorLambdaFunctionOptions",
           "optional": true,
@@ -5110,6 +5133,24 @@
             "primitive": "any"
           }
         },
+        {
+          "abstract": true,
+          "docs": {
+            "default": "- default settings are defined in the construct",
+            "stability": "experimental",
+            "summary": "pgstac version - must match the version installed on the pgstac database."
+          },
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/ingestor-api/index.ts",
+            "line": 348
+          },
+          "name": "pgstacVersion",
+          "optional": true,
+          "type": {
+            "primitive": "string"
+          }
+        },
         {
           "abstract": true,
           "docs": {
@@ -5119,7 +5160,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 299
+            "line": 307
           },
           "name": "subnetSelection",
           "optional": true,
@@ -5136,7 +5177,7 @@
           "immutable": true,
           "locationInModule": {
             "filename": "lib/ingestor-api/index.ts",
-            "line": 289
+            "line": 297
           },
           "name": "vpc",
           "optional": true,
@@ -5618,6 +5659,6 @@
       "symbolId": "lib/titiler-pgstac-api/index:TitilerPgstacApiLambda"
     }
   },
-  "version": "8.0.0",
-  "fingerprint": "/k8xnh54INJJWLVNyDW3e0dw7v2v/omysQ1NLeey9Ck="
+  "version": "8.0.2",
+  "fingerprint": "BlIi9cM3OjG858To0exIYzoPPxbdVqZryx+/sGygDqY="
 }

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [8.0.2](https://github.com/developmentseed/eoapi-cdk/compare/v8.0.1...v8.0.2) (2025-03-11)
+
+
+### Bug Fixes
+
+* refactor to keep database pgstac and ingestor pypgstac in sync ([#137](https://github.com/developmentseed/eoapi-cdk/issues/137)) ([cdf1a66](https://github.com/developmentseed/eoapi-cdk/commit/cdf1a6629905384b697ef00c39b1a6b10d15b592))
+
+## [8.0.1](https://github.com/developmentseed/eoapi-cdk/compare/v8.0.0...v8.0.1) (2025-03-11)
+
+
+### Bug Fixes
+
+* disable transaction extensions by default ([#136](https://github.com/developmentseed/eoapi-cdk/issues/136)) ([18822f0](https://github.com/developmentseed/eoapi-cdk/commit/18822f09cb6794020cf348a361939e234db4b834))
+
 # [8.0.0](https://github.com/developmentseed/eoapi-cdk/compare/v7.6.3...v8.0.0) (2025-03-11)
 
 

package/integration_tests/cdk/app.py

@@ -1,13 +1,16 @@
-from aws_cdk import App, RemovalPolicy, Stack, aws_ec2, aws_rds
+from aws_cdk import App, RemovalPolicy, Stack, aws_ec2, aws_iam, aws_rds
 from config import AppConfig, build_app_config
 from constructs import Construct
 from eoapi_cdk import (
     PgStacApiLambda,
     PgStacDatabase,
+    StacIngestor,
     TiPgApiLambda,
     TitilerPgstacApiLambda,
 )
 
+PGSTAC_VERSION = "0.9.5"
+
 
 class VpcStack(Stack):
     def __init__(
@@ -81,7 +84,7 @@ class pgStacInfraStack(Stack):
             instance_type=aws_ec2.InstanceType(app_config.db_instance_type),
             add_pgbouncer=True,
             removal_policy=RemovalPolicy.DESTROY,
-            pgstac_version="0.9.2",
+            pgstac_version=PGSTAC_VERSION,
         )
 
         assert pgstac_db.security_group
@@ -137,6 +140,31 @@ class pgStacInfraStack(Stack):
             },
         )
 
+        s3_read_only_role = aws_iam.Role(
+            self,
+            "S3ReadOnlyRole",
+            assumed_by=aws_iam.ServicePrincipal("lambda.amazonaws.com"),
+            description="Role with read-only access to S3 buckets",
+        )
+
+        s3_read_only_role.add_managed_policy(
+            aws_iam.ManagedPolicy.from_aws_managed_policy_name("AmazonS3ReadOnlyAccess")
+        )
+
+        StacIngestor(
+            self,
+            "ingestor",
+            data_access_role=s3_read_only_role,
+            stac_db_secret=pgstac_db.pgstac_secret,
+            stac_db_security_group=pgstac_db.security_group,
+            stac_url=stac_api.url,
+            stage="test",
+            pgstac_version=PGSTAC_VERSION,
+            api_env={
+                "JWKS_URL": "",  # no authentication!
+            },
+        )
+
 
 app = App()
 

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: "8.0.0" };
+BastionHost[_a] = { fqn: "eoapi-cdk.BastionHost", version: "8.0.2" };
 //# 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"]}