Adding resource groups #27

cloudbees · Jan 10, 2024 · c2a1952 · c2a1952
1 parent 501f822
commit c2a1952
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/blueprints/01-getting-started/README.md b/blueprints/01-getting-started/README.md
@@ -80,7 +80,7 @@ Initialize the root module and any associated configuration for providers and fi
 
 For more detailed information, see the documentation for the [Terraform Core workflow](https://www.terraform.io/intro/core-workflow).
 
-TODO: Deloyed resources link to AWS Resource Groups
+Once deployed has finished, it is possible to check the generated AWS resources via Resource Groups.
 
 > [!TIP]
 > These steps are automated in the [Makefile](../../Makefile) at the root of the project under the target `tfDeploy`.

diff --git a/blueprints/01-getting-started/main.tf b/blueprints/01-getting-started/main.tf
@@ -10,6 +10,7 @@ locals {
 
   vpc_name             = "${local.name}-vpc"
   cluster_name         = "${local.name}-eks"
+  resource_group_name  = "${local.name}-rg"
   kubeconfig_file      = "kubeconfig_${local.name}.yaml"
   kubeconfig_file_path = abspath("${path.root}/${local.kubeconfig_file}")
 
@@ -231,3 +232,23 @@ module "vpc" {
   tags = local.tags
 
 }
+
+resource "aws_resourcegroups_group" "bp_rg" {
+  name = local.resource_group_name
+
+  resource_query {
+    query = <<JSON
+{
+  "ResourceTypeFilters": [
+    "AWS::AllSupported"
+  ],
+  "TagFilters": [
+    {
+      "Key": "tf:blueprint",
+      "Values": ["${local.name}"]
+    }
+  ]
+}
+JSON
+  }
+}
diff --git a/blueprints/02-at-scale/main.tf b/blueprints/02-at-scale/main.tf
@@ -14,6 +14,7 @@ locals {
   vpc_name             = "${local.name}-vpc"
   cluster_name         = "${local.name}-eks"
   efs_name             = "${local.name}-efs"
+  resource_group_name  = "${local.name}-rg"
   kubeconfig_file      = "kubeconfig_${local.name}.yaml"
   kubeconfig_file_path = abspath("${path.root}/${local.kubeconfig_file}")
 
@@ -407,3 +408,23 @@ module "vpc" {
   tags = local.tags
 
 }
+
+resource "aws_resourcegroups_group" "bp_rg" {
+  name = local.resource_group_name
+
+  resource_query {
+    query = <<JSON
+{
+  "ResourceTypeFilters": [
+    "AWS::AllSupported"
+  ],
+  "TagFilters": [
+    {
+      "Key": "tf:blueprint",
+      "Values": ["${local.name}"]
+    }
+  ]
+}
+JSON
+  }
+}