Light, fluffy, and always free - The AWS Local Emulator alternative
feat: Adds initial Elastic Beanstalk Query API support to Floci. (#1362)
kotov228efacb371301a
diff --git a/README.md b/README.mdindex 290c929b60..aa5daa6c2d 100644--- a/README.md+++ b/README.md@@ -178,7 +178,7 @@ LocalStack's community edition [sunset in March 2026](https://blog.localstack.cl| CodeBuild | Real Docker execution | No || Native binary | ~40 MB | No |-**64 AWS services. Broad coverage. Free forever.**+**65 AWS services. Broad coverage. Free forever.**## Architecture Overview@@ -190,7 +190,7 @@ flowchart LRRouter["HTTP Router\nJAX-RS / Vert.x"]subgraph Stateless ["Stateless Services"]- A["SSM · SQS · SNS\nIAM · STS · KMS\nSecrets Manager · SES\nCognito · Kinesis\nEventBridge · Scheduler · AppConfig\nCloudWatch · Step Functions\nCloudFormation · ACM · Config\nAPI Gateway · AppSync · ELB v2 · Auto Scaling\nCodeDeploy · CodePipeline · Backup · Bedrock Runtime · Route53 · Transfer"]+ A["SSM · SQS · SNS\nIAM · STS · KMS\nSecrets Manager · SES\nCognito · Kinesis\nEventBridge · Scheduler · AppConfig\nCloudWatch · Step Functions\nCloudFormation · ACM · Config\nAPI Gateway · AppSync · ELB v2 · Auto Scaling\nElastic Beanstalk · CodeDeploy · CodePipeline · Backup · Bedrock Runtime · Route53 · Transfer"]endsubgraph Stateful ["Stateful Services"]@@ -222,7 +222,7 @@ Floci supports local emulation for application services, data services, eventing| Core app services | S3, SQS, SNS, DynamoDB, Lambda, IAM, KMS, Secrets Manager, SSM || Events and workflows | EventBridge, EventBridge Pipes, EventBridge Scheduler, Step Functions, CloudWatch Logs, CloudWatch Metrics || API and identity | API Gateway REST, API Gateway v2, AppSync, Cognito, ACM, Route53, Cloud Map |-| Containers and compute | ECS, EC2, EKS, ECR, CodeBuild, CodeDeploy, CodePipeline, AWS Batch, Auto Scaling, ELB v2 |+| Containers and compute | ECS, EC2, EKS, ECR, CodeBuild, CodeDeploy, CodePipeline, AWS Batch, Auto Scaling, Elastic Beanstalk, ELB v2 || Data, analytics, and AI | Athena, Glue, EMR, Firehose, OpenSearch, S3 Vectors, Textract, Transcribe, Bedrock Runtime || Databases and caching | RDS, RDS Data API, Neptune, DocumentDB, MemoryDB, ElastiCache || Messaging and transfer | SES, Kinesis, MSK, Transfer Family |@@ -287,6 +287,7 @@ For operation-level compatibility, see the [Services Overview](https://floci.io/| CodePipeline | In-process orchestration | Pipelines, executions, S3 artifacts, approvals, local providers, custom workers || AWS Batch | In-process | Compute environments, job queues, job definitions, job submission and lifecycle || Auto Scaling | In-process with reconciler | Launch configs, ASGs, desired capacity reconciliation, lifecycle hooks |+| Elastic Beanstalk | In-process | Applications, application versions, environments, configuration templates, platform and solution stack metadata || AWS Backup | In-process | Vaults, backup plans, selections, simulated job lifecycle, recovery points || AWS Config | In-process | Config rules, configuration recorders, delivery channels, conformance packs, tagging || CloudTrail | In-process | Trail lifecycle, event selectors, logging status; management API only |diff --git a/compatibility-tests/sdk-test-java/pom.xml b/compatibility-tests/sdk-test-java/pom.xmlindex f4f62a5e55..d6d9ab7b5f 100644--- a/compatibility-tests/sdk-test-java/pom.xml+++ b/compatibility-tests/sdk-test-java/pom.xml@@ -147,6 +147,10 @@<groupId>software.amazon.awssdk</groupId><artifactId>elasticache</artifactId></dependency>+ <dependency>+ <groupId>software.amazon.awssdk</groupId>+ <artifactId>elasticbeanstalk</artifactId>+ </dependency><dependency><groupId>io.lettuce</groupId><artifactId>lettuce-core</artifactId>diff --git a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.javaindex 08a4e67de4..c67ab5a636 100644--- a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java+++ b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java@@ -44,6 +44,7 @@ import software.amazon.awssdk.services.resourcegroupstaggingapi.ResourceGroupsTaimport software.amazon.awssdk.services.apigateway.ApiGatewayClient;import software.amazon.awssdk.services.apigatewayv2.ApiGatewayV2Client;import software.amazon.awssdk.services.elasticache.ElastiCacheClient;+import software.amazon.awssdk.services.elasticbeanstalk.ElasticBeanstalkClient;import software.amazon.awssdk.services.acm.AcmClient;import software.amazon.awssdk.services.ec2.Ec2Client;import software.amazon.awssdk.services.ecr.EcrClient;@@ -555,6 +556,14 @@ public final class TestFixtures {.build();}+ public static ElasticBeanstalkClient elasticBeanstalkClient() {+ return ElasticBeanstalkClient.builder()+ .endpointOverride(ENDPOINT)+ .region(REGION)+ .credentialsProvider(CREDENTIALS)+ .build();+ }+public static ApiGatewayClient apiGatewayClient() {return ApiGatewayClient.builder().endpointOverride(ENDPOINT)diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElasticBeanstalkTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElasticBeanstalkTest.javanew file mode 100644index 0000000000..8a8799901a--- /dev/null+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElasticBeanstalkTest.java@@ -0,0 +1,165 @@+package com.floci.test;++import org.junit.jupiter.api.AfterAll;+import org.junit.jupiter.api.BeforeAll;+import org.junit.jupiter.api.DisplayName;+import org.junit.jupiter.api.Test;+import software.amazon.awssdk.services.elasticbeanstalk.ElasticBeanstalkClient;+import software.amazon.awssdk.services.elasticbeanstalk.model.ConfigurationOptionSetting;+import software.amazon.awssdk.services.elasticbeanstalk.model.CreateApplicationRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.CreateApplicationVersionRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.CreateEnvironmentRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeApplicationsRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeApplicationVersionsRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeConfigurationSettingsRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.DescribeEnvironmentsRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.S3Location;+import software.amazon.awssdk.services.elasticbeanstalk.model.TerminateEnvironmentRequest;+import software.amazon.awssdk.services.elasticbeanstalk.model.UpdateEnvironmentRequest;++import static org.assertj.core.api.Assertions.assertThat;++@DisplayName("Elastic Beanstalk")+class ElasticBeanstalkTest {++ private static ElasticBeanstalkClient elasticBeanstalk;+ private static String applicationName;+ private static String environmentName;++ @BeforeAll+ static void setup() {+ elasticBeanstalk = TestFixtures.elasticBeanstalkClient();+ applicationName = TestFixtures.uniqueName("sdk-eb-app");+ environmentName = TestFixtures.uniqueName("sdk-eb-env");+ }++ @AfterAll+ static void cleanup() {+ if (elasticBeanstalk != null) {+ try {+ elasticBeanstalk.terminateEnvironment(TerminateEnvironmentRequest.builder()+ .environmentName(environmentName)+ .build());+ } catch (Exception ignored) {+ }+ elasticBeanstalk.close();+ }+ }++ @Test+ @DisplayName("SDK unmarshals Query responses for application, version, and environment lifecycle")+ void sdkLifecycleFlow() {+ String versionLabel = "v1";+ String cnamePrefix = TestFixtures.uniqueName("sdk-eb-cname");++ var application = elasticBeanstalk.createApplication(CreateApplicationRequest.builder()+ .applicationName(applicationName)+ .description("Elastic Beanstalk SDK compatibility app")+ .build());++ assertThat(application.application().applicationName()).isEqualTo(applicationName);+ assertThat(application.application().applicationArn())+ .endsWith(":application/" + applicationName);+ assertThat(application.application().configurationTemplates()).contains("default");++ var version = elasticBeanstalk.createApplicationVersion(CreateApplicationVersionRequest.builder()+ .applicationName(applicationName)+ .versionLabel(versionLabel)+ .description("Initial SDK version")+ .sourceBundle(S3Location.builder()+ .s3Bucket("source-bucket")+ .s3Key("app-v1.zip")+ .build())+ .build());++ assertThat(version.applicationVersion().applicationName()).isEqualTo(applicationName);+ assertThat(version.applicationVersion().versionLabel()).isEqualTo(versionLabel);+ assertThat(version.applicationVersion().sourceBundle().s3Bucket()).isEqualTo("source-bucket");++ var environment = elasticBeanstalk.createEnvironment(CreateEnvironmentRequest.builder()+ .applicationName(applicationName)+ .environmentName(environmentName)+ .versionLabel(versionLabel)+ .cnamePrefix(cnamePrefix)+ .solutionStackName("64bit Amazon Linux 2023 v4.3.0 running Docker")+ .optionSettings(ConfigurationOptionSetting.builder()+ .namespace("aws:elasticbeanstalk:application:environment")+ .optionName("SPRING_PROFILES_ACTIVE")+ .value("test")+ .build())+ .build());++ assertThat(environment.environmentName()).isEqualTo(environmentName);+ assertThat(environment.applicationName()).isEqualTo(applicationName);+ assertThat(environment.statusAsString()).isEqualTo("Ready");+ assertThat(environment.healthAsString()).isEqualTo("Green");+ assertThat(environment.cname()).isEqualTo(cnamePrefix + ".elasticbeanstalk.local");++ var applications = elasticBeanstalk.describeApplications(DescribeApplicationsRequest.builder()+ .applicationNames(applicationName)+ .build());+ assertThat(applications.applications()).singleElement().satisfies(app -> {+ assertThat(app.applicationName()).isEqualTo(applicationName);+ assertThat(app.applicationArn()).endsWith(":application/" + applicationName);+ assertThat(app.versions()).contains(versionLabel);+ });++ var versions = elasticBeanstalk.describeApplicationVersions(DescribeApplicationVersionsRequest.builder()+ .applicationName(applicationName)+ .versionLabels(versionLabel)+ .build());+ assertThat(versions.applicationVersions()).singleElement().satisfies(appVersion -> {+ assertThat(appVersion.applicationName()).isEqualTo(applicationName);+ assertThat(appVersion.versionLabel()).isEqualTo(versionLabel);+ assertThat(appVersion.sourceBundle().s3Key()).isEqualTo("app-v1.zip");+ });++ var described = elasticBeanstalk.describeEnvironments(DescribeEnvironmentsRequest.builder()+ .applicationName(applicationName)+ .environmentNames(environmentName)+ .build());+ assertThat(described.environments()).singleElement().satisfies(env -> {+ assertThat(env.environmentName()).isEqualTo(environmentName);+ assertThat(env.statusAsString()).isEqualTo("Ready");+ assertThat(env.endpointURL()).startsWith("awseb-");+ });++ var updated = elasticBeanstalk.updateEnvironment(UpdateEnvironmentRequest.builder()+ .environmentName(environmentName)+ .description("Updated SDK environment")+ .optionSettings(ConfigurationOptionSetting.builder()+ .namespace("aws:elasticbeanstalk:application:environment")+ .optionName("SPRING_PROFILES_ACTIVE")+ .value("prod")+ .build())+ .build());++ assertThat(updated.environmentName()).isEqualTo(environmentName);+ assertThat(updated.description()).isEqualTo("Updated SDK environment");++ var settings = elasticBeanstalk.describeConfigurationSettings(DescribeConfigurationSettingsRequest.builder()+ .applicationName(applicationName)+ .environmentName(environmentName)+ .build());+ assertThat(settings.configurationSettings()).singleElement()+ .satisfies(configuration -> assertThat(configuration.optionSettings())+ .anySatisfy(option -> {+ assertThat(option.optionName()).isEqualTo("SPRING_PROFILES_ACTIVE");+ assertThat(option.value()).isEqualTo("prod");+ }));++ var terminated = elasticBeanstalk.terminateEnvironment(TerminateEnvironmentRequest.builder()+ .environmentName(environmentName)+ .build());+ assertThat(terminated.environmentName()).isEqualTo(environmentName);+ assertThat(terminated.statusAsString()).isEqualTo("Terminated");++ var deletedEnvironments = elasticBeanstalk.describeEnvironments(DescribeEnvironmentsRequest.builder()+ .applicationName(applicationName)+ .environmentNames(environmentName)+ .includeDeleted(true)+ .build());+ assertThat(deletedEnvironments.environments()).singleElement()+ .satisfies(env -> assertThat(env.statusAsString()).isEqualTo("Terminated"));+ }+}diff --git a/docs/index.md b/docs/index.mdindex 7f39c851ac..719d3098f5 100644--- a/docs/index.md+++ b/docs/index.md@@ -12,7 +12,7 @@ Floci is a fast, free, and open-source local AWS service emulator built for deve## Supported Services-Floci emulates 59 AWS services. See the [Services Overview](services/index.md) for per-service operation counts, endpoints, and full protocol details.+Floci emulates 65 AWS services. See the [Services Overview](services/index.md) for per-service operation counts, endpoints, and full protocol details.| Service | Protocol ||---|---|@@ -58,6 +58,7 @@ Floci emulates 59 AWS services. See the [Services Overview](services/index.md) f| EKS | REST JSON || ELB v2 | Query || Auto Scaling | Query |+| Elastic Beanstalk | Query || CodeBuild | JSON 1.1 || CodeDeploy | JSON 1.1 || CodePipeline | JSON 1.1 |@@ -108,7 +109,7 @@ docker compose up -daws --endpoint-url http://localhost:4566 s3 mb s3://my-bucket```-All 59 AWS services are immediately available at `http://localhost:4566`.+All 65 AWS services are immediately available at `http://localhost:4566`.[Get started →](getting-started/quick-start.md){ .md-button .md-button--primary }[View services →](services/index.md){ .md-button }diff --git a/docs/services/elastic-beanstalk.md b/docs/services/elastic-beanstalk.mdnew file mode 100644index 0000000000..4d923fc728--- /dev/null+++ b/docs/services/elastic-beanstalk.md@@ -0,0 +1,53 @@+# Elastic Beanstalk++Floci implements the AWS Elastic Beanstalk management API as a Query-protocol service with stored application, application version, and environment state.++**Protocol:** Query — `POST /` with `Action=` form parameter, credential scope `elasticbeanstalk`++The handler also accepts Elastic Beanstalk's documented `Operation=` parameter alias.++## Supported Operations (14 total)++| Operation | Notes |+|---|---|+| `CreateApplication` | Creates an application with the default configuration template |+| `DescribeApplications` | Lists all applications or filters by `ApplicationNames.member.N` |+| `UpdateApplication` | Updates application description |+| `DeleteApplication` | Deletes an application; `TerminateEnvByForce=true` terminates active environments first |+| `CreateApplicationVersion` | Stores version metadata and optional `SourceBundle.S3Bucket` / `SourceBundle.S3Key` |+| `DescribeApplicationVersions` | Lists versions, optionally filtered by application and version labels |+| `DeleteApplicationVersion` | Removes a stored application version |+| `CreateEnvironment` | Creates an environment in immediate `Ready` / `Green` state |+| `DescribeEnvironments` | Lists environments by application, name, ID, version, and `IncludeDeleted` |+| `UpdateEnvironment` | Updates description, version label, platform fields, and option settings |+| `TerminateEnvironment` | Marks an environment as `Terminated` |+| `DescribeConfigurationSettings` | Returns stored environment option settings |+| `CheckDNSAvailability` | Checks CNAME availability against stored environments |+| `ListAvailableSolutionStacks` | Returns a small built-in platform list |++## Configuration++| Variable | Default | Description |+|---|---|---|+| `FLOCI_SERVICES_ELASTICBEANSTALK_ENABLED` | `true` | Enable or disable the service |++## Usage Example++```bash+aws elasticbeanstalk create-application \+ --application-name sample-app++aws elasticbeanstalk create-application-version \+ --application-name sample-app \+ --version-label v1 \+ --source-bundle S3Bucket=source-bucket,S3Key=app-v1.zip++aws elasticbeanstalk create-environment \+ --application-name sample-app \+ --environment-name sample-env \+ --version-label v1 \+ --solution-stack-name "64bit Amazon Linux 2023 v4.3.0 running Docker"++aws elasticbeanstalk describe-environments \+ --application-name sample-app+```diff --git a/docs/services/index.md b/docs/services/index.mdindex c19a3e8457..c92330aef4 100644--- a/docs/services/index.md+++ b/docs/services/index.md@@ -1,6 +1,6 @@# Services Overview-Floci emulates 59 AWS services on a single port (`4566`). All services use the real AWS wire protocol, your existing AWS CLI commands and SDK clients work without modification.+Floci emulates 65 AWS services on a single port (`4566`). All services use the real AWS wire protocol, your existing AWS CLI commands and SDK clients work without modification.This page is the canonical reference for supported service and operation counts. Some services expose separate control-plane and data-plane rows below. Other docs (and the README) should link here rather than duplicating the table.@@ -59,6 +59,7 @@ Operation counts are exact. For dispatch-table services (Query and JSON 1.1) eac| [ELB v2](elb.md) | `POST /` with `Action=` param | Query | 34 || [WAF v2](wafv2.md) | `POST /` + `X-Amz-Target: AWSWAF_20190729.*` | JSON 1.1 | 35 || [Auto Scaling](autoscaling.md) | `POST /` with `Action=` param | Query | 33 |+| [Elastic Beanstalk](elastic-beanstalk.md) | `POST /` with `Action=` or `Operation=` param | Query | 14 || [CodeBuild](codebuild.md) | `POST /` + `X-Amz-Target: CodeBuild_20161006.*` | JSON 1.1 | 20 || [AWS Batch](batch.md) | `/v1/...` | REST JSON | 10 || [CodeDeploy](codedeploy.md) | `POST /` + `X-Amz-Target: CodeDeploy_20141006.*` | JSON 1.1 | 30 |diff --git a/mkdocs.yml b/mkdocs.ymlindex 442277fb1b..c1540c4d9b 100644--- a/mkdocs.yml+++ b/mkdocs.yml@@ -115,6 +115,7 @@ nav:- Bedrock Runtime: services/bedrock-runtime.md- ELB v2: services/elb.md- Auto Scaling: services/autoscaling.md+ - Elastic Beanstalk: services/elastic-beanstalk.md- CodeBuild: services/codebuild.md- AWS Batch: services/batch.md- CodeDeploy: services/codedeploy.mddiff --git a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.javaindex 655fe41fa6..78d865a07a 100644--- a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java+++ b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java@@ -430,6 +430,7 @@ public interface EmulatorConfig {CodeDeployServiceConfig codedeploy();CodePipelineServiceConfig codepipeline();AutoScalingServiceConfig autoscaling();+ ElasticBeanstalkServiceConfig elasticbeanstalk();BackupServiceConfig backup();NeptuneServiceConfig neptune();DocDbServiceConfig docdb();@@ -501,6 +502,11 @@ public interface EmulatorConfig {boolean enabled();}+ interface ElasticBeanstalkServiceConfig {+ @WithDefault("true")+ boolean enabled();+ }+interface CodeBuildServiceConfig {@WithDefault("true")boolean enabled();diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.javaindex 5774896597..c4fc69ab1a 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.java@@ -19,6 +19,7 @@ public final class AwsNamespaces {public static final String EC2 = "http://ec2.amazonaws.com/doc/2016-11-15/";public static final String ELB_V2 = "https://elasticloadbalancing.amazonaws.com/doc/2015-12-01/";public static final String AUTOSCALING = "https://autoscaling.amazonaws.com/doc/2011-01-01/";+ public static final String ELASTIC_BEANSTALK = "https://elasticbeanstalk.amazonaws.com/docs/2010-12-01/";public static final String ROUTE53 = "https://route53.amazonaws.com/doc/2013-04-01/";public static final String CLOUDFRONT = "http://cloudfront.amazonaws.com/doc/2020-05-31/";diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.javaindex 200a4ace32..85c33f5c78 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java@@ -7,6 +7,7 @@ import io.github.hectorvent.floci.services.docdb.DocDbService;import io.github.hectorvent.floci.services.autoscaling.AutoScalingQueryHandler;import io.github.hectorvent.floci.services.cloudformation.CloudFormationQueryHandler;import io.github.hectorvent.floci.services.ec2.Ec2QueryHandler;+import io.github.hectorvent.floci.services.elasticbeanstalk.ElasticBeanstalkQueryHandler;import io.github.hectorvent.floci.services.elbv2.ElbV2QueryHandler;import io.github.hectorvent.floci.services.cloudwatch.metrics.CloudWatchMetricsQueryHandler;import io.github.hectorvent.floci.services.cognito.CognitoJsonHandler;@@ -194,6 +195,7 @@ public class AwsQueryController {private final Ec2QueryHandler ec2QueryHandler;private final ElbV2QueryHandler elbV2QueryHandler;private final AutoScalingQueryHandler autoScalingQueryHandler;+ private final ElasticBeanstalkQueryHandler elasticBeanstalkQueryHandler;private final ResolvedServiceCatalog catalog;private final RegionResolver regionResolver;@@ -213,6 +215,7 @@ public class AwsQueryController {Ec2QueryHandler ec2QueryHandler,ElbV2QueryHandler elbV2QueryHandler,AutoScalingQueryHandler autoScalingQueryHandler,+ ElasticBeanstalkQueryHandler elasticBeanstalkQueryHandler,ResolvedServiceCatalog catalog,RegionResolver regionResolver) {this.cloudFormationQueryHandler = cloudFormationQueryHandler;@@ -232,6 +235,7 @@ public class AwsQueryController {this.ec2QueryHandler = ec2QueryHandler;this.elbV2QueryHandler = elbV2QueryHandler;this.autoScalingQueryHandler = autoScalingQueryHandler;+ this.elasticBeanstalkQueryHandler = elasticBeanstalkQueryHandler;this.catalog = catalog;this.regionResolver = regionResolver;}@@ -245,6 +249,9 @@ public class AwsQueryController {MultivaluedMap<String, String> formParams) {String action = formParams.getFirst("Action");+ if (action == null) {+ action = formParams.getFirst("Operation");+ }if (action == null) {return xmlErrorResponse("MissingAction","The request must contain the parameter Action", 400);@@ -290,6 +297,7 @@ public class AwsQueryController {case "ec2" -> ec2QueryHandler.handle(action, formParams, region);case "elasticloadbalancing" -> elbV2QueryHandler.handle(action, formParams, region);case "autoscaling" -> autoScalingQueryHandler.handle(action, formParams, region);+ case "elasticbeanstalk" -> elasticBeanstalkQueryHandler.handle(action, formParams, region);default -> xmlErrorResponse("UnknownService","Unknown or unsupported service: " + service, 400);};@@ -329,6 +337,13 @@ public class AwsQueryController {"ListTagsForResource", "TagResource", "UntagResource");+ private static final Set<String> ELASTIC_BEANSTALK_ACTIONS = Set.of(+ "CreateApplication", "DescribeApplications", "UpdateApplication", "DeleteApplication",+ "CreateApplicationVersion", "DescribeApplicationVersions", "DeleteApplicationVersion",+ "CreateEnvironment", "DescribeEnvironments", "UpdateEnvironment", "TerminateEnvironment",+ "DescribeConfigurationSettings", "CheckDNSAvailability", "ListAvailableSolutionStacks"+ );+private static final Set<String> RDS_ACTIONS = Set.of("CreateDBInstance", "DescribeDBInstances", "DeleteDBInstance","ModifyDBInstance", "RebootDBInstance",@@ -437,6 +452,9 @@ public class AwsQueryController {if (AUTOSCALING_ACTIONS.contains(action)) {return "autoscaling";}+ if (ELASTIC_BEANSTALK_ACTIONS.contains(action)) {+ return "elasticbeanstalk";+ }// SQS actions are numerous and not enumerated — fall back to sqs only for// requests that arrived without an Authorization header (raw/test clients)return "sqs";diff --git a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.javaindex 66e6c201bc..be69aaad77 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java@@ -285,6 +285,12 @@ public class ResolvedServiceCatalog {"autoscaling", config.storage().mode(), 5000L, AwsNamespaces.AUTOSCALING, ServiceProtocol.QUERY,protocols(ServiceProtocol.QUERY),Set.of(), Set.of("autoscaling"), Set.of(), Set.of()),+ descriptor("elasticbeanstalk", "elasticbeanstalk",+ config.services().elasticbeanstalk().enabled(), true,+ "elasticbeanstalk", config.storage().mode(), 5000L,+ AwsNamespaces.ELASTIC_BEANSTALK, ServiceProtocol.QUERY,+ protocols(ServiceProtocol.QUERY),+ Set.of(), Set.of("elasticbeanstalk"), Set.of(), Set.of()),descriptor("backup", "backup", config.services().backup().enabled(), true,"backup", storageMode(config.storage().services().backup().mode(), config.storage().mode()),config.storage().services().backup().flushIntervalMs(), null, ServiceProtocol.REST_JSON,diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkQueryHandler.javanew file mode 100644index 0000000000..b3b762dd5e--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkQueryHandler.java@@ -0,0 +1,329 @@+package io.github.hectorvent.floci.services.elasticbeanstalk;++import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.AwsNamespaces;+import io.github.hectorvent.floci.core.common.AwsQueryResponse;+import io.github.hectorvent.floci.core.common.XmlBuilder;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkApplication;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkApplicationVersion;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkEnvironment;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.ConfigurationOptionSetting;+import jakarta.enterprise.context.ApplicationScoped;+import jakarta.inject.Inject;+import jakarta.ws.rs.core.MultivaluedMap;+import jakarta.ws.rs.core.Response;+import org.jboss.logging.Logger;++import java.time.ZoneOffset;+import java.time.format.DateTimeFormatter;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++@ApplicationScoped+public class ElasticBeanstalkQueryHandler {++ private static final Logger LOG = Logger.getLogger(ElasticBeanstalkQueryHandler.class);+ private static final String NS = AwsNamespaces.ELASTIC_BEANSTALK;+ private static final DateTimeFormatter ISO_FMT =+ DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").withZone(ZoneOffset.UTC);++ private final ElasticBeanstalkService service;++ @Inject+ ElasticBeanstalkQueryHandler(ElasticBeanstalkService service) {+ this.service = service;+ }++ public Response handle(String action, MultivaluedMap<String, String> p, String region) {+ LOG.debugv("Elastic Beanstalk action: {0}", action);+ try {+ return switch (action) {+ case "CreateApplication" -> createApplication(p, region);+ case "DescribeApplications" -> describeApplications(p, region);+ case "UpdateApplication" -> updateApplication(p, region);+ case "DeleteApplication" -> deleteApplication(p, region);+ case "CreateApplicationVersion" -> createApplicationVersion(p, region);+ case "DescribeApplicationVersions" -> describeApplicationVersions(p, region);+ case "DeleteApplicationVersion" -> deleteApplicationVersion(p, region);+ case "CreateEnvironment" -> createEnvironment(p, region);+ case "DescribeEnvironments" -> describeEnvironments(p, region);+ case "UpdateEnvironment" -> updateEnvironment(p, region);+ case "TerminateEnvironment" -> terminateEnvironment(p, region);+ case "DescribeConfigurationSettings" -> describeConfigurationSettings(p, region);+ case "CheckDNSAvailability" -> checkDnsAvailability(p, region);+ case "ListAvailableSolutionStacks" -> listAvailableSolutionStacks();+ default -> AwsQueryResponse.error("UnsupportedOperation",+ "Operation " + action + " is not supported.", NS, 400);+ };+ } catch (AwsException e) {+ return AwsQueryResponse.error(e.getErrorCode(), e.getMessage(), NS, e.getHttpStatus());+ } catch (Exception e) {+ LOG.errorv(e, "Unexpected error in Elastic Beanstalk {0}", action);+ return AwsQueryResponse.error("InternalFailure", e.getMessage(), NS, 500);+ }+ }++ private Response createApplication(MultivaluedMap<String, String> p, String region) {+ BeanstalkApplication app = service.createApplication(region, p.getFirst("ApplicationName"),+ p.getFirst("Description"), parseTags(p));+ return ok(AwsQueryResponse.envelope("CreateApplication", NS,+ new XmlBuilder().start("Application").raw(applicationInnerXml(app)).end("Application").build()));+ }++ private Response describeApplications(MultivaluedMap<String, String> p, String region) {+ XmlBuilder xml = new XmlBuilder().start("Applications");+ for (BeanstalkApplication app : service.describeApplications(region, memberList(p, "ApplicationNames"))) {+ xml.start("member").raw(applicationInnerXml(app)).end("member");+ }+ xml.end("Applications");+ return ok(AwsQueryResponse.envelope("DescribeApplications", NS, xml.build()));+ }++ private Response updateApplication(MultivaluedMap<String, String> p, String region) {+ BeanstalkApplication app = service.updateApplication(region, p.getFirst("ApplicationName"),+ p.getFirst("Description"));+ return ok(AwsQueryResponse.envelope("UpdateApplication", NS,+ new XmlBuilder().start("Application").raw(applicationInnerXml(app)).end("Application").build()));+ }++ private Response deleteApplication(MultivaluedMap<String, String> p, String region) {+ service.deleteApplication(region, p.getFirst("ApplicationName"),+ "true".equalsIgnoreCase(p.getFirst("TerminateEnvByForce")));+ return ok(AwsQueryResponse.envelopeEmptyResult("DeleteApplication", NS));+ }++ private Response createApplicationVersion(MultivaluedMap<String, String> p, String region) {+ BeanstalkApplicationVersion version = service.createApplicationVersion(region,+ p.getFirst("ApplicationName"),+ p.getFirst("VersionLabel"),+ p.getFirst("Description"),+ "true".equalsIgnoreCase(p.getFirst("AutoCreateApplication")),+ p.getFirst("SourceBundle.S3Bucket"),+ p.getFirst("SourceBundle.S3Key"),+ parseTags(p));+ return ok(AwsQueryResponse.envelope("CreateApplicationVersion", NS,+ new XmlBuilder().start("ApplicationVersion")+ .raw(applicationVersionInnerXml(version))+ .end("ApplicationVersion").build()));+ }++ private Response describeApplicationVersions(MultivaluedMap<String, String> p, String region) {+ XmlBuilder xml = new XmlBuilder().start("ApplicationVersions");+ for (BeanstalkApplicationVersion version : service.describeApplicationVersions(region,+ p.getFirst("ApplicationName"), memberList(p, "VersionLabels"))) {+ xml.start("member").raw(applicationVersionInnerXml(version)).end("member");+ }+ xml.end("ApplicationVersions");+ return ok(AwsQueryResponse.envelope("DescribeApplicationVersions", NS, xml.build()));+ }++ private Response deleteApplicationVersion(MultivaluedMap<String, String> p, String region) {+ service.deleteApplicationVersion(region, p.getFirst("ApplicationName"), p.getFirst("VersionLabel"));+ return ok(AwsQueryResponse.envelopeEmptyResult("DeleteApplicationVersion", NS));+ }++ private Response createEnvironment(MultivaluedMap<String, String> p, String region) {+ BeanstalkEnvironment env = service.createEnvironment(region,+ p.getFirst("ApplicationName"),+ p.getFirst("EnvironmentName"),+ p.getFirst("Description"),+ p.getFirst("CNAMEPrefix"),+ p.getFirst("SolutionStackName"),+ p.getFirst("PlatformArn"),+ p.getFirst("TemplateName"),+ p.getFirst("VersionLabel"),+ parseOptionSettings(p),+ parseTags(p));+ return ok(AwsQueryResponse.envelope("CreateEnvironment", NS, environmentInnerXml(env)));+ }++ private Response describeEnvironments(MultivaluedMap<String, String> p, String region) {+ XmlBuilder xml = new XmlBuilder().start("Environments");+ for (BeanstalkEnvironment env : service.describeEnvironments(region,+ p.getFirst("ApplicationName"),+ memberList(p, "EnvironmentNames"),+ memberList(p, "EnvironmentIds"),+ p.getFirst("VersionLabel"),+ "true".equalsIgnoreCase(p.getFirst("IncludeDeleted")))) {+ xml.start("member").raw(environmentInnerXml(env)).end("member");+ }+ xml.end("Environments");+ return ok(AwsQueryResponse.envelope("DescribeEnvironments", NS, xml.build()));+ }++ private Response updateEnvironment(MultivaluedMap<String, String> p, String region) {+ BeanstalkEnvironment env = service.updateEnvironment(region,+ p.getFirst("EnvironmentName"),+ p.getFirst("EnvironmentId"),+ p.getFirst("Description"),+ p.getFirst("VersionLabel"),+ p.getFirst("SolutionStackName"),+ p.getFirst("PlatformArn"),+ parseOptionSettings(p));+ return ok(AwsQueryResponse.envelope("UpdateEnvironment", NS, environmentInnerXml(env)));+ }++ private Response terminateEnvironment(MultivaluedMap<String, String> p, String region) {+ BeanstalkEnvironment env = service.terminateEnvironment(region,+ p.getFirst("EnvironmentName"), p.getFirst("EnvironmentId"));+ return ok(AwsQueryResponse.envelope("TerminateEnvironment", NS, environmentInnerXml(env)));+ }++ private Response describeConfigurationSettings(MultivaluedMap<String, String> p, String region) {+ List<ConfigurationOptionSetting> settings = service.describeConfigurationSettings(region,+ p.getFirst("ApplicationName"), p.getFirst("EnvironmentName"), p.getFirst("TemplateName"));+ XmlBuilder xml = new XmlBuilder()+ .start("ConfigurationSettings")+ .start("member")+ .elem("ApplicationName", p.getFirst("ApplicationName"))+ .elem("EnvironmentName", p.getFirst("EnvironmentName"))+ .elem("TemplateName", p.getFirst("TemplateName"))+ .elem("DeploymentStatus", "deployed")+ .start("OptionSettings");+ appendOptionSettings(xml, settings);+ xml.end("OptionSettings").end("member").end("ConfigurationSettings");+ return ok(AwsQueryResponse.envelope("DescribeConfigurationSettings", NS, xml.build()));+ }++ private Response checkDnsAvailability(MultivaluedMap<String, String> p, String region) {+ String cnamePrefix = p.getFirst("CNAMEPrefix");+ boolean available = service.isCnameAvailable(cnamePrefix, region);+ String result = new XmlBuilder()+ .elem("Available", available)+ .elem("FullyQualifiedCNAME", cnamePrefix + ".elasticbeanstalk.local")+ .build();+ return ok(AwsQueryResponse.envelope("CheckDNSAvailability", NS, result));+ }++ private Response listAvailableSolutionStacks() {+ XmlBuilder xml = new XmlBuilder()+ .start("SolutionStacks");+ for (String stack : service.listAvailableSolutionStacks()) {+ xml.elem("member", stack);+ }+ xml.end("SolutionStacks").start("SolutionStackDetails").end("SolutionStackDetails");+ return ok(AwsQueryResponse.envelope("ListAvailableSolutionStacks", NS, xml.build()));+ }++ private static String applicationInnerXml(BeanstalkApplication app) {+ XmlBuilder xml = new XmlBuilder()+ .elem("ApplicationName", app.getApplicationName())+ .elem("ApplicationArn", app.getApplicationArn())+ .elem("Description", app.getDescription())+ .elem("DateCreated", ISO_FMT.format(app.getDateCreated()))+ .elem("DateUpdated", ISO_FMT.format(app.getDateUpdated()))+ .start("Versions");+ for (String version : app.getVersions()) {+ xml.elem("member", version);+ }+ xml.end("Versions").start("ConfigurationTemplates");+ for (String template : app.getConfigurationTemplates()) {+ xml.elem("member", template);+ }+ return xml.end("ConfigurationTemplates").build();+ }++ private static String applicationVersionInnerXml(BeanstalkApplicationVersion version) {+ XmlBuilder xml = new XmlBuilder()+ .elem("ApplicationName", version.getApplicationName())+ .elem("VersionLabel", version.getVersionLabel())+ .elem("Description", version.getDescription())+ .elem("DateCreated", ISO_FMT.format(version.getDateCreated()))+ .elem("DateUpdated", ISO_FMT.format(version.getDateUpdated()))+ .elem("Status", version.getStatus());+ if (version.getSourceBundleBucket() != null || version.getSourceBundleKey() != null) {+ xml.start("SourceBundle")+ .elem("S3Bucket", version.getSourceBundleBucket())+ .elem("S3Key", version.getSourceBundleKey())+ .end("SourceBundle");+ }+ return xml.build();+ }++ private static String environmentInnerXml(BeanstalkEnvironment env) {+ return new XmlBuilder()+ .elem("EnvironmentName", env.getEnvironmentName())+ .elem("EnvironmentId", env.getEnvironmentId())+ .elem("EnvironmentArn", env.getEnvironmentArn())+ .elem("ApplicationName", env.getApplicationName())+ .elem("VersionLabel", env.getVersionLabel())+ .elem("SolutionStackName", env.getSolutionStackName())+ .elem("PlatformArn", env.getPlatformArn())+ .elem("TemplateName", env.getTemplateName())+ .elem("Description", env.getDescription())+ .elem("EndpointURL", env.getEndpointUrl())+ .elem("CNAME", env.getCname())+ .elem("Status", env.getStatus())+ .elem("Health", env.getHealth())+ .elem("HealthStatus", env.getHealthStatus())+ .elem("AbortableOperationInProgress", false)+ .elem("DateCreated", ISO_FMT.format(env.getDateCreated()))+ .elem("DateUpdated", ISO_FMT.format(env.getDateUpdated()))+ .start("Tier")+ .elem("Name", "WebServer")+ .elem("Type", "Standard")+ .elem("Version", "1.0")+ .end("Tier")+ .build();+ }++ private static void appendOptionSettings(XmlBuilder xml, List<ConfigurationOptionSetting> settings) {+ for (ConfigurationOptionSetting setting : settings) {+ xml.start("member")+ .elem("Namespace", setting.getNamespace())+ .elem("OptionName", setting.getOptionName())+ .elem("ResourceName", setting.getResourceName())+ .elem("Value", setting.getValue())+ .end("member");+ }+ }++ private static List<String> memberList(MultivaluedMap<String, String> p, String prefix) {+ List<String> values = new ArrayList<>();+ for (int i = 1; ; i++) {+ String value = p.getFirst(prefix + ".member." + i);+ if (value == null) {+ break;+ }+ values.add(value);+ }+ return values;+ }++ private static Map<String, String> parseTags(MultivaluedMap<String, String> p) {+ Map<String, String> tags = new LinkedHashMap<>();+ for (int i = 1; ; i++) {+ String key = p.getFirst("Tags.member." + i + ".Key");+ String value = p.getFirst("Tags.member." + i + ".Value");+ if (key == null && value == null) {+ break;+ }+ if (key != null) {+ tags.put(key, value != null ? value : "");+ }+ }+ return tags;+ }++ private static List<ConfigurationOptionSetting> parseOptionSettings(MultivaluedMap<String, String> p) {+ List<ConfigurationOptionSetting> settings = new ArrayList<>();+ for (int i = 1; ; i++) {+ String prefix = "OptionSettings.member." + i + ".";+ String namespace = p.getFirst(prefix + "Namespace");+ String optionName = p.getFirst(prefix + "OptionName");+ String resourceName = p.getFirst(prefix + "ResourceName");+ String value = p.getFirst(prefix + "Value");+ if (namespace == null && optionName == null && resourceName == null && value == null) {+ break;+ }+ settings.add(new ConfigurationOptionSetting(namespace, optionName, resourceName, value));+ }+ return settings;+ }++ private static Response ok(String xml) {+ return Response.ok(xml).build();+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkService.java b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkService.javanew file mode 100644index 0000000000..59f5b45da0--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkService.java@@ -0,0 +1,418 @@+package io.github.hectorvent.floci.services.elasticbeanstalk;++import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.RegionResolver;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkApplication;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkApplicationVersion;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.BeanstalkEnvironment;+import io.github.hectorvent.floci.services.elasticbeanstalk.model.ConfigurationOptionSetting;+import jakarta.enterprise.context.ApplicationScoped;+import jakarta.inject.Inject;++import java.security.SecureRandom;+import java.time.Instant;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.Objects;+import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;++@ApplicationScoped+public class ElasticBeanstalkService {++ private static final SecureRandom RANDOM = new SecureRandom();+ private static final String LOWER_ALNUM = "abcdefghijklmnopqrstuvwxyz0123456789";+ private static final String DEFAULT_SOLUTION_STACK =+ "64bit Amazon Linux 2023 v4.3.0 running Docker";++ private final RegionResolver regionResolver;+ private final Map<String, BeanstalkApplication> applications = new ConcurrentHashMap<>();+ private final Map<String, BeanstalkApplicationVersion> versions = new ConcurrentHashMap<>();+ private final Map<String, BeanstalkEnvironment> environments = new ConcurrentHashMap<>();++ @Inject+ ElasticBeanstalkService(RegionResolver regionResolver) {+ this.regionResolver = regionResolver;+ }++ public BeanstalkApplication createApplication(String region, String name, String description,+ Map<String, String> tags) {+ requireName(name, "ApplicationName");+ String key = appKey(region, name);+ if (applications.containsKey(key)) {+ throw new AwsException("InvalidParameterValue",+ "Application " + name + " already exists.", 400);+ }+ Instant now = Instant.now();+ BeanstalkApplication app = new BeanstalkApplication();+ app.setApplicationName(name);+ app.setApplicationArn(regionResolver.buildArn("elasticbeanstalk", region, "application/" + name));+ app.setDescription(description);+ app.setDateCreated(now);+ app.setDateUpdated(now);+ app.getConfigurationTemplates().add("default");+ app.getTags().putAll(tags);+ applications.put(key, app);+ return app;+ }++ public Collection<BeanstalkApplication> describeApplications(String region, List<String> names) {+ if (names != null && !names.isEmpty()) {+ List<BeanstalkApplication> result = new ArrayList<>();+ for (String name : names) {+ BeanstalkApplication app = applications.get(appKey(region, name));+ if (app != null) {+ result.add(app);+ }+ }+ return result;+ }+ return applications.entrySet().stream()+ .filter(e -> e.getKey().startsWith(region + "::"))+ .map(Map.Entry::getValue)+ .sorted(Comparator.comparing(BeanstalkApplication::getApplicationName))+ .toList();+ }++ public BeanstalkApplication updateApplication(String region, String name, String description) {+ BeanstalkApplication app = requireApplication(region, name);+ if (description != null) {+ app.setDescription(description);+ }+ app.setDateUpdated(Instant.now());+ return app;+ }++ public void deleteApplication(String region, String name, boolean terminateEnvByForce) {+ requireApplication(region, name);+ List<BeanstalkEnvironment> activeEnvironments = environments.entrySet().stream()+ .filter(e -> e.getKey().startsWith(region + "::"))+ .map(Map.Entry::getValue)+ .filter(env -> name.equals(env.getApplicationName()))+ .filter(env -> !"Terminated".equals(env.getStatus()))+ .toList();+ if (!activeEnvironments.isEmpty() && !terminateEnvByForce) {+ throw new AwsException("InvalidParameterValue",+ "Application " + name + " has active environments.", 400);+ }+ for (BeanstalkEnvironment env : activeEnvironments) {+ terminateEnvironment(region, env.getEnvironmentName(), env.getEnvironmentId());+ }+ applications.remove(appKey(region, name));+ versions.entrySet().removeIf(e -> e.getKey().startsWith(versionPrefix(region, name)));+ }++ public BeanstalkApplicationVersion createApplicationVersion(String region, String applicationName,+ String versionLabel, String description,+ boolean autoCreateApplication,+ String sourceBundleBucket,+ String sourceBundleKey,+ Map<String, String> tags) {+ requireName(applicationName, "ApplicationName");+ requireName(versionLabel, "VersionLabel");+ BeanstalkApplication app = applications.get(appKey(region, applicationName));+ if (app == null && autoCreateApplication) {+ app = createApplication(region, applicationName, null, Map.of());+ }+ if (app == null) {+ throw new AwsException("InvalidParameterValue",+ "No Application named " + applicationName + " found.", 400);+ }+ String key = versionKey(region, applicationName, versionLabel);+ if (versions.containsKey(key)) {+ throw new AwsException("InvalidParameterValue",+ "Application Version " + versionLabel + " already exists.", 400);+ }+ Instant now = Instant.now();+ BeanstalkApplicationVersion version = new BeanstalkApplicationVersion();+ version.setApplicationName(applicationName);+ version.setVersionLabel(versionLabel);+ version.setDescription(description);+ version.setSourceBundleBucket(sourceBundleBucket);+ version.setSourceBundleKey(sourceBundleKey);+ version.setDateCreated(now);+ version.setDateUpdated(now);+ version.setStatus("Processed");+ version.getTags().putAll(tags);+ versions.put(key, version);+ app.getVersions().add(versionLabel);+ app.setDateUpdated(now);+ return version;+ }++ public Collection<BeanstalkApplicationVersion> describeApplicationVersions(String region,+ String applicationName,+ List<String> labels) {+ return versions.entrySet().stream()+ .filter(e -> e.getKey().startsWith(region + "::"))+ .map(Map.Entry::getValue)+ .filter(version -> applicationName == null || applicationName.equals(version.getApplicationName()))+ .filter(version -> labels == null || labels.isEmpty() || labels.contains(version.getVersionLabel()))+ .sorted(Comparator.comparing(BeanstalkApplicationVersion::getApplicationName)+ .thenComparing(BeanstalkApplicationVersion::getVersionLabel))+ .toList();+ }++ public void deleteApplicationVersion(String region, String applicationName, String versionLabel) {+ requireName(applicationName, "ApplicationName");+ requireName(versionLabel, "VersionLabel");+ BeanstalkApplicationVersion removed = versions.remove(versionKey(region, applicationName, versionLabel));+ if (removed == null) {+ throw new AwsException("InvalidParameterValue",+ "No Application Version named " + versionLabel + " found.", 400);+ }+ BeanstalkApplication app = applications.get(appKey(region, applicationName));+ if (app != null) {+ app.getVersions().remove(versionLabel);+ app.setDateUpdated(Instant.now());+ }+ }++ public BeanstalkEnvironment createEnvironment(String region, String applicationName, String environmentName,+ String description, String cnamePrefix, String solutionStackName,+ String platformArn, String templateName, String versionLabel,+ List<ConfigurationOptionSetting> optionSettings,+ Map<String, String> tags) {+ requireApplication(region, applicationName);+ if (environmentName == null || environmentName.isBlank()) {+ environmentName = generatedEnvironmentName(applicationName);+ }+ validateEnvironmentName(environmentName);+ if (environments.containsKey(envKey(region, environmentName))) {+ throw new AwsException("InvalidParameterValue",+ "Environment " + environmentName + " already exists.", 400);+ }+ if (versionLabel != null && !versions.containsKey(versionKey(region, applicationName, versionLabel))) {+ throw new AwsException("InvalidParameterValue",+ "No Application Version named " + versionLabel + " found.", 400);+ }++ Instant now = Instant.now();+ String envId = "e-" + randomLower(10);+ BeanstalkEnvironment env = new BeanstalkEnvironment();+ env.setApplicationName(applicationName);+ env.setEnvironmentId(envId);+ env.setEnvironmentName(environmentName);+ env.setEnvironmentArn(regionResolver.buildArn("elasticbeanstalk", region,+ "environment/" + applicationName + "/" + environmentName));+ env.setDescription(description);+ env.setCname(cname(cnamePrefix, environmentName));+ env.setEndpointUrl("awseb-" + envId + "." + region + ".elasticbeanstalk.local");+ env.setSolutionStackName(firstNonBlank(solutionStackName, DEFAULT_SOLUTION_STACK));+ env.setPlatformArn(platformArn);+ env.setTemplateName(templateName);+ env.setVersionLabel(versionLabel);+ env.setStatus("Ready");+ env.setHealth("Green");+ env.setHealthStatus("Ok");+ env.setDateCreated(now);+ env.setDateUpdated(now);+ env.getOptionSettings().addAll(optionSettings);+ env.getTags().putAll(tags);+ environments.put(envKey(region, environmentName), env);+ return env;+ }++ public Collection<BeanstalkEnvironment> describeEnvironments(String region, String applicationName,+ List<String> environmentNames,+ List<String> environmentIds,+ String versionLabel,+ boolean includeDeleted) {+ Set<String> names = environmentNames == null ? Set.of() : Set.copyOf(environmentNames);+ Set<String> ids = environmentIds == null ? Set.of() : Set.copyOf(environmentIds);+ return environments.entrySet().stream()+ .filter(e -> e.getKey().startsWith(region + "::"))+ .map(Map.Entry::getValue)+ .filter(env -> applicationName == null || applicationName.equals(env.getApplicationName()))+ .filter(env -> names.isEmpty() || names.contains(env.getEnvironmentName()))+ .filter(env -> ids.isEmpty() || ids.contains(env.getEnvironmentId()))+ .filter(env -> versionLabel == null || versionLabel.equals(env.getVersionLabel()))+ .filter(env -> includeDeleted || !"Terminated".equals(env.getStatus()))+ .sorted(Comparator.comparing(BeanstalkEnvironment::getEnvironmentName))+ .toList();+ }++ public BeanstalkEnvironment updateEnvironment(String region, String environmentName, String environmentId,+ String description, String versionLabel,+ String solutionStackName, String platformArn,+ List<ConfigurationOptionSetting> optionSettings) {+ BeanstalkEnvironment env = requireEnvironment(region, environmentName, environmentId);+ if ("Terminated".equals(env.getStatus())) {+ throw new AwsException("InvalidParameterValue",+ "Environment " + env.getEnvironmentName() + " is terminated.", 400);+ }+ if (versionLabel != null && !versions.containsKey(versionKey(region, env.getApplicationName(), versionLabel))) {+ throw new AwsException("InvalidParameterValue",+ "No Application Version named " + versionLabel + " found.", 400);+ }+ if (description != null) {+ env.setDescription(description);+ }+ if (versionLabel != null) {+ env.setVersionLabel(versionLabel);+ }+ if (solutionStackName != null) {+ env.setSolutionStackName(solutionStackName);+ }+ if (platformArn != null) {+ env.setPlatformArn(platformArn);+ }+ if (!optionSettings.isEmpty()) {+ mergeOptionSettings(env.getOptionSettings(), optionSettings);+ }+ env.setStatus("Ready");+ env.setHealth("Green");+ env.setHealthStatus("Ok");+ env.setDateUpdated(Instant.now());+ return env;+ }++ public BeanstalkEnvironment terminateEnvironment(String region, String environmentName, String environmentId) {+ BeanstalkEnvironment env = requireEnvironment(region, environmentName, environmentId);+ env.setStatus("Terminated");+ env.setHealth("Grey");+ env.setHealthStatus("NoData");+ env.setDateUpdated(Instant.now());+ return env;+ }++ public List<ConfigurationOptionSetting> describeConfigurationSettings(String region, String applicationName,+ String environmentName,+ String templateName) {+ requireApplication(region, applicationName);+ if ((environmentName == null || environmentName.isBlank()) && (templateName == null || templateName.isBlank())) {+ throw new AwsException("MissingParameter",+ "Either EnvironmentName or TemplateName must be specified.", 400);+ }+ if (environmentName != null && templateName != null) {+ throw new AwsException("InvalidParameterCombination",+ "EnvironmentName and TemplateName cannot both be specified.", 400);+ }+ if (environmentName != null) {+ return List.copyOf(requireEnvironment(region, environmentName, null).getOptionSettings());+ }+ return List.of();+ }++ public boolean isCnameAvailable(String cnamePrefix, String region) {+ requireName(cnamePrefix, "CNAMEPrefix");+ String candidate = cname(cnamePrefix, cnamePrefix);+ return environments.entrySet().stream()+ .filter(e -> e.getKey().startsWith(region + "::"))+ .map(Map.Entry::getValue)+ .noneMatch(env -> candidate.equals(env.getCname()));+ }++ public List<String> listAvailableSolutionStacks() {+ return List.of(+ DEFAULT_SOLUTION_STACK,+ "64bit Amazon Linux 2023 v4.4.0 running Corretto 21",+ "64bit Amazon Linux 2023 v4.4.0 running Python 3.13",+ "64bit Amazon Linux 2023 v6.5.0 running Node.js 22"+ );+ }++ private BeanstalkApplication requireApplication(String region, String name) {+ requireName(name, "ApplicationName");+ BeanstalkApplication app = applications.get(appKey(region, name));+ if (app == null) {+ throw new AwsException("InvalidParameterValue",+ "No Application named " + name + " found.", 400);+ }+ return app;+ }++ private BeanstalkEnvironment requireEnvironment(String region, String environmentName, String environmentId) {+ if ((environmentName == null || environmentName.isBlank()) && (environmentId == null || environmentId.isBlank())) {+ throw new AwsException("MissingParameter",+ "Either EnvironmentName or EnvironmentId must be specified.", 400);+ }+ if (environmentName != null && !environmentName.isBlank()) {+ BeanstalkEnvironment env = environments.get(envKey(region, environmentName));+ if (env != null && (environmentId == null || environmentId.equals(env.getEnvironmentId()))) {+ return env;+ }+ }+ if (environmentId != null && !environmentId.isBlank()) {+ return environments.entrySet().stream()+ .filter(e -> e.getKey().startsWith(region + "::"))+ .map(Map.Entry::getValue)+ .filter(env -> environmentId.equals(env.getEnvironmentId()))+ .findFirst()+ .orElseThrow(() -> new AwsException("InvalidParameterValue",+ "No Environment found for id " + environmentId + ".", 400));+ }+ throw new AwsException("InvalidParameterValue",+ "No Environment named " + environmentName + " found.", 400);+ }++ private void mergeOptionSettings(List<ConfigurationOptionSetting> existing,+ List<ConfigurationOptionSetting> incoming) {+ for (ConfigurationOptionSetting next : incoming) {+ existing.removeIf(setting -> Objects.equals(setting.getNamespace(), next.getNamespace())+ && Objects.equals(setting.getOptionName(), next.getOptionName())+ && Objects.equals(setting.getResourceName(), next.getResourceName()));+ existing.add(next);+ }+ }++ private static void requireName(String value, String field) {+ if (value == null || value.isBlank()) {+ throw new AwsException("MissingParameter", field + " is required.", 400);+ }+ }++ private static void validateEnvironmentName(String name) {+ if (name.length() < 4 || name.length() > 40 || name.startsWith("-") || name.endsWith("-")+ || !name.matches("[A-Za-z0-9-]+")) {+ throw new AwsException("InvalidParameterValue",+ "EnvironmentName must be 4 to 40 characters and contain only letters, numbers, and hyphens.", 400);+ }+ }++ private static String generatedEnvironmentName(String applicationName) {+ String base = applicationName.replaceAll("[^A-Za-z0-9-]", "-");+ if (base.length() > 27) {+ base = base.substring(0, 27);+ }+ return base + "-" + randomLower(8);+ }++ private static String cname(String cnamePrefix, String environmentName) {+ String prefix = firstNonBlank(cnamePrefix, environmentName);+ return prefix + ".elasticbeanstalk.local";+ }++ private static String firstNonBlank(String first, String fallback) {+ return first == null || first.isBlank() ? fallback : first;+ }++ private static String randomLower(int length) {+ StringBuilder result = new StringBuilder(length);+ for (int i = 0; i < length; i++) {+ result.append(LOWER_ALNUM.charAt(RANDOM.nextInt(LOWER_ALNUM.length())));+ }+ return result.toString();+ }++ private static String appKey(String region, String name) {+ return region + "::" + name;+ }++ private static String versionPrefix(String region, String applicationName) {+ return region + "::" + applicationName + "::";+ }++ private static String versionKey(String region, String applicationName, String versionLabel) {+ return versionPrefix(region, applicationName) + versionLabel;+ }++ private static String envKey(String region, String environmentName) {+ return region + "::" + environmentName;+ }++}diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkApplication.java b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkApplication.javanew file mode 100644index 0000000000..52c2dfb4d9--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkApplication.java@@ -0,0 +1,71 @@+package io.github.hectorvent.floci.services.elasticbeanstalk.model;++import java.time.Instant;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++public class BeanstalkApplication {++ private String applicationName;+ private String applicationArn;+ private String description;+ private Instant dateCreated;+ private Instant dateUpdated;+ private final List<String> versions = new ArrayList<>();+ private final List<String> configurationTemplates = new ArrayList<>();+ private final Map<String, String> tags = new LinkedHashMap<>();++ public String getApplicationName() {+ return applicationName;+ }++ public void setApplicationName(String applicationName) {+ this.applicationName = applicationName;+ }++ public String getApplicationArn() {+ return applicationArn;+ }++ public void setApplicationArn(String applicationArn) {+ this.applicationArn = applicationArn;+ }++ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ public Instant getDateCreated() {+ return dateCreated;+ }++ public void setDateCreated(Instant dateCreated) {+ this.dateCreated = dateCreated;+ }++ public Instant getDateUpdated() {+ return dateUpdated;+ }++ public void setDateUpdated(Instant dateUpdated) {+ this.dateUpdated = dateUpdated;+ }++ public List<String> getVersions() {+ return versions;+ }++ public List<String> getConfigurationTemplates() {+ return configurationTemplates;+ }++ public Map<String, String> getTags() {+ return tags;+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkApplicationVersion.java b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkApplicationVersion.javanew file mode 100644index 0000000000..21c8c7d951--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkApplicationVersion.java@@ -0,0 +1,86 @@+package io.github.hectorvent.floci.services.elasticbeanstalk.model;++import java.time.Instant;+import java.util.LinkedHashMap;+import java.util.Map;++public class BeanstalkApplicationVersion {++ private String applicationName;+ private String versionLabel;+ private String description;+ private String sourceBundleBucket;+ private String sourceBundleKey;+ private Instant dateCreated;+ private Instant dateUpdated;+ private String status;+ private final Map<String, String> tags = new LinkedHashMap<>();++ public String getApplicationName() {+ return applicationName;+ }++ public void setApplicationName(String applicationName) {+ this.applicationName = applicationName;+ }++ public String getVersionLabel() {+ return versionLabel;+ }++ public void setVersionLabel(String versionLabel) {+ this.versionLabel = versionLabel;+ }++ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ public String getSourceBundleBucket() {+ return sourceBundleBucket;+ }++ public void setSourceBundleBucket(String sourceBundleBucket) {+ this.sourceBundleBucket = sourceBundleBucket;+ }++ public String getSourceBundleKey() {+ return sourceBundleKey;+ }++ public void setSourceBundleKey(String sourceBundleKey) {+ this.sourceBundleKey = sourceBundleKey;+ }++ public Instant getDateCreated() {+ return dateCreated;+ }++ public void setDateCreated(Instant dateCreated) {+ this.dateCreated = dateCreated;+ }++ public Instant getDateUpdated() {+ return dateUpdated;+ }++ public void setDateUpdated(Instant dateUpdated) {+ this.dateUpdated = dateUpdated;+ }++ public String getStatus() {+ return status;+ }++ public void setStatus(String status) {+ this.status = status;+ }++ public Map<String, String> getTags() {+ return tags;+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkEnvironment.java b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkEnvironment.javanew file mode 100644index 0000000000..c62895b20f--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/BeanstalkEnvironment.java@@ -0,0 +1,165 @@+package io.github.hectorvent.floci.services.elasticbeanstalk.model;++import java.time.Instant;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++public class BeanstalkEnvironment {++ private String applicationName;+ private String environmentId;+ private String environmentName;+ private String environmentArn;+ private String description;+ private String cname;+ private String endpointUrl;+ private String solutionStackName;+ private String platformArn;+ private String templateName;+ private String versionLabel;+ private String status;+ private String health;+ private String healthStatus;+ private Instant dateCreated;+ private Instant dateUpdated;+ private final List<ConfigurationOptionSetting> optionSettings = new ArrayList<>();+ private final Map<String, String> tags = new LinkedHashMap<>();++ public String getApplicationName() {+ return applicationName;+ }++ public void setApplicationName(String applicationName) {+ this.applicationName = applicationName;+ }++ public String getEnvironmentId() {+ return environmentId;+ }++ public void setEnvironmentId(String environmentId) {+ this.environmentId = environmentId;+ }++ public String getEnvironmentName() {+ return environmentName;+ }++ public void setEnvironmentName(String environmentName) {+ this.environmentName = environmentName;+ }++ public String getEnvironmentArn() {+ return environmentArn;+ }++ public void setEnvironmentArn(String environmentArn) {+ this.environmentArn = environmentArn;+ }++ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ public String getCname() {+ return cname;+ }++ public void setCname(String cname) {+ this.cname = cname;+ }++ public String getEndpointUrl() {+ return endpointUrl;+ }++ public void setEndpointUrl(String endpointUrl) {+ this.endpointUrl = endpointUrl;+ }++ public String getSolutionStackName() {+ return solutionStackName;+ }++ public void setSolutionStackName(String solutionStackName) {+ this.solutionStackName = solutionStackName;+ }++ public String getPlatformArn() {+ return platformArn;+ }++ public void setPlatformArn(String platformArn) {+ this.platformArn = platformArn;+ }++ public String getTemplateName() {+ return templateName;+ }++ public void setTemplateName(String templateName) {+ this.templateName = templateName;+ }++ public String getVersionLabel() {+ return versionLabel;+ }++ public void setVersionLabel(String versionLabel) {+ this.versionLabel = versionLabel;+ }++ public String getStatus() {+ return status;+ }++ public void setStatus(String status) {+ this.status = status;+ }++ public String getHealth() {+ return health;+ }++ public void setHealth(String health) {+ this.health = health;+ }++ public String getHealthStatus() {+ return healthStatus;+ }++ public void setHealthStatus(String healthStatus) {+ this.healthStatus = healthStatus;+ }++ public Instant getDateCreated() {+ return dateCreated;+ }++ public void setDateCreated(Instant dateCreated) {+ this.dateCreated = dateCreated;+ }++ public Instant getDateUpdated() {+ return dateUpdated;+ }++ public void setDateUpdated(Instant dateUpdated) {+ this.dateUpdated = dateUpdated;+ }++ public List<ConfigurationOptionSetting> getOptionSettings() {+ return optionSettings;+ }++ public Map<String, String> getTags() {+ return tags;+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/ConfigurationOptionSetting.java b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/ConfigurationOptionSetting.javanew file mode 100644index 0000000000..d471dcc54b--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/elasticbeanstalk/model/ConfigurationOptionSetting.java@@ -0,0 +1,51 @@+package io.github.hectorvent.floci.services.elasticbeanstalk.model;++public class ConfigurationOptionSetting {++ private String namespace;+ private String optionName;+ private String resourceName;+ private String value;++ public ConfigurationOptionSetting() {+ }++ public ConfigurationOptionSetting(String namespace, String optionName, String resourceName, String value) {+ this.namespace = namespace;+ this.optionName = optionName;+ this.resourceName = resourceName;+ this.value = value;+ }++ public String getNamespace() {+ return namespace;+ }++ public void setNamespace(String namespace) {+ this.namespace = namespace;+ }++ public String getOptionName() {+ return optionName;+ }++ public void setOptionName(String optionName) {+ this.optionName = optionName;+ }++ public String getResourceName() {+ return resourceName;+ }++ public void setResourceName(String resourceName) {+ this.resourceName = resourceName;+ }++ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }+}diff --git a/src/main/resources/application.yml b/src/main/resources/application.ymlindex 69e4c9bb91..984b2045f9 100644--- a/src/main/resources/application.yml+++ b/src/main/resources/application.yml@@ -55,6 +55,7 @@ quarkus:- --initialize-at-run-time=io.github.hectorvent.floci.services.kms.KmsService- --initialize-at-run-time=io.github.hectorvent.floci.services.cloudfront.CloudFrontService- --initialize-at-run-time=io.github.hectorvent.floci.services.emr.EmrService+ - --initialize-at-run-time=io.github.hectorvent.floci.services.elasticbeanstalk.ElasticBeanstalkServicefloci:@@ -345,6 +346,8 @@ floci:enabled: trueautoscaling:enabled: true+ elasticbeanstalk:+ enabled: truebackup:enabled: truejob-completion-delay-seconds: 3diff --git a/src/test/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkIntegrationTest.javanew file mode 100644index 0000000000..ff6e27bcde--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/elasticbeanstalk/ElasticBeanstalkIntegrationTest.java@@ -0,0 +1,272 @@+package io.github.hectorvent.floci.services.elasticbeanstalk;++import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.MethodOrderer;+import org.junit.jupiter.api.Order;+import org.junit.jupiter.api.Test;+import org.junit.jupiter.api.TestMethodOrder;++import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.not;++@QuarkusTest+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)+class ElasticBeanstalkIntegrationTest {++ private static final String AUTH =+ "AWS4-HMAC-SHA256 Credential=test/20260615/us-east-1/elasticbeanstalk/aws4_request";+ private static final String APP = "floci-eb-app";+ private static final String ENV = "floci-eb-env";++ @Test+ @Order(1)+ void createApplication_acceptsDocumentedOperationParameter() {+ given()+ .formParam("Operation", "CreateApplication")+ .formParam("ApplicationName", APP)+ .formParam("Description", "Elastic Beanstalk integration app")+ .formParam("Tags.member.1.Key", "Project")+ .formParam("Tags.member.1.Value", "Floci")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .contentType("application/xml")+ .body("CreateApplicationResponse.CreateApplicationResult.Application.ApplicationName", equalTo(APP))+ .body("CreateApplicationResponse.CreateApplicationResult.Application.ApplicationArn",+ equalTo("arn:aws:elasticbeanstalk:us-east-1:000000000000:application/" + APP))+ .body("CreateApplicationResponse.CreateApplicationResult.Application.ConfigurationTemplates.member",+ equalTo("default"));+ }++ @Test+ @Order(2)+ void createApplicationVersion() {+ given()+ .formParam("Action", "CreateApplicationVersion")+ .formParam("ApplicationName", APP)+ .formParam("VersionLabel", "v1")+ .formParam("Description", "Initial version")+ .formParam("SourceBundle.S3Bucket", "source-bucket")+ .formParam("SourceBundle.S3Key", "app-v1.zip")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("CreateApplicationVersionResponse.CreateApplicationVersionResult.ApplicationVersion.ApplicationName",+ equalTo(APP))+ .body("CreateApplicationVersionResponse.CreateApplicationVersionResult.ApplicationVersion.VersionLabel",+ equalTo("v1"))+ .body("CreateApplicationVersionResponse.CreateApplicationVersionResult.ApplicationVersion.SourceBundle.S3Bucket",+ equalTo("source-bucket"));+ }++ @Test+ @Order(3)+ void describeApplicationsIncludesVersion() {+ given()+ .formParam("Action", "DescribeApplications")+ .formParam("ApplicationNames.member.1", APP)+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("DescribeApplicationsResponse.DescribeApplicationsResult.Applications.member.ApplicationName",+ equalTo(APP))+ .body("DescribeApplicationsResponse.DescribeApplicationsResult.Applications.member.ApplicationArn",+ equalTo("arn:aws:elasticbeanstalk:us-east-1:000000000000:application/" + APP))+ .body("DescribeApplicationsResponse.DescribeApplicationsResult.Applications.member.Versions.member",+ equalTo("v1"));+ }++ @Test+ @Order(4)+ void createEnvironment() {+ given()+ .formParam("Action", "CreateEnvironment")+ .formParam("ApplicationName", APP)+ .formParam("EnvironmentName", ENV)+ .formParam("VersionLabel", "v1")+ .formParam("CNAMEPrefix", "floci-eb")+ .formParam("SolutionStackName", "64bit Amazon Linux 2023 v4.3.0 running Docker")+ .formParam("OptionSettings.member.1.Namespace", "aws:elasticbeanstalk:application:environment")+ .formParam("OptionSettings.member.1.OptionName", "SPRING_PROFILES_ACTIVE")+ .formParam("OptionSettings.member.1.Value", "test")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("CreateEnvironmentResponse.CreateEnvironmentResult.EnvironmentName", equalTo(ENV))+ .body("CreateEnvironmentResponse.CreateEnvironmentResult.ApplicationName", equalTo(APP))+ .body("CreateEnvironmentResponse.CreateEnvironmentResult.VersionLabel", equalTo("v1"))+ .body("CreateEnvironmentResponse.CreateEnvironmentResult.Status", equalTo("Ready"))+ .body("CreateEnvironmentResponse.CreateEnvironmentResult.Health", equalTo("Green"))+ .body("CreateEnvironmentResponse.CreateEnvironmentResult.CNAME",+ equalTo("floci-eb.elasticbeanstalk.local"));+ }++ @Test+ @Order(5)+ void describeEnvironments() {+ given()+ .formParam("Action", "DescribeEnvironments")+ .formParam("ApplicationName", APP)+ .formParam("EnvironmentNames.member.1", ENV)+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("DescribeEnvironmentsResponse.DescribeEnvironmentsResult.Environments.member.EnvironmentName",+ equalTo(ENV))+ .body("DescribeEnvironmentsResponse.DescribeEnvironmentsResult.Environments.member.Status",+ equalTo("Ready"));+ }++ @Test+ @Order(6)+ void describeConfigurationSettingsIncludesEnvironmentOptions() {+ given()+ .formParam("Action", "DescribeConfigurationSettings")+ .formParam("ApplicationName", APP)+ .formParam("EnvironmentName", ENV)+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("<OptionName>SPRING_PROFILES_ACTIVE</OptionName>"))+ .body(containsString("<Value>test</Value>"));+ }++ @Test+ @Order(7)+ void updateEnvironmentMergesOptionSettings() {+ given()+ .formParam("Action", "UpdateEnvironment")+ .formParam("EnvironmentName", ENV)+ .formParam("Description", "Updated environment")+ .formParam("OptionSettings.member.1.Namespace", "aws:elasticbeanstalk:application:environment")+ .formParam("OptionSettings.member.1.OptionName", "SPRING_PROFILES_ACTIVE")+ .formParam("OptionSettings.member.1.Value", "prod")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("UpdateEnvironmentResponse.UpdateEnvironmentResult.EnvironmentName", equalTo(ENV))+ .body("UpdateEnvironmentResponse.UpdateEnvironmentResult.Description",+ equalTo("Updated environment"));++ given()+ .formParam("Action", "DescribeConfigurationSettings")+ .formParam("ApplicationName", APP)+ .formParam("EnvironmentName", ENV)+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("<Value>prod</Value>"))+ .body(not(containsString("<Value>test</Value>")));+ }++ @Test+ @Order(8)+ void terminateEnvironmentHidesDeletedUnlessRequested() {+ given()+ .formParam("Action", "TerminateEnvironment")+ .formParam("EnvironmentName", ENV)+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("TerminateEnvironmentResponse.TerminateEnvironmentResult.Status", equalTo("Terminated"));++ given()+ .formParam("Action", "DescribeEnvironments")+ .formParam("ApplicationName", APP)+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(not(containsString(ENV)));++ given()+ .formParam("Action", "DescribeEnvironments")+ .formParam("ApplicationName", APP)+ .formParam("IncludeDeleted", "true")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("<EnvironmentName>" + ENV + "</EnvironmentName>"))+ .body(containsString("<Status>Terminated</Status>"));+ }++ @Test+ @Order(9)+ void metadataOperations() {+ given()+ .formParam("Action", "CheckDNSAvailability")+ .formParam("CNAMEPrefix", "floci-eb-new")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("CheckDNSAvailabilityResponse.CheckDNSAvailabilityResult.Available", equalTo("true"))+ .body("CheckDNSAvailabilityResponse.CheckDNSAvailabilityResult.FullyQualifiedCNAME",+ equalTo("floci-eb-new.elasticbeanstalk.local"));++ given()+ .formParam("Action", "ListAvailableSolutionStacks")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("Amazon Linux 2023"));+ }++ @Test+ @Order(10)+ void missingRequiredParametersUseAwsMissingParameterCode() {+ given()+ .formParam("Action", "CreateApplication")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("ErrorResponse.Error.Code", equalTo("MissingParameter"));++ given()+ .formParam("Action", "DescribeConfigurationSettings")+ .formParam("ApplicationName", APP)+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("ErrorResponse.Error.Code", equalTo("MissingParameter"));++ given()+ .formParam("Action", "UpdateEnvironment")+ .header("Authorization", AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(400)+ .body("ErrorResponse.Error.Code", equalTo("MissingParameter"));+ }+}diff --git a/src/test/resources/application.yml b/src/test/resources/application.ymlindex 97547a3c45..0e8920e623 100644--- a/src/test/resources/application.yml+++ b/src/test/resources/application.yml@@ -213,6 +213,8 @@ floci:enabled: trueautoscaling:enabled: true+ elasticbeanstalk:+ enabled: truetransfer:enabled: truebackup: