feat!: Add support for feature flag (#8)

Co-authored-by: Bryant Biggs <bryantbiggs@gmail.com>

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.77.0
+    rev: v1.83.5
     hooks:
       - id: terraform_fmt
       - id: terraform_validate
@@ -23,7 +23,7 @@ repos:
           - '--args=--only=terraform_standard_module_structure'
           - '--args=--only=terraform_workspace_remote'
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-merge-conflict
       - id: end-of-file-fixer

README.md

@@ -9,7 +9,6 @@ See [`examples`](https://github.com/terraform-aws-modules/terraform-aws-appconfi
 ```hcl
 module "appconfig" {
   source  = "terraform-aws-modules/appconfig/aws"
-  version = "~> 1.0"
 
   name        = "example"
   description = "AppConfig hosted configuration"
@@ -78,14 +77,14 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.55 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.55 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0 |
 
 ## Modules
 
@@ -118,6 +117,7 @@ No modules.
 | <a name="input_config_profile_name"></a> [config\_profile\_name](#input\_config\_profile\_name) | The name for the configuration profile. Must be between 1 and 64 characters in length | `string` | `null` | no |
 | <a name="input_config_profile_retrieval_role_arn"></a> [config\_profile\_retrieval\_role\_arn](#input\_config\_profile\_retrieval\_role\_arn) | The ARN of an IAM role with permission to access the configuration at the specified `location_uri`. A retrieval role ARN is not required for configurations stored in the AWS AppConfig `hosted` configuration store. It is required for all other sources that store your configuration | `string` | `null` | no |
 | <a name="input_config_profile_tags"></a> [config\_profile\_tags](#input\_config\_profile\_tags) | A map of additional tags to apply to the configuration profile | `map(string)` | `{}` | no |
+| <a name="input_config_profile_type"></a> [config\_profile\_type](#input\_config\_profile\_type) | Type of configurations contained in the profile. Valid values: `AWS.AppConfig.FeatureFlags` and `AWS.Freeform` | `string` | `null` | no |
 | <a name="input_config_profile_validator"></a> [config\_profile\_validator](#input\_config\_profile\_validator) | A set of methods for validating the configuration. Maximum of 2 | `list(map(any))` | `[]` | no |
 | <a name="input_create"></a> [create](#input\_create) | Determines whether resources are created | `bool` | `true` | no |
 | <a name="input_create_deployment_strategy"></a> [create\_deployment\_strategy](#input\_create\_deployment\_strategy) | Determines whether a deployment strategy is created | `bool` | `true` | no |

examples/README.md

@@ -1,6 +1,7 @@
 # Terraform AWS AppConfig examples
 
 - [AppConfig Hosted](https://github.com/terraform-aws-modules/terraform-aws-appconfig/tree/master/examples/appconfig_hosted)
+- [Feature Flag](https://github.com/terraform-aws-modules/terraform-aws-appconfig/tree/master/examples/feature_flag)
 - [S3](https://github.com/terraform-aws-modules/terraform-aws-appconfig/tree/master/examples/s3)
 - [SSM Document](https://github.com/terraform-aws-modules/terraform-aws-appconfig/tree/master/examples/ssm_document)
 - [SSM Parameter](https://github.com/terraform-aws-modules/terraform-aws-appconfig/tree/master/examples/ssm_parameter)

examples/_configs/feature_flags.json

@@ -0,0 +1,13 @@
+{
+    "flags": {
+        "is_enabled": {
+            "name": "isEnabled"
+        }
+    },
+    "values": {
+        "is_enabled": {
+            "enabled": "false"
+        }
+    },
+    "version": "1"
+}

examples/appconfig_hosted/README.md → examples/appconfig-hosted/README.md

@@ -25,9 +25,9 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
 | <a name="requirement_archive"></a> [archive](#requirement\_archive) | >= 2.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.55 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |
 
 ## Providers
 
@@ -40,8 +40,9 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_appconfig"></a> [appconfig](#module\_appconfig) | ../../ | n/a |
+| <a name="module_appconfig_feature_flag"></a> [appconfig\_feature\_flag](#module\_appconfig\_feature\_flag) | ../../ | n/a |
 | <a name="module_deactivated_appconfig"></a> [deactivated\_appconfig](#module\_deactivated\_appconfig) | ../../ | n/a |
-| <a name="module_validate_lambda"></a> [validate\_lambda](#module\_validate\_lambda) | terraform-aws-modules/lambda/aws | ~> 2.0 |
+| <a name="module_validate_lambda"></a> [validate\_lambda](#module\_validate\_lambda) | terraform-aws-modules/lambda/aws | ~> 6.0 |
 
 ## Resources
 

examples/appconfig_hosted/main.tf → examples/appconfig-hosted/main.tf

@@ -4,7 +4,7 @@ provider "aws" {
 
 locals {
   region = "us-east-1"
-  name   = "appconfig-ex-${replace(basename(path.cwd), "_", "-")}"
+  name   = "ex-${basename(path.cwd)}"
 
   tags = {
     Name       = local.name
@@ -59,6 +59,33 @@ module "appconfig" {
   tags = local.tags
 }
 
+module "appconfig_feature_flag" {
+  source = "../../"
+
+  name        = "${local.name}-feature-flag"
+  description = "AppConfig hosted feature flag - ${local.name}"
+
+  # environments
+  environments = {
+    nonprod = {
+      name        = "nonprod"
+      description = "NonProd environment - ${local.name}"
+    },
+    prod = {
+      name        = "prod"
+      description = "Prod environment - ${local.name}"
+    }
+  }
+
+  # hosted config version
+  use_hosted_configuration           = true
+  config_profile_type                = "AWS.AppConfig.FeatureFlags"
+  hosted_config_version_content_type = "application/json"
+  hosted_config_version_content      = file("../_configs/feature_flags.json")
+
+  tags = local.tags
+}
+
 ################################################################################
 # Supporting Resources
 ################################################################################
@@ -71,7 +98,7 @@ data "archive_file" "lambda_handler" {
 
 module "validate_lambda" {
   source  = "terraform-aws-modules/lambda/aws"
-  version = "~> 2.0"
+  version = "~> 6.0"
 
   function_name = local.name
   description   = "Configuration semantic validation lambda"

examples/ssm_parameter/versions.tf → examples/appconfig-hosted/versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.13.1"
+  required_version = ">= 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.55"
+      version = ">= 5.0"
     }
     archive = {
       source  = "hashicorp/archive"

examples/s3/README.md

@@ -24,30 +24,30 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
 | <a name="requirement_archive"></a> [archive](#requirement\_archive) | >= 2.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.55 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_archive"></a> [archive](#provider\_archive) | >= 2.0 |
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.55 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_appconfig"></a> [appconfig](#module\_appconfig) | ../../ | n/a |
-| <a name="module_s3_bucket"></a> [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 2.0 |
-| <a name="module_validate_lambda"></a> [validate\_lambda](#module\_validate\_lambda) | terraform-aws-modules/lambda/aws | ~> 2.0 |
+| <a name="module_s3_bucket"></a> [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 3.0 |
+| <a name="module_validate_lambda"></a> [validate\_lambda](#module\_validate\_lambda) | terraform-aws-modules/lambda/aws | ~> 6.0 |
 
 ## Resources
 
 | Name | Type |
 |------|------|
-| [aws_s3_bucket_object.config](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_object) | resource |
+| [aws_s3_object.config](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_object) | resource |
 | [archive_file.lambda_handler](https://registry.terraform.io/providers/hashicorp/archive/latest/docs/data-sources/file) | data source |
 | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |

examples/s3/main.tf

@@ -4,7 +4,7 @@ provider "aws" {
 
 locals {
   region = "us-east-1"
-  name   = "appconfig-ex-${replace(basename(path.cwd), "_", "-")}"
+  name   = "ex-${basename(path.cwd)}"
 
   tags = {
     Name       = local.name
@@ -14,7 +14,6 @@ locals {
 }
 
 data "aws_region" "current" {}
-
 data "aws_caller_identity" "current" {}
 
 ################################################################################
@@ -43,7 +42,7 @@ module "appconfig" {
   use_s3_configuration        = true
   s3_configuration_bucket_arn = module.s3_bucket.s3_bucket_arn
   retrieval_role_description  = "Role to retrieve configuration stored in S3"
-  config_profile_location_uri = "s3://${module.s3_bucket.s3_bucket_id}/${aws_s3_bucket_object.config.id}"
+  config_profile_location_uri = "s3://${module.s3_bucket.s3_bucket_id}/${aws_s3_object.config.id}"
   config_profile_validator = [{
     type    = "JSON_SCHEMA"
     content = file("../_configs/config_validator.json")
@@ -53,7 +52,7 @@ module "appconfig" {
   }]
 
   # deployment
-  deployment_configuration_version = aws_s3_bucket_object.config.version_id
+  deployment_configuration_version = aws_s3_object.config.version_id
 
   tags = local.tags
 }
@@ -70,7 +69,7 @@ data "archive_file" "lambda_handler" {
 
 module "validate_lambda" {
   source  = "terraform-aws-modules/lambda/aws"
-  version = "~> 2.0"
+  version = "~> 6.0"
 
   function_name = local.name
   description   = "Configuration semantic validation lambda"
@@ -98,7 +97,7 @@ module "validate_lambda" {
 
 module "s3_bucket" {
   source  = "terraform-aws-modules/s3-bucket/aws"
-  version = "~> 2.0"
+  version = "~> 3.0"
 
   bucket = "${local.name}-${data.aws_caller_identity.current.account_id}-${data.aws_region.current.name}"
   acl    = "private"
@@ -108,11 +107,6 @@ module "s3_bucket" {
   # Intended for example use only
   force_destroy = true
 
-  block_public_acls       = true
-  block_public_policy     = true
-  ignore_public_acls      = true
-  restrict_public_buckets = true
-
   server_side_encryption_configuration = {
     rule = {
       apply_server_side_encryption_by_default = {
@@ -128,7 +122,7 @@ module "s3_bucket" {
   tags = local.tags
 }
 
-resource "aws_s3_bucket_object" "config" {
+resource "aws_s3_object" "config" {
   bucket                 = module.s3_bucket.s3_bucket_id
   key                    = "s3/config.json"
   source                 = "../_configs/config.json"

examples/s3/versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.13.1"
+  required_version = ">= 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.55"
+      version = ">= 5.0"
     }
     archive = {
       source  = "hashicorp/archive"

examples/ssm_document/README.md → examples/ssm-document/README.md

@@ -23,14 +23,14 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.55 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.55 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0 |
 
 ## Modules
 

examples/ssm_document/main.tf → examples/ssm-document/main.tf

@@ -4,7 +4,7 @@ provider "aws" {
 
 locals {
   region = "us-east-1"
-  name   = "appconfig-ex-${replace(basename(path.cwd), "_", "-")}"
+  name   = "ex-${basename(path.cwd)}"
 
   tags = {
     Name       = local.name

examples/ssm_document/versions.tf → examples/ssm-document/versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.13.1"
+  required_version = ">= 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.55"
+      version = ">= 5.0"
     }
   }
 }

examples/ssm_parameter/README.md → examples/ssm-parameter/README.md

@@ -24,23 +24,23 @@ Note that this example may create resources which will incur monetary charges on
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
 | <a name="requirement_archive"></a> [archive](#requirement\_archive) | >= 2.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.55 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
 | <a name="provider_archive"></a> [archive](#provider\_archive) | >= 2.0 |
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.55 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_appconfig"></a> [appconfig](#module\_appconfig) | ../../ | n/a |
-| <a name="module_validate_lambda"></a> [validate\_lambda](#module\_validate\_lambda) | terraform-aws-modules/lambda/aws | ~> 2.0 |
+| <a name="module_validate_lambda"></a> [validate\_lambda](#module\_validate\_lambda) | terraform-aws-modules/lambda/aws | ~> 6.0 |
 
 ## Resources
 

examples/ssm_parameter/main.tf → examples/ssm-parameter/main.tf

@@ -4,7 +4,7 @@ provider "aws" {
 
 locals {
   region = "us-east-1"
-  name   = "appconfig-ex-${replace(basename(path.cwd), "_", "-")}"
+  name   = "ex-${basename(path.cwd)}"
 
   tags = {
     Name       = local.name
@@ -68,7 +68,7 @@ data "archive_file" "lambda_handler" {
 
 module "validate_lambda" {
   source  = "terraform-aws-modules/lambda/aws"
-  version = "~> 2.0"
+  version = "~> 6.0"
 
   function_name = local.name
   description   = "Configuration semantic validation lambda"

examples/appconfig_hosted/versions.tf → examples/ssm-parameter/versions.tf

@@ -1,10 +1,10 @@
 terraform {
-  required_version = ">= 0.13.1"
+  required_version = ">= 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 3.55"
+      version = ">= 5.0"
     }
     archive = {
       source  = "hashicorp/archive"