Merge pull request #2 from terraform-do-modules/internal-424

fix: update source of labels module and readme.yml file
terraform-do-modules · Jul 25, 2023 · b7afe57 · b7afe57
2 parents aacc27f + 5dd2473
commit b7afe57
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 36 deletions.
diff --git a/README.yaml b/README.yaml
@@ -24,8 +24,7 @@ badges:
 
 #  description of this project
 description: |-
-  spaces are virtual networks containing resources that can communicate with each other in full isolation, using private IP addresses.
-
+  Terraform module to create Digitalocean spaces service resource on Digitalocean.
 # extra content
 include:
   - "terraform.md"
@@ -38,7 +37,7 @@ usage : |-
   ```hcl
         module "spaces" {
         source        = "terraform-do-modules/spaces/digitalocean"
-        version       = "0.15.0"
+        version       = "1.0.0"
         name          = "spaces"
         environment   = "test"
         acl           = "private"
@@ -50,7 +49,7 @@ usage : |-
   ```hcl
         module "spaces" {
         source        = "terraform-do-modules/spaces/digitalocean"
-        version       = "0.15.0"
+        version       = "1.0.0"
         name          = "spaces"
         environment   = "test"
         acl           = "private"

diff --git a/_examples/basic/example.tf b/_examples/basic/example.tf
@@ -1,6 +1,4 @@
 provider "digitalocean" {
-  spaces_access_id  = "xxxxxxxxxxxxxxxxxxxx"
-  spaces_secret_key = "xxxxxxxxxxxxxxxxxxxx"
 }
 
 ##------------------------------------------------

diff --git a/_examples/complete/example.tf b/_examples/complete/example.tf
@@ -1,6 +1,4 @@
 provider "digitalocean" {
-  spaces_access_id  = "xxxxxxxxxxxxxxxxxxxx"
-  spaces_secret_key = "xxxxxxxxxxxxxxxxxxxx"
 }
 
 ##------------------------------------------------

diff --git a/main.tf b/main.tf
@@ -2,27 +2,26 @@
 ## Labels module callled that will be used for naming and tags.
 ##-----------------------------------------------------------------------------
 module "labels" {
-  source      = "git::https://github.com/terraform-do-modules/terraform-digitalocean-labels.git?ref=internal-426m"
+  source      = "terraform-do-modules/labels/digitalocean"
+  version     = "1.0.0"
   name        = var.name
   environment = var.environment
   managedby   = var.managedby
   label_order = var.label_order
 }
 
-#Module      : Spaces
-#Description : Provides a bucket resource for Spaces, DigitalOcean's object storage product.
-
+##-----------------------------------------------------------------------------
+##Description : Provides a bucket resource for Spaces, DigitalOcean's object storage product.
+##-----------------------------------------------------------------------------
 resource "digitalocean_spaces_bucket" "spaces" {
-  count  = var.enabled ? 1 : 0
-  name   = module.labels.id
-  region = var.region
-  acl    = var.acl
-
+  count         = var.enabled ? 1 : 0
+  name          = module.labels.id
+  region        = var.region
+  acl           = var.acl
   force_destroy = var.force_destroy
 
   dynamic "cors_rule" {
     for_each = var.cors_rule == null ? [] : var.cors_rule
-
     content {
       allowed_headers = cors_rule.value.allowed_headers
       allowed_methods = cors_rule.value.allowed_methods
@@ -41,9 +40,8 @@ resource "digitalocean_spaces_bucket" "spaces" {
       dynamic "expiration" {
         for_each = var.expiration
         content {
-          date = lookup(expiration.value, "date", null)
-          days = lookup(expiration.value, "days", null)
-
+          date                         = lookup(expiration.value, "date", null)
+          days                         = lookup(expiration.value, "days", null)
           expired_object_delete_marker = lookup(expiration.value, "expired_object_delete_marker", false)
         }
       }
@@ -52,19 +50,17 @@ resource "digitalocean_spaces_bucket" "spaces" {
       }
     }
   }
-
   versioning {
     enabled = var.versioning
   }
-
 }
 
-
+##-----------------------------------------------------------------------------
+#Description : The digitalocean_spaces_bucket_policy resource allows Terraform to attach bucket policy to Spaces.
+##-----------------------------------------------------------------------------
 resource "digitalocean_spaces_bucket_policy" "foobar" {
-  count = var.enabled && var.policy != null ? 1 : 0
-
+  count  = var.enabled && var.policy != null ? 1 : 0
   region = join("", digitalocean_spaces_bucket.spaces[*].region)
   bucket = join("", digitalocean_spaces_bucket.spaces[*].name)
   policy = var.policy
 }
-
diff --git a/variables.tf b/variables.tf
@@ -33,7 +33,6 @@ variable "region" {
 #Module      : spaces
 #Description : Provides a bucket resource for Spaces, DigitalOcean's object storage product.
 
-
 variable "acl" {
   type        = string
   default     = null
@@ -64,23 +63,26 @@ variable "cors_rule" {
   description = "CORS Configuration specification for this bucket"
 }
 
-
 variable "lifecycle_rule" {
-  type    = list(any)
-  default = []
+  type        = list(any)
+  default     = []
+  description = "A configuration of object lifecycle management (documented below)."
 }
+
 variable "expiration" {
-  type    = list(any)
-  default = []
+  type        = list(any)
+  default     = []
+  description = "Specifies a time period after which applicable objects expire (documented below)."
 }
 
 variable "policy" {
-  type    = any
-  default = null
+  type        = any
+  default     = null
+  description = "The text of the policy."
 }
 
 variable "enabled" {
   type        = bool
   default     = true
   description = "Whether to create the resources. Set to `false` to prevent the module from creating any resources."
-}
+}