eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

bug5838: when launching an instance, find security group by "Sailing Analytics App" Name tag;

Browse Source 
additionally, set the subnet to which to deploy explicitly by
intersecting the subnets that match the desired availability zone with
the VPC ID of the security group used. This way, the VPC of the "Sailing
Analytics App"-name-tagged security group decides into which VPC the
instance(s) will be deployed.
This commit is contained in:
Axel Uhl
2023-04-26 14:20:23 +02:00
parent 8531f7424c
commit 26fef91b84
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/impl/AwsLandscapeImpl.java
+12 -12
View File
@@ -48,8 +48,6 @@ import com.sap.sse.landscape.RotatingFileBasedLog;
import com.sap.sse.landscape.SecurityGroup;
import com.sap.sse.landscape.application.ApplicationProcess;
import com.sap.sse.landscape.application.ApplicationProcessMetrics;
import com.sap.sse.landscape.application.ApplicationReplicaSet;
import com.sap.sse.landscape.application.Scope;
import com.sap.sse.landscape.aws.AmazonMachineImage;
import com.sap.sse.landscape.aws.ApplicationLoadBalancer;
import com.sap.sse.landscape.aws.ApplicationProcessHost;
@@ -918,13 +916,6 @@ public class AwsLandscapeImpl<ShardingKey> implements AwsLandscape<ShardingKey>
return landscapeState.getSSHKeyPairs();
}
@Override
public <MetricsT extends ApplicationProcessMetrics, ProcessT extends ApplicationProcess<ShardingKey, MetricsT, ProcessT>>
Map<Scope<ShardingKey>, ApplicationReplicaSet<ShardingKey, MetricsT, ProcessT>> getScopes() {
// TODO Implement Landscape<ShardingKey,MetricsT>.getScopes(...)
return null;
}
@Override
public <HostT extends AwsInstance<ShardingKey>> Iterable<HostT> launchHosts(HostSupplier<ShardingKey, HostT> hostSupplier,
int numberOfHostsToLaunch, MachineImage fromImage,
@@ -934,6 +925,7 @@ public class AwsLandscapeImpl<ShardingKey> implements AwsLandscape<ShardingKey>
" with image "+fromImage+" that lives in region "+fromImage.getRegion()+" which is different."+
" Consider copying the image to that region.");
}
final Ec2Client ec2Client = getEc2Client(getRegion(az.getRegion()));
final Builder runInstancesRequestBuilder = RunInstancesRequest.builder()
.additionalInfo("Test " + getClass().getName())
.imageId(fromImage.getId().toString())
@@ -941,7 +933,15 @@ public class AwsLandscapeImpl<ShardingKey> implements AwsLandscape<ShardingKey>
.maxCount(numberOfHostsToLaunch)
.instanceType(instanceType).keyName(keyName)
.placement(Placement.builder().availabilityZone(az.getName()).build())
.securityGroupIds(Util.mapToArrayList(securityGroups, sg->sg.getId()));
.securityGroupIds(Util.mapToArrayList(securityGroups, SecurityGroup::getId));
final List<software.amazon.awssdk.services.ec2.model.SecurityGroup> awsSecurityGroups = ec2Client.describeSecurityGroups(
b->b.groupIds(Util.asList(Util.map(securityGroups, SecurityGroup::getId)))).securityGroups();
ec2Client.describeSubnets().subnets().stream().filter(
subnet->
subnet.availabilityZoneId().equals(az.getId()) &&
subnet.vpcId().equals(awsSecurityGroups.iterator().next().vpcId()))
.findFirst()
.map(subnet->runInstancesRequestBuilder.subnetId(subnet.subnetId()));
if (userData != null) {
runInstancesRequestBuilder.userData(Base64.getEncoder().encodeToString(String.join("\n", userData).getBytes()));
}
@@ -951,7 +951,7 @@ public class AwsLandscapeImpl<ShardingKey> implements AwsLandscape<ShardingKey>
});
final RunInstancesRequest launchRequest = runInstancesRequestBuilder.build();
logger.info("Launching instance(s): "+launchRequest);
final RunInstancesResponse response = getEc2Client(getRegion(az.getRegion())).runInstances(launchRequest);
final RunInstancesResponse response = ec2Client.runInstances(launchRequest);
final List<HostT> result = new ArrayList<>();
for (final Instance instance : response.instances()) {
try {
@@ -1133,7 +1133,7 @@ public class AwsLandscapeImpl<ShardingKey> implements AwsLandscape<ShardingKey>
@Override
public Optional<SecurityGroup> getSecurityGroupByName(String securityGroupName, com.sap.sse.landscape.Region region) {
final List<software.amazon.awssdk.services.ec2.model.SecurityGroup> securityGroups = getEc2Client(getRegion(region)).describeSecurityGroups(
sg->sg.filters(Filter.builder().name("group-name").values(securityGroupName).build())).securityGroups();
sg->sg.filters(Filter.builder().name("tag:Name").values(securityGroupName).build())).securityGroups();
return securityGroups.stream().findFirst().map(sg->()->sg.groupId());
}
java/com.sap.sse.landscape/src/com/sap/sse/landscape/Landscape.java
-11
View File
@@ -1,13 +1,8 @@
package com.sap.sse.landscape;
import java.util.Map;
import java.util.Optional;
import com.sap.sse.common.Duration;
import com.sap.sse.landscape.application.ApplicationProcess;
import com.sap.sse.landscape.application.ApplicationProcessMetrics;
import com.sap.sse.landscape.application.ApplicationReplicaSet;
import com.sap.sse.landscape.application.Scope;
import com.sap.sse.landscape.rabbitmq.RabbitMQEndpoint;
public interface Landscape<ShardingKey> {
@@ -27,12 +22,6 @@ public interface Landscape<ShardingKey> {
*/
Optional<Duration> WAIT_FOR_PROCESS_TIMEOUT = Optional.of(Duration.ONE_MINUTE);
/**
* Tells which scope currently lives where
*/
<ApplicationProcessMetricsT extends ApplicationProcessMetrics, ApplicationProcessT extends ApplicationProcess<ShardingKey, ApplicationProcessMetricsT, ApplicationProcessT>>
Map<Scope<ShardingKey>, ApplicationReplicaSet<ShardingKey, ApplicationProcessMetricsT, ApplicationProcessT>> getScopes();
/**
* @return the security group that shall be assigned by default to any application server host, whether master or
* replica