chore: iterate

humanitec-architecture · Feb 23, 2024 · f216fc0 · f216fc0
1 parent cbcffec
commit f216fc0
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 14 deletions.
diff --git a/examples/gcp-pubsub/README.md b/examples/gcp-pubsub/README.md
@@ -43,8 +43,8 @@ The workload service account will automatically be assigned the necessary GCP Se
 | gcp\_service\_account\_workload | ../../humanitec-resource-defs/gcp-service-account/workload | n/a |
 | gps\_basic\_subscriber | ../../humanitec-resource-defs/gcp-pubsub-subscription/passthrough | n/a |
 | gpt\_basic\_publisher | ../../humanitec-resource-defs/gcp-pubsub-topic/passthrough | n/a |
-| iam\_role\_binding\_gcp\_pubsub\_subscription\_subscriber | ../../humanitec-resource-defs/iam-role-binding/gcp-pubsub-subscription | n/a |
-| iam\_role\_binding\_gcp\_pubsub\_topic\_publisher | ../../humanitec-resource-defs/iam-role-binding/gcp-pubsub-topic | n/a |
+| iam\_role\_binding\_gcp\_pubsub\_subscription\_subscriber | ../../humanitec-resource-defs/gcp-iam-policy-binding/gcp-pubsub-subscription | n/a |
+| iam\_role\_binding\_gcp\_pubsub\_topic\_publisher | ../../humanitec-resource-defs/gcp-iam-policy-binding/gcp-pubsub-topic | n/a |
 | k8s\_service\_account | ../../humanitec-resource-defs/k8s/service-account | n/a |
 | pubsub\_subscription\_basic | ../../humanitec-resource-defs/gcp-pubsub-subscription/basic | n/a |
 | pubsub\_topic\_basic | ../../humanitec-resource-defs/gcp-pubsub-topic/basic | n/a |

