added the code from pull machulav#224 (machulav#230)

Author: Preen

.env.example

@@ -2,7 +2,7 @@
 #
 # Create .env file using this file as a template.
 # Define all your variables for local development as described below.
-# 
+#
 # - Use environment variables with prefix "AWS_" to give access to your test AWS account.
 # - Use environment variables with prefix "INPUT_" to simulate GitHub Actions input.
 # - Use GITHUB_REPOSITORY environment variable to provide the GitHub repository and it's owher as a context in the script. Use formst "owner/repo".
@@ -19,3 +19,6 @@ INPUT_SECURITY-GROUP-ID=
 INPUT_LABEL=
 INPUT_EC2-INSTANCE-ID=
 GITHUB_REPOSITORY=
+INPUT_EC2-VOLUME-SIZE=
+INPUT_EC2-DEVICE-NAME=
+INPUT_EC2-VOLUME-TYPE=

README.md

@@ -147,7 +147,7 @@ Use the following steps to prepare your workflow for running on your EC2 self-ho
 
 > [!IMPORTANT]
 > If you are planning on using Spot instances for your runner, AWS uses a service-linked role to provision the instances.
-> 
+>
 > For this to work, at least one of the following must be true:
 > - The service-linked role exists already. This happens if you request a Spot instance via the AWS Console interface.
 > - You create the service-linked role via the Console, AWS CLI or AWS API.
@@ -189,7 +189,7 @@ Alternatively, you can use a vanilla EC2 AMI and set up the dependencies via `pr
    Or use the existing VPC and subnet.
 2. Create a new security group for the runners in the VPC.
    Only **outbound** traffic on port TCP/443 is required to pull jobs from GitHub.
-   No inbound traffic is required for this purpose, but if your workflow needs to access external repositories or internal SSH, other ports like TCP/22, TCP/80, etc ... may be required. 
+   No inbound traffic is required for this purpose, but if your workflow needs to access external repositories or internal SSH, other ports like TCP/22, TCP/80, etc ... may be required.
 
 **5. Configure the GitHub workflow**
 
@@ -220,7 +220,10 @@ Now you're ready to go!
 | `block-device-mappings` | Optional. Used only with the `start` mode. | JSON string specifying the block device mappings for the EC2 instance. For example: <br> <pre>[{"DeviceName": "/dev/sda1", "Ebs": {"VolumeSize": 100, "VolumeType": "gp3"}}]</pre> See <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_BlockDeviceMapping.html">AWS BlockDeviceMapping docs</a> for all options. |
 | `startup-quiet-period-seconds` | Optional | Default: 30 |
 | `startup-retry-interval-seconds` | Optional | Default: 10 |
-| `startup-timeout-minutes` | Optional | Default: 5 | 
+| `startup-timeout-minutes` | Optional | Default: 5 |
+| `ec2-volume-size` | Optional | Defines the size of the EC2 Volume in GB, will use the AWS default of 8 GB if not provided. |
+| `ec2-device-name` | Optional | Defines the device name used for the root volume. |
+| `ec2-volume-type` | Optional | Defines the device type used for the root volume. |
 
 ### Environment variables
 

action.yml

@@ -99,6 +99,22 @@ inputs:
   run-runner-as-user:
     description: >-
       Specify user under whom the runner service should run
+  ec2-volume-size:
+    description: >-
+      EC2 volume size in GB.
+    default: "8"
+    required: false
+  ec2-device-name:
+    description: >-
+      EC2 block device name.
+    default: /dev/sda1
+    required: false
+  ec2-volume-type:
+    description: >-
+      EC2 block device type.
+    default: gp2
+    required: false
+
 outputs:
   label:
     description: >-

dist/index.js

@@ -145081,6 +145081,15 @@ async function startEc2Instance(label, githubRegistrationToken) {
     IamInstanceProfile: { Name: config.input.iamRoleName },
     TagSpecifications: config.tagSpecifications,
     InstanceMarketOptions: buildMarketOptions(),
+    BlockDeviceMappings: [
+      {
+        DeviceName: config.input.ec2DeviceName,
+        Ebs: {
+          VolumeSize: config.input.ec2VolumeSize,
+          VolumeType: config.input.ec2VolumeType,
+        },
+      },
+    ],
   };
 
   if (config.input.blockDeviceMappings.length > 0) {
@@ -145177,6 +145186,9 @@ class Config {
       subnetId: core.getInput('subnet-id'),
       runAsService: core.getInput('run-runner-as-service') === 'true',
       runAsUser: core.getInput('run-runner-as-user'),
+      ec2VolumeSize: core.getInput('ec2-volume-size'),
+      ec2DeviceName: core.getInput('ec2-device-name'),
+      ec2VolumeType: core.getInput('ec2-volume-type'),
       blockDeviceMappings: JSON.parse(core.getInput('block-device-mappings') || '[]')
     };
 

hello.save

@@ -0,0 +1,5 @@
+Hi,
+
+We have observed a consistently poor acceptance rate for Norway over the past few months, leading to significant financial losses, which we estimate to be in the millions. We have been in contact with Kustom, who provided us with data confirming this issue, and we have drawn the following conclusion:
+We have compared the Swedish and Norwegian markets in terms of renewal acceptance rates over the past 60 days. The discrepancy between the two markets is highly concerning, with Norway's acceptance rate being significantly lower.
+This is a matter of great urgency, and we expect you to respond immediately with a detailed plan on how you intend to resolve this issue, as well as the steps you will take to mitigate our losses going forward. It is unacceptable for a payment provider of your size—especially one approaching an IPO—to be experiencing such critical issues.

package-lock.json

@@ -20,11 +20,12 @@
     "@actions/core": "^1.10.0",
     "@actions/github": "^6.0.0",
     "@aws-sdk/client-ec2": "^3.557.0",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "ncc": "^0.3.6"
   },
   "devDependencies": {
     "@vercel/ncc": "^0.38.1",
     "dotenv": "^8.6.0",
     "eslint": "^7.32.0"
   }
-}
+}

package.json

@@ -73,6 +73,15 @@ async function startEc2Instance(label, githubRegistrationToken) {
     IamInstanceProfile: { Name: config.input.iamRoleName },
     TagSpecifications: config.tagSpecifications,
     InstanceMarketOptions: buildMarketOptions(),
+    BlockDeviceMappings: [
+      {
+        DeviceName: config.input.ec2DeviceName,
+        Ebs: {
+          VolumeSize: config.input.ec2VolumeSize,
+          VolumeType: config.input.ec2VolumeType,
+        },
+      },
+    ],
   };
 
   if (config.input.blockDeviceMappings.length > 0) {

src/aws.js

@@ -21,6 +21,9 @@ class Config {
       subnetId: core.getInput('subnet-id'),
       runAsService: core.getInput('run-runner-as-service') === 'true',
       runAsUser: core.getInput('run-runner-as-user'),
+      ec2VolumeSize: core.getInput('ec2-volume-size'),
+      ec2DeviceName: core.getInput('ec2-device-name'),
+      ec2VolumeType: core.getInput('ec2-volume-type'),
       blockDeviceMappings: JSON.parse(core.getInput('block-device-mappings') || '[]')
     };