Prepare to release 0.2.2

Author: 4ops

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 0.2.2
+
+- Added sensitive variable support
+- Fixed provider block inside required_providers
+
 ## 0.2.1
 
 - Added variable validation support ([#5](https://github.com/4ops/vscode-language-terraform/issues/5))

examples/locals.tf

@@ -54,3 +54,51 @@ locals {
     data.template.rendered,
   ]))
 }
+
+variable "example" {
+  type = any
+}
+
+locals {
+  example = try(
+    [tostring(var.example)],
+    tolist(var.example),
+  )
+}
+
+locals {
+  raw_value = yamldecode(file("${path.module}/example.yaml"))
+  normalized_value = {
+    name   = tostring(try(local.raw_value.name, null))
+    groups = try(local.raw_value.groups, [])
+  }
+}
+
+locals {
+  storage = defaults(var.storage, {
+    # If "enabled" isn't set then it will default
+    # to true.
+    enabled = true
+
+    # The "website" attribute is required, but
+    # it's here to provide defaults for the
+    # optional attributes inside.
+    website = {
+      index_document = "index.html"
+      error_document = "error.html"
+    }
+
+    # The "documents" attribute has a map type,
+    # so the default value represents defaults
+    # to be applied to all of the elements in
+    # the map, not for the map itself. Therefore
+    # it's a single object matching the map
+    # element type, not a map itself.
+    documents = {
+      # If _any_ of the map elements omit
+      # content_type then this default will be
+      # used instead.
+      content_type = "application/octet-stream"
+    }
+  })
+}

examples/outputs.tf

@@ -22,3 +22,6 @@ output "fqdn" {
   description = "lasjdkaslkdjalksjdlkjaskd"
 }
 
+output "sensitive_example_hash" {
+  value = nonsensitive(sha256(var.sensitive_example))
+}

examples/terraform.tf

