Skip to content

Commit 3d1e352

Browse files
authored
Merge pull request #80 from abolfazl8131/master
feat(download): add source as a parameter
2 parents 61d4809 + 27dde0b commit 3d1e352

File tree

5 files changed

+64
-3
lines changed

5 files changed

+64
-3
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
resource "aws_s3_bucket" "s3_bucket" {
3+
count = var.s3_create_bucket ? 1 : 0
4+
bucket = var.s3_bucket_name
5+
force_destroy = var.s3_bucket_force_destroy
6+
tags = var.s3_bucket_tags
7+
}
8+
9+
resource "aws_s3_bucket_versioning" "s3_bucket_versioning" {
10+
count = var.s3_create_bucket && var.s3_create_bucket_versioning ? 1 : 0
11+
bucket = aws_s3_bucket.s3_bucket[0].id
12+
13+
versioning_configuration {
14+
status = var.s3_bucket_versioning_status
15+
}
16+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
s3_create_bucket = true
3+
s3_bucket_name = "UniqueName"
4+
s3_bucket_force_destroy = false
5+
s3_bucket_tags = {
6+
Name = "My bucket"
7+
Environment = "Dev"
8+
}
9+
s3_create_bucket_versioning = false
10+
s3_bucket_versioning_status = "Enabled"
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
2+
variable "s3_create_bucket" {
3+
type = bool
4+
}
5+
6+
variable "s3_bucket_name" {
7+
type = string
8+
}
9+
10+
variable "s3_bucket_force_destroy" {
11+
type = bool
12+
}
13+
14+
variable "s3_bucket_tags" {
15+
type = map(string)
16+
}
17+
18+
variable "s3_create_bucket_versioning" {
19+
type = bool
20+
}
21+
22+
variable "s3_bucket_versioning_status" {
23+
type = string
24+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
terraform {
3+
required_version = ">= 1.0"
4+
5+
required_providers {
6+
aws = {
7+
source = "hashicorp/aws"
8+
version = ">= 5.20"
9+
}
10+
}
11+
}

app/routes/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ def zip_folder(folder_path: str, output_zip_path: str):
1717

1818

1919

20-
@app.get("/download-folder{folder_name}")
21-
async def download_folder_MyHelm(folder_name: str):
20+
@app.get("/download-folder{folder_name}/{source}")
21+
async def download_folder_MyHelm(folder_name: str,source:str):
2222
folder_path = f"app/media/{folder_name}" # Adjust the path as needed
2323
if not os.path.exists(folder_path):
2424
raise HTTPException(status_code=404, detail="Folder not found")
@@ -29,6 +29,6 @@ async def download_folder_MyHelm(folder_name: str):
2929
zip_folder(folder_path, zip_file_path)
3030

3131
# Return the zip file as a response
32-
return FileResponse(zip_file_path, media_type='application/zip', filename=f"app/media{folder_name}_zip.zip")
32+
return FileResponse(zip_file_path, media_type='application/zip', filename=f"{folder_name}_{source}.zip")
3333

3434

0 commit comments

Comments
 (0)