chore: moar testing

.github/workflows/release.yml

@@ -7,7 +7,11 @@ on:
       - main
       - master
     paths:
+<<<<<<< HEAD
       - '**/*.tpl'
+=======
+      - '**/*.py'
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
       - '**/*.tf'
 
 jobs:

.pre-commit-config.yaml

@@ -1,6 +1,10 @@
 repos:
   - repo: https://github.com/antonbabenko/pre-commit-terraform
+<<<<<<< HEAD
     rev: v1.57.0
+=======
+    rev: v1.58.0
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
     hooks:
       - id: terraform_fmt
       - id: terraform_validate
@@ -17,7 +21,11 @@ repos:
           - '--args=--only=terraform_documented_variables'
           - '--args=--only=terraform_typed_variables'
           - '--args=--only=terraform_module_pinned_source'
+<<<<<<< HEAD
           - '--args=--only=terraform_naming_convention'
+=======
+          # - '--args=--only=terraform_naming_convention'
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
           - '--args=--only=terraform_required_version'
           - '--args=--only=terraform_required_providers'
           - '--args=--only=terraform_standard_module_structure'

.releaserc.json

@@ -10,7 +10,12 @@
     [
       "@semantic-release/github",
       {
+<<<<<<< HEAD
         "successComment": "This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version [${nextRelease.version}](${releaseInfos[0].url}) :tada:",
+=======
+        "successComment":
+        "This ${issue.pull_request ? 'PR is included' : 'issue has been resolved'} in version ${nextRelease.version} :tada:",
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
         "labels": false,
         "releasedLabels": false
       }

README.md

@@ -392,23 +392,43 @@ Full contributing [guidelines are covered here](https://github.com/terraform-aws
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
+<<<<<<< HEAD
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.64 |
 | <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 2.2 |
+=======
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56 |
+| <a name="requirement_cloudinit"></a> [cloudinit](#requirement\_cloudinit) | >= 2.0 |
+| <a name="requirement_http"></a> [http](#requirement\_http) | >= 2.4.1 |
+| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 1.11.1 |
+| <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.4 |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 
 ## Providers
 
 | Name | Version |
 |------|---------|
+<<<<<<< HEAD
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.64 |
 | <a name="provider_tls"></a> [tls](#provider\_tls) | >= 2.2 |
+=======
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56 |
+| <a name="provider_http"></a> [http](#provider\_http) | >= 2.4.1 |
+| <a name="provider_kubernetes"></a> [kubernetes](#provider\_kubernetes) | >= 1.11.1 |
+| <a name="provider_local"></a> [local](#provider\_local) | >= 1.4 |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
+<<<<<<< HEAD
 | <a name="module_eks_managed_node_group"></a> [eks\_managed\_node\_group](#module\_eks\_managed\_node\_group) | ./modules/eks-managed-node-group | n/a |
 | <a name="module_fargate_profile"></a> [fargate\_profile](#module\_fargate\_profile) | ./modules/fargate-profile | n/a |
 | <a name="module_self_managed_node_group"></a> [self\_managed\_node\_group](#module\_self\_managed\_node\_group) | ./modules/self-managed-node-group | n/a |
+=======
+| <a name="module_fargate"></a> [fargate](#module\_fargate) | ./modules/fargate | n/a |
+| <a name="module_node_groups"></a> [node\_groups](#module\_node\_groups) | ./modules/node_groups | n/a |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 
 ## Resources
 

examples/bottlerocket/README.md

@@ -24,17 +24,31 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
+<<<<<<< HEAD
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.64 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 |
 | <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 2.2 |
+=======
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56 |
+| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 1.11.1 |
+| <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.4 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.1 |
+| <a name="requirement_tls"></a> [tls](#requirement\_tls) | >= 2.0 |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 
 ## Providers
 
 | Name | Version |
 |------|---------|
+<<<<<<< HEAD
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.64 |
 | <a name="provider_random"></a> [random](#provider\_random) | >= 2.0 |
 | <a name="provider_tls"></a> [tls](#provider\_tls) | >= 2.2 |
+=======
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56 |
+| <a name="provider_random"></a> [random](#provider\_random) | >= 2.1 |
+| <a name="provider_tls"></a> [tls](#provider\_tls) | >= 2.0 |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 
 ## Modules
 

examples/bottlerocket/versions.tf

@@ -4,6 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
+<<<<<<< HEAD
       version = ">= 3.64"
     }
     random = {
@@ -13,6 +14,25 @@ terraform {
     tls = {
       source  = "hashicorp/tls"
       version = ">= 2.2"
+=======
+      version = ">= 3.56"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = ">= 1.4"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = ">= 1.11.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 2.1"
+    }
+    tls = {
+      source  = "hashicorp/tls"
+      version = ">= 2.0"
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
     }
   }
 }

examples/complete/README.md

@@ -24,23 +24,40 @@ Note that this example may create resources which cost money. Run `terraform des
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
+<<<<<<< HEAD
 | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.64 |
 | <a name="requirement_http"></a> [http](#requirement\_http) | >= 2.4.1 |
+=======
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.56 |
+| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 1.11.1 |
+| <a name="requirement_local"></a> [local](#requirement\_local) | >= 1.4 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.1 |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 
 ## Providers
 
 | Name | Version |
 |------|---------|
+<<<<<<< HEAD
 | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.64 |
+=======
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.56 |
+| <a name="provider_random"></a> [random](#provider\_random) | >= 2.1 |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_disabled_eks"></a> [disabled\_eks](#module\_disabled\_eks) | ../.. | n/a |
+<<<<<<< HEAD
 | <a name="module_disabled_eks_managed_node_group"></a> [disabled\_eks\_managed\_node\_group](#module\_disabled\_eks\_managed\_node\_group) | ../../modules/eks-managed-node-group | n/a |
 | <a name="module_disabled_fargate_profile"></a> [disabled\_fargate\_profile](#module\_disabled\_fargate\_profile) | ../../modules/fargate-profile | n/a |
 | <a name="module_disabled_self_managed_node_group"></a> [disabled\_self\_managed\_node\_group](#module\_disabled\_self\_managed\_node\_group) | ../../modules/self-managed-node-group | n/a |
+=======
+| <a name="module_disabled_fargate"></a> [disabled\_fargate](#module\_disabled\_fargate) | ../../modules/fargate | n/a |
+| <a name="module_disabled_node_groups"></a> [disabled\_node\_groups](#module\_disabled\_node\_groups) | ../../modules/node_groups | n/a |
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
 | <a name="module_eks"></a> [eks](#module\_eks) | ../.. | n/a |
 | <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.0 |
 

examples/complete/main.tf

@@ -230,9 +230,9 @@ module "vpc" {
   single_nat_gateway   = true
   enable_dns_hostnames = true
 
-  # enable_flow_log                      = true
-  # create_flow_log_cloudwatch_iam_role  = true
-  # create_flow_log_cloudwatch_log_group = true
+  enable_flow_log                      = true
+  create_flow_log_cloudwatch_iam_role  = true
+  create_flow_log_cloudwatch_log_group = true
 
   public_subnet_tags = {
     "kubernetes.io/cluster/${local.name}" = "shared"

examples/complete/versions.tf

@@ -4,11 +4,27 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
+<<<<<<< HEAD
       version = ">= 3.64"
     }
     http = {
       source  = "terraform-aws-modules/http"
       version = ">= 2.4.1"
+=======
+      version = ">= 3.56"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = ">= 1.4"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = ">= 1.11.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 2.1"
+>>>>>>> b876ff9 (fix: update CI/CD process to enable auto-release workflow (#1698))
     }
   }
 }