feat: add ECR

rccyx · rccyx · commit 34cb6394b5ef · 2024-05-10T01:18:40.000+01:00
diff --git a/infra/.terraform.lock.hcl b/infra/.terraform.lock.hcl
diff --git a/infra/container-registry/ecr.tf b/infra/container-registry/ecr.tf
@@ -0,0 +1,8 @@
+resource "aws_ecr_repository" "ecr" {
+  name  = "${lower(var.repo_namespace)}/${var.image_name}"
+  force_delete = var.ecr_force_delete
+  image_tag_mutability = var.image_mutability
+  image_scanning_configuration {
+    scan_on_push = true
+  }
+}
diff --git a/infra/container-registry/output.tf b/infra/container-registry/output.tf
@@ -0,0 +1,4 @@
+
+output "ecr_repository_url" {
+  value = aws_ecr_repository.ecr.repository_url
+}
diff --git a/infra/container-registry/variables.tf b/infra/container-registry/variables.tf
@@ -0,0 +1,21 @@
+variable "ecr_force_delete" {
+  description = "Forces deletion of Docker images before resource is destroyed"
+  default     = true
+  type        = bool
+}
+
+
+variable "repo_namespace" {
+  default     = "ashgw-rg"
+  type        = string
+}
+
+variable "image_name" {
+  type = string
+  default = "main-site"
+}
+
+variable "image_mutability" {
+  default = "MUTABLE"
+  type = string
+}
diff --git a/infra/main.tf b/infra/main.tf
@@ -0,0 +1,13 @@
+
+provider "aws" {
+  region = var.aws_region
+}
+
+module "images_s3_bucket" {
+  source = "./public-content/images"
+}
+
+module "ecr" {
+  source = "./container-registry"
+}
+
diff --git a/infra/public-content/images/.terraform.lock.hcl b/infra/public-content/images/.terraform.lock.hcl
diff --git a/infra/public-content/images/README.md b/infra/public-content/images/README.md
diff --git a/infra/public-content/images/output.tf b/infra/public-content/images/output.tf
@@ -1,3 +1,4 @@
-output "bucket_url" {
-  value = "https://${var.bucket_name}.s3.${var.aws_region}.amazonaws.com"
-}
+output "domain" {
+  description = "Domain name of the bucket"
+  value       = aws_s3_bucket.public_bucket.website_domain
+}
diff --git a/infra/public-content/images/s3.tf b/infra/public-content/images/s3.tf
@@ -1,8 +1,3 @@
-
-provider "aws" {
-  region = var.aws_region
-}
-
 resource "aws_s3_bucket" "public_bucket" {
   bucket = var.bucket_name
 }
diff --git a/infra/public-content/images/variables.tf b/infra/public-content/images/variables.tf
@@ -9,7 +9,4 @@ variable "bucket_owner" {
   default = "i-own-ashgw-blog-public-images"
 }
 
