diff --git a/.gitignore b/.gitignore index 6629e26..e1856fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.env +.envrc terraform/ private* diff --git a/labs/lab-1/LAB-REPORT.md b/lab-1/LAB-REPORT.md similarity index 100% rename from labs/lab-1/LAB-REPORT.md rename to lab-1/LAB-REPORT.md diff --git a/labs/lab-1/LAB-REPORT.pdf b/lab-1/LAB-REPORT.pdf similarity index 100% rename from labs/lab-1/LAB-REPORT.pdf rename to lab-1/LAB-REPORT.pdf diff --git a/labs/lab-1/Lab 1 - First Linux VM.pdf b/lab-1/Lab 1 - First Linux VM.pdf similarity index 100% rename from labs/lab-1/Lab 1 - First Linux VM.pdf rename to lab-1/Lab 1 - First Linux VM.pdf diff --git a/labs/lab-1/✅ Checklist #1- AWS Free Tier Account Setup.pdf b/lab-1/✅ Checklist #1- AWS Free Tier Account Setup.pdf similarity index 100% rename from labs/lab-1/✅ Checklist #1- AWS Free Tier Account Setup.pdf rename to lab-1/✅ Checklist #1- AWS Free Tier Account Setup.pdf diff --git a/labs/lab-2/LAB-REPORT.md b/lab-2/LAB-REPORT.md similarity index 100% rename from labs/lab-2/LAB-REPORT.md rename to lab-2/LAB-REPORT.md diff --git a/labs/lab-2/LAB-REPORT.pdf b/lab-2/LAB-REPORT.pdf similarity index 100% rename from labs/lab-2/LAB-REPORT.pdf rename to lab-2/LAB-REPORT.pdf diff --git a/labs/lab-2/Lab 2 - Security Groups-2.pdf b/lab-2/Lab 2 - Security Groups-2.pdf similarity index 100% rename from labs/lab-2/Lab 2 - Security Groups-2.pdf rename to lab-2/Lab 2 - Security Groups-2.pdf diff --git a/labs/lab-2/lab-2.jpg b/lab-2/lab-2.jpg similarity index 100% rename from labs/lab-2/lab-2.jpg rename to lab-2/lab-2.jpg diff --git a/labs/lab-3/LAB-REPORT.md b/lab-3/LAB-REPORT.md similarity index 94% rename from labs/lab-3/LAB-REPORT.md rename to lab-3/LAB-REPORT.md index 990188c..bbc7c53 100644 --- a/labs/lab-3/LAB-REPORT.md +++ b/lab-3/LAB-REPORT.md @@ -12,11 +12,11 @@ - [x] Modify and make a second commit ![image of terminal](./assets/prep-console.png) - [x] Test to see if gitea actions works -- [ ] Have an existing s3 bucket +- [x] Have an existing s3 bucket ## Resources - [x] [Capital One Data Breach](./assets/Capital%20One%20Data%20Breach%20—%202019.%20Introduction%20_%20by%20Tanner%20Jones%20_%20Nerd%20For%20Tech%20_%20Medium.pdf) -- [ ] [Grant IAM User Access to Only One S3 Bucket](./assets/Grant%20IAM%20User%20Access%20to%20Only%20One%20S3%20Bucket%20_%20Medium.pdf) +- [x] [Grant IAM User Access to Only One S3 Bucket](./assets/Grant%20IAM%20User%20Access%20to%20Only%20One%20S3%20Bucket%20_%20Medium.pdf) - [ ] [IAM Bucket Policies](./assets/From%20IAM%20to%20Bucket%20Policies_%20A%20Comprehensive%20Guide%20to%20S3%20Access%20Control%20with%20Console,%20CLI,%20and%20Terraform%20_%20by%20Mohasina%20Clt%20_%20Medium.pdf) - [ ] [Dumping S3 Buckets!](https://www.youtube.com/watch?v=ITSZ8743MUk) @@ -47,5 +47,4 @@ graph LR ExplainIAMIdentity -.-> IAMIdentity classDef aside fill:#fffbe6,stroke:#bbb,stroke-dasharray: 5 5,stroke-width:2px; -``` -ieua((())) \ No newline at end of file +``` \ No newline at end of file diff --git a/labs/lab-3/Lab3-IAMRoleEc2S3Bucket.pdf b/lab-3/Lab3-IAMRoleEc2S3Bucket.pdf similarity index 100% rename from labs/lab-3/Lab3-IAMRoleEc2S3Bucket.pdf rename to lab-3/Lab3-IAMRoleEc2S3Bucket.pdf diff --git a/labs/lab-3/Preparation for Lab 3.pdf b/lab-3/Preparation for Lab 3.pdf similarity index 100% rename from labs/lab-3/Preparation for Lab 3.pdf rename to lab-3/Preparation for Lab 3.pdf diff --git a/labs/lab-3/README.md b/lab-3/README.md similarity index 100% rename from labs/lab-3/README.md rename to lab-3/README.md diff --git a/labs/lab-3/assets/Capital One Data Breach — 2019. Introduction _ by Tanner Jones _ Nerd For Tech _ Medium.pdf b/lab-3/assets/Capital One Data Breach — 2019. Introduction _ by Tanner Jones _ Nerd For Tech _ Medium.pdf similarity index 100% rename from labs/lab-3/assets/Capital One Data Breach — 2019. Introduction _ by Tanner Jones _ Nerd For Tech _ Medium.pdf rename to lab-3/assets/Capital One Data Breach — 2019. Introduction _ by Tanner Jones _ Nerd For Tech _ Medium.pdf diff --git a/labs/lab-3/assets/From IAM to Bucket Policies_ A Comprehensive Guide to S3 Access Control with Console, CLI, and Terraform _ by Mohasina Clt _ Medium.pdf b/lab-3/assets/From IAM to Bucket Policies_ A Comprehensive Guide to S3 Access Control with Console, CLI, and Terraform _ by Mohasina Clt _ Medium.pdf similarity index 100% rename from labs/lab-3/assets/From IAM to Bucket Policies_ A Comprehensive Guide to S3 Access Control with Console, CLI, and Terraform _ by Mohasina Clt _ Medium.pdf rename to lab-3/assets/From IAM to Bucket Policies_ A Comprehensive Guide to S3 Access Control with Console, CLI, and Terraform _ by Mohasina Clt _ Medium.pdf diff --git a/labs/lab-3/assets/Grant IAM User Access to Only One S3 Bucket _ Medium.pdf b/lab-3/assets/Grant IAM User Access to Only One S3 Bucket _ Medium.pdf similarity index 100% rename from labs/lab-3/assets/Grant IAM User Access to Only One S3 Bucket _ Medium.pdf rename to lab-3/assets/Grant IAM User Access to Only One S3 Bucket _ Medium.pdf diff --git a/labs/lab-3/assets/hello.py b/lab-3/assets/hello.py similarity index 100% rename from labs/lab-3/assets/hello.py rename to lab-3/assets/hello.py diff --git a/labs/lab-3/assets/prep-console.png b/lab-3/assets/prep-console.png similarity index 100% rename from labs/lab-3/assets/prep-console.png rename to lab-3/assets/prep-console.png diff --git a/mise.toml b/mise.toml index 153857e..4cc0b68 100644 --- a/mise.toml +++ b/mise.toml @@ -1,2 +1,5 @@ [tasks.ssh] -run = "ssh -p 5679 vboxuser@127.0.0.1" \ No newline at end of file +run = "ssh -p 5679 vboxuser@127.0.0.1" + +[tasks.generate] +run = "./utilities/pdf_make/labs.sh" \ No newline at end of file diff --git a/labs/0. resources/RESOURCES.md b/resources/RESOURCES.md similarity index 100% rename from labs/0. resources/RESOURCES.md rename to resources/RESOURCES.md diff --git a/labs/0. resources/assets/Roadmap for Cloud Security.pdf b/resources/assets/Roadmap for Cloud Security.pdf similarity index 100% rename from labs/0. resources/assets/Roadmap for Cloud Security.pdf rename to resources/assets/Roadmap for Cloud Security.pdf diff --git a/labs/0. resources/assets/The 5 Cybersecurity Roles That Will Disappear First _ by Taimur Ijlal _ Jun, 2025 _ Medium-1.pdf b/resources/assets/The 5 Cybersecurity Roles That Will Disappear First _ by Taimur Ijlal _ Jun, 2025 _ Medium-1.pdf similarity index 100% rename from labs/0. resources/assets/The 5 Cybersecurity Roles That Will Disappear First _ by Taimur Ijlal _ Jun, 2025 _ Medium-1.pdf rename to resources/assets/The 5 Cybersecurity Roles That Will Disappear First _ by Taimur Ijlal _ Jun, 2025 _ Medium-1.pdf diff --git a/pdf_make/Dockerfile b/utilities/pdf_make/Dockerfile similarity index 100% rename from pdf_make/Dockerfile rename to utilities/pdf_make/Dockerfile diff --git a/pdf_make/generate_reports.sh b/utilities/pdf_make/generate_reports.sh similarity index 100% rename from pdf_make/generate_reports.sh rename to utilities/pdf_make/generate_reports.sh diff --git a/labs.sh b/utilities/pdf_make/labs.sh similarity index 69% rename from labs.sh rename to utilities/pdf_make/labs.sh index fcf125f..9a69054 100755 --- a/labs.sh +++ b/utilities/pdf_make/labs.sh @@ -2,20 +2,22 @@ # Define image name IMAGE_NAME="pandoc-report-generator" -PDF_MAKE_DIR="./pdf_make" # Path to your Dockerfile and generate_reports.sh -LABS_DIR="./labs" # Path to your labs directory +PDF_MAKE_DIR="." # Path to your Dockerfile and generate_reports.sh +LABS_DIR="../.." # Path to your labs directory +WORKING_DIRECTORY=$(dirname "$0") echo "--- Debug Info ---" -echo "Current Working Directory: $(pwd)" +echo "Directory name: $(dirname "$0")" +echo "Current Working Directory: ${WORKING_DIRECTORY}" echo "Image Name (variable): '$IMAGE_NAME'" echo "PDF Make Directory (variable): '$PDF_MAKE_DIR'" echo "Labs Directory (variable): '$LABS_DIR'" -echo "Absolute Labs Mount Path: '$(pwd)/$LABS_DIR'" +echo "Absolute Labs Mount Path: '${WORKING_DIRECTORY}/$LABS_DIR'" echo "--------------------" echo "--- Building Docker image: $IMAGE_NAME ---" # Build the Docker image from the pdf_make directory -docker build -t "$IMAGE_NAME" "$PDF_MAKE_DIR" +docker build -t "$IMAGE_NAME" "$WORKING_DIRECTORY/$PDF_MAKE_DIR" BUILD_STATUS=$? echo "Build command exited with status: $BUILD_STATUS" @@ -27,7 +29,7 @@ fi echo "--- Running report generation inside Docker container ---" # This single-line docker run command is the most robust way to avoid shell parsing issues. # It explicitly sets the entrypoint and mounts the /labs directory. -docker run --rm --entrypoint /bin/sh -v "$(pwd)/$LABS_DIR:/labs" "$IMAGE_NAME" /app/generate_reports.sh +docker run --rm --entrypoint /bin/sh -v "${WORKING_DIRECTORY}/$LABS_DIR:/labs" "$IMAGE_NAME" /app/generate_reports.sh RUN_STATUS=$? echo "Run command exited with status: $RUN_STATUS" @@ -41,7 +43,7 @@ echo "--- All operations completed successfully. ---" # --- New Step: Verify Output on Host --- echo "--- Verifying generated PDFs on host ---" -find "$LABS_DIR" -type f -name "LAB-REPORT.pdf" +find "${WORKING_DIRECTORY}/$LABS_DIR" -type f -name "LAB-REPORT.pdf" if [ $? -eq 0 ]; then echo "PDFs should now be available in your '$LABS_DIR' directory."