diff --git a/examples/gcp-pubsub/main.tf b/examples/gcp-pubsub/main.tf
@@ -39,6 +39,8 @@ module "gcp_service_account_workload" {
   project     = var.project
   credentials = var.credentials
   prefix      = var.prefix
+
+  name = "hrp-ps-$${context.res.id}"
 }
 
 resource "humanitec_resource_definition_criteria" "gcp_service_account_workload" {

diff --git a/examples/gcp-pubsub/pubsub_subscription.tf b/examples/gcp-pubsub/pubsub_subscription.tf
@@ -20,7 +20,7 @@ resource "humanitec_resource_definition_criteria" "pubsub_subscription_basic" {
 # policy
 
 module "iam_role_binding_gcp_pubsub_subscription_subscriber" {
-  source = "../../humanitec-resource-defs/iam-role-binding/gcp-pubsub-subscription"
+  source = "../../humanitec-resource-defs/gcp-iam-policy-binding/gcp-pubsub-subscription"
 
   prefix = var.prefix
 

diff --git a/examples/gcp-pubsub/pubsub_topic.tf b/examples/gcp-pubsub/pubsub_topic.tf
@@ -20,7 +20,7 @@ resource "humanitec_resource_definition_criteria" "pubsub_topic_basic" {
 # policy
 
 module "iam_role_binding_gcp_pubsub_topic_publisher" {
-  source = "../../humanitec-resource-defs/iam-role-binding/gcp-pubsub-topic"
+  source = "../../humanitec-resource-defs/gcp-iam-policy-binding/gcp-pubsub-topic"
 
   prefix = var.prefix
 

diff --git a/...binding/gcp-pubsub-subscription/README.md → ...binding/gcp-pubsub-subscription/README.md b/...binding/gcp-pubsub-subscription/README.md → ...binding/gcp-pubsub-subscription/README.md
diff --git a/...e-binding/gcp-pubsub-subscription/main.tf → ...y-binding/gcp-pubsub-subscription/main.tf b/...e-binding/gcp-pubsub-subscription/main.tf → ...y-binding/gcp-pubsub-subscription/main.tf
@@ -1,10 +1,9 @@
 resource "humanitec_resource_definition" "main" {
   driver_type = "humanitec/template"
-  id          = "${var.prefix}iam-role-biding-gcp-pubsub-subscription-${var.name}"
-  name        = "${var.prefix}iam-role-biding-gcp-pubsub-subscription-${var.name}"
+  id          = "${var.prefix}gcp-iam-policy-binding-gcp-pubsub-subscription-${var.name}"
+  name        = "${var.prefix}gcp-iam-policy-binding-gcp-pubsub-subscription-${var.name}"
 
-  # TODO Switch the GCP type once available
-  type = "aws-policy"
+  type = "gcp-iam-policy-binding"
 
   driver_inputs = {
     values_string = jsonencode({

diff --git a/...inding/gcp-pubsub-subscription/outputs.tf → ...inding/gcp-pubsub-subscription/outputs.tf b/...inding/gcp-pubsub-subscription/outputs.tf → ...inding/gcp-pubsub-subscription/outputs.tf
diff --git a/...ding/gcp-pubsub-subscription/providers.tf → ...ding/gcp-pubsub-subscription/providers.tf b/...ding/gcp-pubsub-subscription/providers.tf → ...ding/gcp-pubsub-subscription/providers.tf
diff --git a/...sub-subscription/terraform.tfvars.example → ...sub-subscription/terraform.tfvars.example b/...sub-subscription/terraform.tfvars.example → ...sub-subscription/terraform.tfvars.example
diff --git a/...ding/gcp-pubsub-subscription/variables.tf → ...ding/gcp-pubsub-subscription/variables.tf b/...ding/gcp-pubsub-subscription/variables.tf → ...ding/gcp-pubsub-subscription/variables.tf
diff --git a/...m-role-binding/gcp-pubsub-topic/README.md → ...policy-binding/gcp-pubsub-topic/README.md b/...m-role-binding/gcp-pubsub-topic/README.md → ...policy-binding/gcp-pubsub-topic/README.md
diff --git a/...iam-role-binding/gcp-pubsub-topic/main.tf → ...m-policy-binding/gcp-pubsub-topic/main.tf b/...iam-role-binding/gcp-pubsub-topic/main.tf → ...m-policy-binding/gcp-pubsub-topic/main.tf
@@ -1,10 +1,9 @@
 resource "humanitec_resource_definition" "main" {
   driver_type = "humanitec/template"
-  id          = "${var.prefix}iam-role-biding-gcp-pubsub-topic-${var.name}"
-  name        = "${var.prefix}iam-role-biding-gcp-pubsub-topic-${var.name}"
+  id          = "${var.prefix}gcp-iam-policy-binding-gcp-pubsub-topic-${var.name}"
+  name        = "${var.prefix}gcp-iam-policy-binding-gcp-pubsub-topic-${var.name}"
 
-  # TODO Switch the GCP type once available
-  type = "aws-policy"
+  type = "gcp-iam-policy-binding"
 
   driver_inputs = {
     values_string = jsonencode({

diff --git a/...-role-binding/gcp-pubsub-topic/outputs.tf → ...olicy-binding/gcp-pubsub-topic/outputs.tf b/...-role-binding/gcp-pubsub-topic/outputs.tf → ...olicy-binding/gcp-pubsub-topic/outputs.tf
diff --git a/...ole-binding/gcp-pubsub-topic/providers.tf → ...icy-binding/gcp-pubsub-topic/providers.tf b/...ole-binding/gcp-pubsub-topic/providers.tf → ...icy-binding/gcp-pubsub-topic/providers.tf
diff --git a/...gcp-pubsub-topic/terraform.tfvars.example → ...gcp-pubsub-topic/terraform.tfvars.example b/...gcp-pubsub-topic/terraform.tfvars.example → ...gcp-pubsub-topic/terraform.tfvars.example
diff --git a/...ole-binding/gcp-pubsub-topic/variables.tf → ...icy-binding/gcp-pubsub-topic/variables.tf b/...ole-binding/gcp-pubsub-topic/variables.tf → ...icy-binding/gcp-pubsub-topic/variables.tf
diff --git a/humanitec-resource-defs/gcp-pubsub-subscription/passthrough/main.tf b/humanitec-resource-defs/gcp-pubsub-subscription/passthrough/main.tf
@@ -15,7 +15,7 @@ EOL
   }
 
   provision = {
-    "aws-policy.${var.policy_resource_class}" = {
+    "gcp-iam-policy-binding.${var.policy_resource_class}" = {
       match_dependents = true
       is_dependent     = false
     }

diff --git a/humanitec-resource-defs/gcp-pubsub-topic/passthrough/main.tf b/humanitec-resource-defs/gcp-pubsub-topic/passthrough/main.tf
@@ -15,7 +15,7 @@ EOL
   }
 
   provision = {
-    "aws-policy.${var.policy_resource_class}" = {
+    "gcp-iam-policy-binding.${var.policy_resource_class}" = {
       match_dependents = true
       is_dependent     = false
     }