move tls resources to the example

terraform-google-modules · Dec 9, 2019 · 42bea3f · 42bea3f
1 parent cae7f44
commit 42bea3f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 37 deletions.
diff --git a/examples/cloudiot/README.md b/examples/cloudiot/README.md
@@ -8,8 +8,6 @@
 | name | The name for the Cloud IoT registry | string | n/a | yes |
 | project\_id | The project ID to manage the Pub/Sub resources | string | n/a | yes |
 | region | The region for the IoT resources | string | n/a | yes |
-| rsa\_cert1\_pem | The first certificate for Cloud IoT registry | string | n/a | yes |
-| rsa\_cert2\_pem | The second certificate for Cloud IoT registry | string | n/a | yes |
 
 ## Outputs
 

diff --git a/examples/cloudiot/main.tf b/examples/cloudiot/main.tf
@@ -19,6 +19,23 @@ provider "google" {
   region  = var.region
 }
 
+resource "tls_private_key" "private_keys" {
+  count     = 2
+  algorithm = "RSA"
+}
+
+resource "tls_self_signed_cert" "certs" {
+  count           = 2
+  key_algorithm   = "RSA"
+  private_key_pem = tls_private_key.private_keys[count.index].private_key_pem
+  subject {
+    common_name  = "example.com"
+    organization = "ACME Examples, Inc"
+  }
+  validity_period_hours = 12
+  allowed_uses          = []
+}
+
 module "iot" {
   source             = "../../modules/cloudiot"
   name               = var.name
@@ -29,11 +46,11 @@ module "iot" {
   public_key_certificates = [
     {
       format      = "X509_CERTIFICATE_PEM"
-      certificate = var.rsa_cert1_pem
+      certificate = tls_self_signed_cert.certs[0].cert_pem
     },
     {
       format      = "X509_CERTIFICATE_PEM"
-      certificate = var.rsa_cert2_pem
+      certificate = tls_self_signed_cert.certs[1].cert_pem
     },
   ]
   event_notification_config = {

diff --git a/examples/cloudiot/variables.tf b/examples/cloudiot/variables.tf
@@ -28,13 +28,3 @@ variable "name" {
   type        = string
   description = "The name for the Cloud IoT registry"
 }
-
-variable "rsa_cert1_pem" {
-  type        = string
-  description = "The first certificate for Cloud IoT registry"
-}
-
-variable "rsa_cert2_pem" {
-  type        = string
-  description = "The second certificate for Cloud IoT registry"
-}
diff --git a/test/fixtures/cloudiot/main.tf b/test/fixtures/cloudiot/main.tf
@@ -14,28 +14,9 @@
  * limitations under the License.
  */
 
-resource "tls_private_key" "private_keys" {
-  count     = 2
-  algorithm = "RSA"
-}
-
-resource "tls_self_signed_cert" "certs" {
-  count           = 2
-  key_algorithm   = "RSA"
-  private_key_pem = tls_private_key.private_keys[count.index].private_key_pem
-  subject {
-    common_name  = "example.com"
-    organization = "ACME Examples, Inc"
-  }
-  validity_period_hours = 12
-  allowed_uses          = []
-}
-
 module "iot" {
-  source        = "../../../examples/cloudiot"
-  project_id    = var.project_id
-  name          = "cft-ci-iot-registry"
-  region        = "us-central1"
-  rsa_cert1_pem = tls_self_signed_cert.certs[0].cert_pem
-  rsa_cert2_pem = tls_self_signed_cert.certs[1].cert_pem
+  source     = "../../../examples/cloudiot"
+  project_id = var.project_id
+  name       = "cft-ci-iot-registry"
+  region     = "us-central1"
 }