Merge branch 'develop' of https://github.com/MKGF/Ranky into develop

.github/workflows/aws-create.yml

@@ -6,8 +6,8 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
+    env:
+      BUCKET_NAME: ranky-s3
 
     steps:
 
@@ -80,5 +80,13 @@ jobs:
           BUCKET_NAME=ranky-s3
           FILE_PATH=./terraform/terraform.tfstate
           aws s3 cp $FILE_PATH s3://$BUCKET_NAME/terraform.tfstate
-        env:
-          BUCKET_NAME: ranky-s3
+
+      - name: Upload SSH Key .pem to S3 bucket
+        run: |
+          FILE_PATH=./terraform/ranky-ec2-ssh.pem
+          aws s3 cp $FILE_PATH s3://$BUCKET_NAME/ranky-ec2-ssh.pem
+      
+      - name: Upload Ranky EC2 IP to S3 bucket
+        run: |
+          FILE_PATH=./terraform/ranky-ec2-ip.txt
+          aws s3 cp $FILE_PATH s3://$BUCKET_NAME/ranky-ec2-ip.txt

terraform/ec2.tf

@@ -34,6 +34,14 @@ resource "aws_instance" "ranky-ec2" {
   ]
 }
 
+resource "null_resource" "ranky-ec2-ip-to-file" {
+  depends_on = [aws_instance.ranky-ec2]
+
+  provisioner "local-exec" {
+    command = "echo ${aws_instance.ranky-ec2.public_ip} > ranky-ec2-ip.txt"
+  }
+}
+
 resource "aws_iam_instance_profile" "ranky-ec2-profile" {
   name = "ranky-ec2-ecr-instance-profile"
   role = aws_iam_role.ranky-ec2-role.name

terraform/iam.tf

@@ -9,7 +9,7 @@ resource "aws_key_pair" "ranky-ec2-keypair" {
 }
 
 resource "local_file" "private_key_file" {
-  filename = "ranky-ec2.pem"
+  filename = "ranky-ec2-ssh.pem"
   content = tls_private_key.ranky-ec2-keypair.private_key_pem
 }