Dark-Alex-17/aws-cloud-gaming
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require the user to specify the AZ for the subnet

Browse Source
This commit is contained in:
hamilcarBarca17
2023-03-08 15:33:07 -07:00
parent 87538d511f
commit a06e201c93
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+7 -6
View File
@@ -20,12 +20,13 @@ This repo will automate the creation and connection to an AWS EC2 spot instance
### CDK Variables ### CDK Variables
Modify the following properties in the [cloud-gaming-on-ec2](cdk/bin/cloud-gaming-on-ec2.ts) stack: Modify the following properties in the [cloud-gaming-on-ec2](cdk/bin/cloud-gaming-on-ec2.ts) stack:
| Parameter Name | Description | | Parameter Name | Description |
|----------------|---------------------------------------------------------------------| |----------------------------|---------------------------------------------------------------------|
| `ACCOUNT_ID` | The AWS account ID you want to use | | `ACCOUNT_ID` | The AWS account ID you want to use |
| `REGION` | The AWS region in which you want the resources created | | `REGION` | The AWS region in which you want the resources created |
| `VPC_ID` | The ID of the VPC you wish to deploy the instance into | | `VPC_ID` | The ID of the VPC you wish to deploy the instance into |
| `SUBNET_ID` | The ID of a public subnet that you want your instance deployed into | | `SUBNET_ID` | The ID of a public subnet that you want your instance deployed into |
| `SUBNET_AVAILABILITY_ZONE` | The availability zone of the subnet you provided |
## Running the application ## Running the application
To run the application, simply run the `cloud-gaming.sh` script in the root directory and follow all instructions/menu choices and the script will take care of everything else! To run the application, simply run the `cloud-gaming.sh` script in the root directory and follow all instructions/menu choices and the script will take care of everything else!
aws-tools.sh
-6
View File
@@ -166,12 +166,6 @@ deployCdk() {
} | whiptail --title "Preparing CDK..." --gauge "Preparing CDK..." "$GAUGE_BOX_HEIGHT" "$GAUGE_BOX_WIDTH" 0 } | whiptail --title "Preparing CDK..." --gauge "Preparing CDK..." "$GAUGE_BOX_HEIGHT" "$GAUGE_BOX_WIDTH" 0
declare pid declare pid
declare synthLogFile="${logFile}-synth.log"
printInfo "Running CDK synth and logging to $synthLogFile"
yes | npx cdk --no-color --require-approval never --profile $AWS_CLOUD_GAMING_PROFILE -c "user=$user" -c "localIp=$localIp" synth "TeamBuildingCloudGaming-$user" > $synthLogFile 2>&1 &
pid=$!
showTailBox "Synthesizing CDK" $pid $synthLogFile
declare bootstrapLogFile="${logFile}-bootstrap.log" declare bootstrapLogFile="${logFile}-bootstrap.log"
printInfo "Bootstrapping CDK and logging to $bootstrapLogFile" printInfo "Bootstrapping CDK and logging to $bootstrapLogFile"
yes | npx cdk --no-color --require-approval never --profile $AWS_CLOUD_GAMING_PROFILE -c "user=$user" -c "localIp=$localIp" bootstrap > $bootstrapLogFile 2>&1 & yes | npx cdk --no-color --require-approval never --profile $AWS_CLOUD_GAMING_PROFILE -c "user=$user" -c "localIp=$localIp" bootstrap > $bootstrapLogFile 2>&1 &
cdk/bin/cloud-gaming-on-ec2.ts
+3 -1
View File
@@ -14,6 +14,7 @@ const ACCOUNT_ID = "PLACEHOLDER"
const REGION = "us-east-1" const REGION = "us-east-1"
const VPC_ID = 'PLACEHOLDER' const VPC_ID = 'PLACEHOLDER'
const SUBNET_ID = 'PLACEHOLDER' const SUBNET_ID = 'PLACEHOLDER'
const SUBNET_AVAILABILITY_ZONE = 'PLACEHOLDER'
const user = app.node.tryGetContext("user"); const user = app.node.tryGetContext("user");
if (!user) { if (!user) {
@@ -47,5 +48,6 @@ new G4ADStack(app, `TeamBuildingCloudGaming-${user}`, {
}, },
user, user,
vpcId: VPC_ID, vpcId: VPC_ID,
subnetId: SUBNET_ID subnetId: SUBNET_ID,
subnetAvailabilityZone: SUBNET_AVAILABILITY_ZONE
}); });
cdk/lib/base.ts
+3 -2
View File
@@ -22,6 +22,7 @@ export interface BaseConfig extends StackProps {
readonly instanceSize: InstanceSize; readonly instanceSize: InstanceSize;
readonly vpcId: string; readonly vpcId: string;
readonly subnetId: string; readonly subnetId: string;
readonly subnetAvailabilityZone: string;
readonly sshKeyName: string; readonly sshKeyName: string;
readonly volumeSizeGiB: number; readonly volumeSizeGiB: number;
readonly niceDCVDisplayDriverUrl: string; readonly niceDCVDisplayDriverUrl: string;
@@ -37,7 +38,7 @@ export abstract class BaseEc2Stack extends Stack {
constructor(scope: App, id: string, props: BaseConfig) { constructor(scope: App, id: string, props: BaseConfig) {
super(scope, id, props); super(scope, id, props);
this.props = props; this.props = props;
const { vpcId, subnetId, sshKeyName, volumeSizeGiB, openPorts, allowInboundCidr, user } = props; const { vpcId, subnetId, subnetAvailabilityZone, sshKeyName, volumeSizeGiB, openPorts, allowInboundCidr, user } = props;
const vpc = Vpc.fromLookup(this, "Vpc", { vpcId }); const vpc = Vpc.fromLookup(this, "Vpc", { vpcId });
const securityGroup = new SecurityGroup(this, `SecurityGroup-${user}`, { const securityGroup = new SecurityGroup(this, `SecurityGroup-${user}`, {
@@ -82,7 +83,7 @@ export abstract class BaseEc2Stack extends Stack {
instanceType: this.getInstanceType(), instanceType: this.getInstanceType(),
vpc, vpc,
securityGroup, securityGroup,
vpcSubnets: vpc.selectSubnets({ subnets: [Subnet.fromSubnetAttributes(this, 'publicSubnet', {subnetId, availabilityZone: "us-east-1a"})] }), vpcSubnets: vpc.selectSubnets({ subnets: [Subnet.fromSubnetAttributes(this, 'publicSubnet', {subnetId, availabilityZone: subnetAvailabilityZone})] }),
keyName: sshKeyName, keyName: sshKeyName,
userData: this.getUserdata(), userData: this.getUserdata(),
machineImage: MachineImage.latestWindows(WindowsVersion.WINDOWS_SERVER_2019_ENGLISH_FULL_BASE), machineImage: MachineImage.latestWindows(WindowsVersion.WINDOWS_SERVER_2019_ENGLISH_FULL_BASE),
cloud-gaming.sh
+1 -1
View File
@@ -96,7 +96,7 @@ verifyPrerequisites() {
printWarn "Installing the FlatHub repo for Flatpak if it doesn't already exist..." printWarn "Installing the FlatHub repo for Flatpak if it doesn't already exist..."
echo "$SUDO_PASSWORD" | sudo -k -S flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo echo "$SUDO_PASSWORD" | sudo -k -S flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
printWarn "Installing SteamLink from FlatHub..." printWarn "Installing SteamLink from FlatHub..."
echo "$SUDO_PASSWORD" | sudo -k -S flatpak install flathub com.valvesoftware.SteamLink echo "$SUDO_PASSWORD" | sudo -k -S flatpak install -y flathub com.valvesoftware.SteamLink
fi fi
# elif [[ $KERNEL == "Darwin" ]]; then # elif [[ $KERNEL == "Darwin" ]]; then
# TODO check if SteamLink is installed, and if not, install it via mas-cli # TODO check if SteamLink is installed, and if not, install it via mas-cli