Merge pull request #13 from clouddrove/CD-262

add new features

Author: Nikita Dugar

_example/basic/example.tf

@@ -3,9 +3,8 @@ provider "aws" {
 }
 
 module "api-gateway" {
-  source = "../../"
-  name   = "api-gateway"
-
+  source      = "../../"
+  name        = "api-gateway"
   repository  = "https://registry.terraform.io/modules/clouddrove/api-gateway/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]

_example/complete/example.tf

@@ -6,6 +6,7 @@ module "api-gateway" {
   source = "../../"
 
   name        = "api-gateway"
+  repository  = "https://registry.terraform.io/modules/clouddrove/api-gateway/aws/0.14.0"
   environment = "test"
   label_order = ["name", "environment"]
   enabled     = true

main.tf

@@ -8,12 +8,13 @@
 module "labels" {
   source = "git::https://github.com/clouddrove/terraform-labels.git?ref=tags/0.14.0"
 
+  enabled     = var.enabled
   name        = var.name
   repository  = var.repository
   environment = var.environment
   managedby   = var.managedby
-  attributes  = var.attributes
   label_order = var.label_order
+  attributes  = var.attributes
 }
 
 # Module      : Api Gateway
@@ -30,6 +31,7 @@ resource "aws_api_gateway_rest_api" "default" {
   endpoint_configuration {
     types = var.types
   }
+  policy = var.api_policy
 }
 
 # Module      : Api Gateway Resource
@@ -51,7 +53,7 @@ resource "aws_api_gateway_model" "default" {
   description  = length(var.model_descriptions) > 0 ? element(var.model_descriptions, count.index) : ""
   content_type = element(var.content_types, count.index)
 
-  schema = <<EOF
+  schema = length(var.model_schemas) > 0 ? element(var.model_schemas, count.index) : <<EOF
 {"type":"object"}
 EOF
 }
@@ -65,7 +67,7 @@ resource "aws_api_gateway_method" "default" {
   resource_id          = aws_api_gateway_resource.default.*.id[count.index]
   http_method          = element(var.http_methods, count.index)
   authorization        = length(var.authorizations) > 0 ? element(var.authorizations, count.index) : "NONE"
-  authorizer_id        = length(var.authorizer_ids) > 0 ? element(var.authorizer_ids, count.index) : null
+  authorizer_id        = length(var.authorizer_ids) > 0 ? element(var.authorizer_ids, count.index) : (var.authorizer_count > 0 ? aws_api_gateway_authorizer.default.*.id[count.index] : null)
   authorization_scopes = length(var.authorization_scopes) > 0 ? element(var.authorization_scopes, count.index) : null
   api_key_required     = length(var.api_key_requireds) > 0 ? element(var.api_key_requireds, count.index) : null
   request_models       = length(var.request_models) > 0 ? element(var.request_models, count.index) : { "application/json" = "Empty" }

variables.tf

@@ -10,6 +10,13 @@ variable "repository" {
   type        = string
   default     = ""
   description = "Terraform current module repo"
+
+  validation {
+    # regex(...) fails if it cannot find a match
+    condition     = can(regex("^https://", var.repository))
+    error_message = "The module-repo value must be a valid Git repo link."
+  }
+
 }
 
 variable "environment" {
@@ -550,5 +557,14 @@ variable "values" {
   type        = list(any)
   default     = []
   description = "The value of the API key. If not specified, it will be automatically generated by AWS on creation."
-  sensitive   = true
+}
+
+variable "api_policy" {
+  default     = null
+  description = "The policy document."
+}
+
+variable "model_schemas" {
+  default     = []
+  description = "The schema of the model in a JSON form."
 }