@@ -7,6 +7,10 @@ terraform {
     template     = ">= 2.1"
     tls          = "~> 2.0"
     null         = "~> 2.1"
+
+    digitalocean = {
+      source = "digitalocean/digitalocean"
+    }
   }
 
   backend "s3" {

examples/variables.tf

@@ -89,4 +89,33 @@ variable "ipv6" {
   description = <<-DESCRIPTION
     Bitcoin extra arguments for testnet.
   DESCRIPTION
+
+  sensitive = true
+}
+
+variable "timestamp" {
+  type        = string
+
+  validation {
+    # formatdate fails if the second argument is not a valid timestamp
+    condition     = can(formatdate("", var.timestamp))
+    error_message = "The timestamp argument requires a valid RFC 3339 timestamp."
+  }
+}
+
+variable "storage" {
+  type = object({
+    name    = string
+    enabled = optional(bool)
+    website = object({
+      index_document = optional(string)
+      error_document = optional(string)
+    })
+    documents = map(
+      object({
+        source_file  = string
+        content_type = optional(string)
+      })
+    )
+  })
 }

grammars/tf.yaml

@@ -35,27 +35,19 @@ patterns:
       - name: "meta.terraform.required_providers.tf"
         begin: '\b(required_providers)([\w\-\"$])?(?:\s+)?({)'
         beginCaptures:
-          # 1: { name: keyword.control.$1.tf }
+          1: { name: keyword.declaration.$1.tf }
           2: { name: invalid.illegal.keyword.$1.tf }
-          3: { name: punctuation.definition.block.begin.tf }
+          3: { name: punctuation.declaration.block.begin.tf }
         end: "}"
         endCaptures:
           0: { name: punctuation.definition.block.end.tf }
         patterns:
           - include: "#comments"
-          - match: '\b([\-\w]+)(?:\s+)?(=)(?:\s+)?(")([^$"]+)?(")'
+          - match: '\b([\-\w]+)(?:\s+)?(=)(?:\s+)?'
             captures:
-              1: { name: entity.name.provider.tf }
+              1: { name: support.provider.attribute.tf }
               2: { name: keyword.operator.assignment.tf }
-              3:
-                {
-                  name: string.quoted.double.tf punctuation.definition.string.begin.tf,
-                }
-              4: { name: string.quoted.double.tf }
-              5:
-                {
-                  name: string.quoted.double.tf punctuation.definition.string.end.tf,
-                }
+          - include: "#definition-right"
       - name: "meta.terraform.backend.tf"
         begin: '\b(backend)(?:\s+)?(")([^$"]+)?(")(?:\s+)?({)'
         beginCaptures:
@@ -169,7 +161,7 @@ patterns:
       0: { name: punctuation.declaration.block.end.tf }
     patterns:
       - include: "#comments"
-      - match: '\b(type|default|description|validation)(?:\s+)?(=)?(?:\s+)?'
+      - match: '\b(type|default|description|validation|sensitive)(?:\s+)?(=)?(?:\s+)?'
         captures:
           1: { name: meta.keyword.$1.tf }
           2: { name: keyword.operator.assignment.tf }
@@ -365,11 +357,11 @@ repository:
 
   support-function-collection:
     name: support.function.builtin.collection.tf
-    match: '(?<!\.)\b(chunklist|coalescelist|coalesce|compact|concat|contains|distinct|element|flatten|index|keys|length|list|lookup|map|matchkeys|merge|range|reverse|setintersection|setproduct|setunion|slice|sort|transpose|values|zipmap)\b(?=\()'
+    match: '(?<!\.)\b(alltrue|anytrue|chunklist|coalescelist|coalesce|compact|concat|contains|distinct|element|flatten|index|keys|length|list|lookup|map|matchkeys|merge|one|range|reverse|setintersection|setproduct|setsubtract|setunion|slice|sort|transpose|values|zipmap)\b(?=\()'
 
   support-function-encoding:
     name: support.function.builtin.encoding.tf
-    match: '(?<!\.)\b(base64decode|base64encode|base64gzip|csvdecode|jsondecode|jsonencode|urlencode|yamldecode|yamlencode)\b(?=\()'
+    match: '(?<!\.)\b(base64decode|base64encode|base64gzip|csvdecode|jsondecode|jsonencode|textdecodebase64|textencodebase64|urlencode|yamldecode|yamlencode)\b(?=\()'
 
   support-function-filesystem:
     name: support.function.builtin.filesystem.tf
@@ -389,7 +381,7 @@ repository:
 
   support-function-conversion:
     name: support.function.builtin.conversion.tf
-    match: '(?<!\.)\b(tobool|tolist|tomap|tonumber|toset|tostring)\b(?=\()'
+    match: '(?<!\.)\b(can|defaults|nonsensitive|sensitive|tobool|tolist|tomap|tonumber|toset|tostring|try)\b(?=\()'
 
   constants-decimal:
     match: '\b\d+(\.)?(\d+)?'
@@ -418,7 +410,7 @@ repository:
     name: keyword.operator.ternary.tf
 
   keyword-comparison:
-    match: "~>|>=|<=|==|!=|[^<]<[^<]|[^>]>[^>]"
+    match: '\b(~>|>=|<=|==|!=|[^<]<[^<]|[^>]>[^>])'
     name: keyword.operator.comparison.tf
 
   keyword-conditional:

package.json

@@ -98,10 +98,10 @@
 	},
 	"scripts": {
 		"build": "npm run compile -s",
-		"compile-tf": "yq r --prettyPrint --tojson grammars/tf.yaml > grammars/tf.json",
-		"compile-tfvars": "yq r --prettyPrint --tojson grammars/tfvars.yaml > grammars/tfvars.json",
-		"compile-terragrunt": "yq r --prettyPrint --tojson grammars/terragrunt.yaml > grammars/terragrunt.json",
-		"compile-snippets": "yq r --prettyPrint --tojson snippets/tf.yaml > snippets/tf.json",
+		"compile-tf": "yq eval --prettyPrint --tojson grammars/tf.yaml > grammars/tf.json",
+		"compile-tfvars": "yq eval --prettyPrint --tojson grammars/tfvars.yaml > grammars/tfvars.json",
+		"compile-terragrunt": "yq eval --prettyPrint --tojson grammars/terragrunt.yaml > grammars/terragrunt.json",
+		"compile-snippets": "yq eval --prettyPrint --tojson snippets/tf.yaml > snippets/tf.json",
 		"compile": "npm run compile-tf && npm run compile-tfvars && npm run compile-terragrunt && npm run compile-snippets",
 		"preversion": "git add -A .",
 		"postversion": "npm run push -s",