-variable "aws_region" {
-  type = string
-  default = "us-east-2"
-}
+
diff --git a/infra/terraform.tfstate b/infra/terraform.tfstate
@@ -1,16 +1,49 @@
 {
   "version": 4,
   "terraform_version": "1.8.0",
-  "serial": 8,
-  "lineage": "f4094671-b1f4-8a31-8f71-9ae75120ff1d",
-  "outputs": {
-    "bucket_url": {
-      "value": "https://ashgw-blog-public-images.s3.us-east-2.amazonaws.com",
-      "type": "string"
-    }
-  },
+  "serial": 10,
+  "lineage": "842ab499-3270-37e7-9cdf-aefcb1290e6f",
+  "outputs": {},
   "resources": [
     {
+      "module": "module.ecr",
+      "mode": "managed",
+      "type": "aws_ecr_repository",
+      "name": "ecr",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 0,
+          "attributes": {
+            "arn": "arn:aws:ecr:us-east-2:032507467607:repository/ashgw-rg/main-site",
+            "encryption_configuration": [
+              {
+                "encryption_type": "AES256",
+                "kms_key": ""
+              }
+            ],
+            "force_delete": true,
+            "id": "ashgw-rg/main-site",
+            "image_scanning_configuration": [
+              {
+                "scan_on_push": true
+              }
+            ],
+            "image_tag_mutability": "MUTABLE",
+            "name": "ashgw-rg/main-site",
+            "registry_id": "032507467607",
+            "repository_url": "032507467607.dkr.ecr.us-east-2.amazonaws.com/ashgw-rg/main-site",
+            "tags": null,
+            "tags_all": {},
+            "timeouts": null
+          },
+          "sensitive_attributes": [],
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxMjAwMDAwMDAwMDAwfX0="
+        }
+      ]
+    },
+    {
+      "module": "module.images_s3_bucket",
       "mode": "managed",
       "type": "aws_iam_user",
       "name": "bucket_owner",
@@ -24,17 +57,18 @@
             "id": "i-own-ashgw-blog-public-images",
             "name": "i-own-ashgw-blog-public-images",
             "path": "/",
-            "permissions_boundary": "",
+            "permissions_boundary": null,
             "tags": null,
             "tags_all": {},
-            "unique_id": "AIDAQPEMYS5L6ENY7WTTK"
+            "unique_id": "AIDAQPEMYS5L7SHRXFB7H"
           },
           "sensitive_attributes": [],
           "private": "bnVsbA=="
         }
       ]
     },
     {
+      "module": "module.images_s3_bucket",
       "mode": "managed",
       "type": "aws_s3_bucket",
       "name": "public_bucket",
@@ -55,7 +89,9 @@
             "grant": [
               {
                 "id": "e420affff348dc73cd2e823658c3fbe2bcfda717547ca27db9df24c350f45e75",
-                "permissions": ["FULL_CONTROL"],
+                "permissions": [
+                  "FULL_CONTROL"
+                ],
                 "type": "CanonicalUser",
                 "uri": ""
               }
@@ -104,6 +140,7 @@
       ]
     },
     {
+      "module": "module.images_s3_bucket",
       "mode": "managed",
       "type": "aws_s3_bucket_acl",
       "name": "public_bucket",
@@ -156,14 +193,15 @@
           "sensitive_attributes": [],
           "private": "bnVsbA==",
           "dependencies": [
-            "aws_s3_bucket.public_bucket",
-            "aws_s3_bucket_ownership_controls.s3_bucket_acl_ownership",
-            "aws_s3_bucket_public_access_block.example"
+            "module.images_s3_bucket.aws_s3_bucket.public_bucket",
+            "module.images_s3_bucket.aws_s3_bucket_ownership_controls.s3_bucket_acl_ownership",
+            "module.images_s3_bucket.aws_s3_bucket_public_access_block.example"
           ]
         }
       ]
     },
     {
+      "module": "module.images_s3_bucket",
       "mode": "managed",
       "type": "aws_s3_bucket_cors_configuration",
       "name": "public_bucket",
@@ -175,10 +213,19 @@
             "bucket": "ashgw-blog-public-images",
             "cors_rule": [
               {
-                "allowed_headers": ["*"],
-                "allowed_methods": ["GET", "HEAD"],
-                "allowed_origins": ["*"],
-                "expose_headers": ["ETag"],
+                "allowed_headers": [
+                  "*"
+                ],
+                "allowed_methods": [
+                  "GET",
+                  "HEAD"
+                ],
+                "allowed_origins": [
+                  "*"
+                ],
+                "expose_headers": [
+                  "ETag"
+                ],
                 "id": "",
                 "max_age_seconds": 3000
               }
@@ -188,11 +235,14 @@
           },
           "sensitive_attributes": [],
           "private": "bnVsbA==",
-          "dependencies": ["aws_s3_bucket.public_bucket"]
+          "dependencies": [
+            "module.images_s3_bucket.aws_s3_bucket.public_bucket"
+          ]
         }
       ]
     },
     {
+      "module": "module.images_s3_bucket",
       "mode": "managed",
       "type": "aws_s3_bucket_ownership_controls",
       "name": "s3_bucket_acl_ownership",
@@ -212,13 +262,14 @@
           "sensitive_attributes": [],
           "private": "bnVsbA==",
           "dependencies": [
-            "aws_s3_bucket.public_bucket",
-            "aws_s3_bucket_public_access_block.example"
+            "module.images_s3_bucket.aws_s3_bucket.public_bucket",
+            "module.images_s3_bucket.aws_s3_bucket_public_access_block.example"
           ]
         }
       ]
     },
     {
+      "module": "module.images_s3_bucket",
       "mode": "managed",
       "type": "aws_s3_bucket_policy",
       "name": "prod",
@@ -234,13 +285,14 @@
           "sensitive_attributes": [],
           "private": "bnVsbA==",
           "dependencies": [
-            "aws_s3_bucket.public_bucket",
-            "aws_s3_bucket_public_access_block.example"
+            "module.images_s3_bucket.aws_s3_bucket.public_bucket",
+            "module.images_s3_bucket.aws_s3_bucket_public_access_block.example"
           ]
         }
       ]
     },
     {
+      "module": "module.images_s3_bucket",
       "mode": "managed",
       "type": "aws_s3_bucket_public_access_block",
       "name": "example",
@@ -258,7 +310,9 @@
           },
           "sensitive_attributes": [],
           "private": "bnVsbA==",
-          "dependencies": ["aws_s3_bucket.public_bucket"]
+          "dependencies": [
+            "module.images_s3_bucket.aws_s3_bucket.public_bucket"
+          ]
         }
       ]
     }
diff --git a/infra/terraform.tfstate.backup b/infra/terraform.tfstate.backup
@@ -0,0 +1,9 @@
+{
+  "version": 4,
+  "terraform_version": "1.8.0",
+  "serial": 1,
+  "lineage": "842ab499-3270-37e7-9cdf-aefcb1290e6f",
+  "outputs": {},
+  "resources": [],
+  "check_results": null
+}
diff --git a/infra/variables.tf b/infra/variables.tf
@@ -0,0 +1,4 @@
+variable "aws_region" {
+  type = string
+  default = "us-east-2"
+}
diff --git a/infra/versions.tf b/infra/versions.tf
@@ -0,0 +1,9 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 4.0"
+    }
+  }
+  required_version = ">= 1.3.0"
+}
diff --git a/src/app/(pages)/z/page.tsx b/src/app/(pages)/z/page.tsx
@@ -1,10 +1,12 @@
+import { PUBLIC_BLOG_IMAGES_SOURCE } from '@/lib/constants';
+
 export default function Z() {
   return (
     <>
       <div className="mx-auto w-full px-5 h-[400px] max-w-[1165px] rounded-[16rem] ">
         <img
           alt="niko"
-          src="https://ashgw-blog-public-images.s3.us-east-2.amazonaws.com/winston-wolfe.png"
+          src={PUBLIC_BLOG_IMAGES_SOURCE + 'winston-wolfe.png'}
           sizes="(max-width: 768px) 100vw, (max-width: 1400px) 50vw, 90vw"
         ></img>
       </div>
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -16,3 +16,5 @@ export const Status = {
 export const DEFAULT_API_URI = '/api/v1';
 export const GPG_PUBLIC_KEY_EXTERNAL_URL = 'https://github.com/ashgw.gpg';
 export const GPG_PUBLIC_KEY_INTERNAL_URL = SITE_URL + DEFAULT_API_URI + '/gpg';
+export const PUBLIC_BLOG_IMAGES_SOURCE =
+  'https://ashgw-blog-public-images.s3.us-east-2.amazonaws.com/';

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
++
 +output "ecr_repository_url" {
 +  value = aws_ecr_repository.ecr.repository_url
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,3 @@`
`1`		`-`
`2`		`-provider "aws" {`
`3`		`- region = var.aws_region`
`4`		`-}`
`5`		`-`
`6`	`1`	`resource "aws_s3_bucket" "public_bucket" {`
`7`	`2`	`bucket = var.bucket_name`
`8`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,4 @@ variable "bucket_owner" {`
`9`	`9`	`default = "i-own-ashgw-blog-public-images"`
`10`	`10`	`}`
`11`	`11`
`12`		`-variable "aws_region" {`
`13`		`- type = string`
`14`		`- default = "us-east-2"`
`15`		`-}`
	`12`	`+`