Update to context.tf. Correctly pin Terraform providers. Add GitHub…

… Actions (#9) * Update to `context.tf`. Correctly pin providers. Add GitHub Actions * Update to `context.tf`. Correctly pin providers. Add GitHub Actions * Update to `context.tf`. Correctly pin providers. Add GitHub Actions * Update to `context.tf`. Correctly pin providers. Add GitHub Actions
cloudposse · Oct 22, 2020 · f3089ac · f3089ac
1 parent 9b57e5b
commit f3089ac
Show file tree

Hide file tree

Showing 19 changed files with 876 additions and 348 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -12,3 +12,6 @@
 
 # Cloud Posse must review any changes to GitHub actions
 .github/*     @cloudposse/engineering
+
+# Cloud Posse must review any changes to standard context definition
+**/context.tf   @cloudposse/engineering
diff --git a/.github/auto-release.yml b/.github/auto-release.yml
@@ -0,0 +1,40 @@
+name-template: 'v$RESOLVED_VERSION'
+tag-template: '$RESOLVED_VERSION'
+version-template: '$MAJOR.$MINOR.$PATCH'
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+      - 'enhancement'
+  patch:
+    labels:
+      - 'patch'
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+      - 'hotfix'
+  default: 'minor'
+
+categories:
+  - title: '🚀 Enhancements'
+    labels:
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+      - 'hotfix'
+
+change-template: |
+  <details>
+    <summary>$TITLE @$AUTHOR (#$NUMBER)</summary>
+
+    $BODY
+  </details>
+
+template: |
+  $CHANGES
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
@@ -0,0 +1,19 @@
+name: auto-release
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  semver:
+    runs-on: ubuntu-latest
+    steps:
+    # Drafts your next Release notes as Pull Requests are merged into "master"
+    - uses: release-drafter/release-drafter@v5
+      with:
+        publish: true
+        prerelease: false
+        config-name: auto-release.yml
+      env:
+        GITHUB_TOKEN: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
diff --git a/.github/workflows/chatops.yml b/.github/workflows/chatops.yml
@@ -15,7 +15,7 @@ jobs:
           reaction-token: ${{ secrets.GITHUB_TOKEN }}
           repository: cloudposse/actions
           commands: rebuild-readme, terraform-fmt
-          permission: none
+          permission: triage
           issue-type: pull-request
 
   test:
@@ -30,6 +30,8 @@ jobs:
           reaction-token: ${{ secrets.GITHUB_TOKEN }}
           repository: cloudposse/actions
           commands: test
-          permission: none
+          permission: triage
           issue-type: pull-request
           reactions: false
+
+
diff --git a/README.md b/README.md
@@ -74,99 +74,92 @@ Instead pin to the release tag (e.g. `?ref=tags/x.y.z`) of one of our [latest re
 
 For a complete example, see [examples/complete](examples/complete).
 
-For automated tests of the complete example using [bats](https://github.com/bats-core/bats-core) and [Terratest](https://github.com/gruntwork-io/terratest) (which tests and deploys the example on AWS), see [test](test).
+For automated tests of the complete example using [bats](https://github.com/bats-core/bats-core) and [Terratest](https://github.com/gruntwork-io/terratest)
+(which tests and deploys the example on AWS), see [test](test).
 
 ```hcl
-    provider "aws" {
-      region = var.region
-    }
+  module "label" {
+    source = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.19.2"
 
-    module "label" {
-      source     = "git::https://github.com/cloudposse/terraform-null-label.git?ref=tags/0.16.0"
-      namespace  = var.namespace
-      name       = var.name
-      stage      = var.stage
-      delimiter  = var.delimiter
-      attributes = compact(concat(var.attributes, list("cluster")))
-      tags       = var.tags
-    }
+    attributes = compact(concat(module.this.attributes, ["cluster"]))
 
-    locals {
-      tags = merge(module.label.tags, map("kubernetes.io/cluster/${module.label.id}", "shared"))
-    }
+    context = module.this.context
+  }
 
-    module "vpc" {
-      source     = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.8.1"
-      namespace  = var.namespace
-      stage      = var.stage
-      name       = var.name
-      attributes = var.attributes
-      cidr_block = var.vpc_cidr_block
-      tags       = local.tags
-    }
+  locals {
+    tags = merge(module.label.tags, map("kubernetes.io/cluster/${module.label.id}", "shared"))
+  }
 
-    module "subnets" {
-      source               = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.18.1"
-      availability_zones   = var.availability_zones
-      namespace            = var.namespace
-      stage                = var.stage
-      name                 = var.name
-      attributes           = var.attributes
-      vpc_id               = module.vpc.vpc_id
-      igw_id               = module.vpc.igw_id
-      cidr_block           = module.vpc.vpc_cidr_block
-      nat_gateway_enabled  = true
-      nat_instance_enabled = false
-      tags                 = local.tags
-    }
+  module "vpc" {
+    source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.17.0"
 
-    module "eks_cluster" {
-      source                = "git::https://github.com/cloudposse/terraform-aws-eks-cluster.git?ref=tags/0.13.0"
-      namespace             = var.namespace
-      stage                 = var.stage
-      name                  = var.name
-      attributes            = var.attributes
-      tags                  = var.tags
-      region                = var.region
-      vpc_id                = module.vpc.vpc_id
-      subnet_ids            = module.subnets.public_subnet_ids
-      kubernetes_version    = var.kubernetes_version
-      kubeconfig_path       = var.kubeconfig_path
-      oidc_provider_enabled = var.oidc_provider_enabled
-
-      workers_role_arns          = [module.eks_node_group.eks_node_group_role_arn, module.eks_fargate_profile.eks_fargate_profile_role_arn]
-      workers_security_group_ids = []
-    }
+    cidr_block = var.vpc_cidr_block
+    tags       = local.tags
 
-    module "eks_node_group" {
-      source             = "git::https://github.com/cloudposse/terraform-aws-eks-node-group.git?ref=tags/0.1.0"
-      namespace          = var.namespace
-      stage              = var.stage
-      name               = var.name
-      attributes         = var.attributes
-      tags               = var.tags
-      subnet_ids         = module.subnets.public_subnet_ids
-      instance_types     = var.instance_types
-      desired_size       = var.desired_size
-      min_size           = var.min_size
-      max_size           = var.max_size
-      cluster_name       = module.eks_cluster.eks_cluster_id
-      kubernetes_version = var.kubernetes_version
-      kubernetes_labels  = var.kubernetes_labels
-    }
+    context = module.this.context
+  }
+
+  module "subnets" {
+    source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.30.0"
+
+    availability_zones   = var.availability_zones
+    vpc_id               = module.vpc.vpc_id
+    igw_id               = module.vpc.igw_id
+    cidr_block           = module.vpc.vpc_cidr_block
+    nat_gateway_enabled  = true
+    nat_instance_enabled = false
+    tags                 = local.tags
+
+    context = module.this.context
+  }
+
+  module "eks_cluster" {
+    source = "git::https://github.com/cloudposse/terraform-aws-eks-cluster.git?ref=tags/0.29.0"
+
+    region                     = var.region
+    vpc_id                     = module.vpc.vpc_id
+    subnet_ids                 = module.subnets.public_subnet_ids
+    kubernetes_version         = var.kubernetes_version
+    oidc_provider_enabled      = var.oidc_provider_enabled
+    workers_role_arns          = []
+    workers_security_group_ids = []
+
+    context = module.this.context
+  }
 
-    module "eks_fargate_profile" {
-      source               = "git::https://github.com/cloudposse/terraform-aws-eks-fargate-profile.git?ref=master"
-      namespace            = var.namespace
-      stage                = var.stage
-      name                 = var.name
-      attributes           = var.attributes
-      tags                 = var.tags
-      subnet_ids           = module.subnets.private_subnet_ids
-      cluster_name         = module.eks_cluster.eks_cluster_id
-      kubernetes_namespace = var.kubernetes_namespace
-      kubernetes_labels    = var.kubernetes_labels
+  data "null_data_source" "wait_for_cluster_and_kubernetes_configmap" {
+    inputs = {
+      cluster_name             = module.eks_cluster.eks_cluster_id
+      kubernetes_config_map_id = module.eks_cluster.kubernetes_config_map_id
     }
+  }
+
+  module "eks_node_group" {
+    source = "git::https://github.com/cloudposse/terraform-aws-eks-node-group.git?ref=tags/0.8.0"
+
+    subnet_ids         = module.subnets.public_subnet_ids
+    instance_types     = var.instance_types
+    desired_size       = var.desired_size
+    min_size           = var.min_size
+    max_size           = var.max_size
+    cluster_name       = data.null_data_source.wait_for_cluster_and_kubernetes_configmap.outputs["cluster_name"]
+    kubernetes_version = var.kubernetes_version
+    kubernetes_labels  = var.kubernetes_labels
+
+    context = module.this.context
+  }
+
+  module "eks_fargate_profile" {
+    source = "git::https://github.com/cloudposse/terraform-aws-eks-fargate-profile.git?ref=master"
+
+    subnet_ids                              = module.subnets.private_subnet_ids
+    cluster_name                            = data.null_data_source.wait_for_cluster_and_kubernetes_configmap.outputs["cluster_name"]
+    kubernetes_namespace                    = var.kubernetes_namespace
+    kubernetes_labels                       = var.kubernetes_labels
+    iam_role_kubernetes_namespace_delimiter = "@"
+
+    context = module.this.context
+  }
 ```
 
 
@@ -191,33 +184,40 @@ Available targets:
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.0, < 0.14.0 |
-| aws | ~> 2.0 |
-| local | ~> 1.3 |
-| template | ~> 2.0 |
+| terraform | >= 0.12.0 |
+| aws | >= 2.0 |
+| local | >= 1.3 |
+| null | >= 2.0 |
+| template | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | ~> 2.0 |
+| aws | >= 2.0 |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
+| additional\_tag\_map | Additional tags for appending to tags\_as\_list\_of\_maps. Not added to `tags`. | `map(string)` | `{}` | no |
 | attributes | Additional attributes (e.g. `1`) | `list(string)` | `[]` | no |
 | cluster\_name | The name of the EKS cluster | `string` | n/a | yes |
-| delimiter | Delimiter to be used between `namespace`, `stage`, `name` and `attributes` | `string` | `"-"` | no |
-| enabled | Whether to create the resources. Set to `false` to prevent the module from creating any resources | `bool` | `true` | no |
-| environment | Environment, e.g. 'prod', 'staging', 'dev', 'pre-prod', 'UAT' | `string` | `""` | no |
+| context | Single object for setting entire context at once.<br>See description of individual variables for details.<br>Leave string and numeric variables as `null` to use default value.<br>Individual variable settings (non-null) override settings in context object,<br>except for attributes, tags, and additional\_tag\_map, which are merged. | <pre>object({<br>    enabled             = bool<br>    namespace           = string<br>    environment         = string<br>    stage               = string<br>    name                = string<br>    delimiter           = string<br>    attributes          = list(string)<br>    tags                = map(string)<br>    additional_tag_map  = map(string)<br>    regex_replace_chars = string<br>    label_order         = list(string)<br>    id_length_limit     = number<br>  })</pre> | <pre>{<br>  "additional_tag_map": {},<br>  "attributes": [],<br>  "delimiter": null,<br>  "enabled": true,<br>  "environment": null,<br>  "id_length_limit": null,<br>  "label_order": [],<br>  "name": null,<br>  "namespace": null,<br>  "regex_replace_chars": null,<br>  "stage": null,<br>  "tags": {}<br>}</pre> | no |
+| delimiter | Delimiter to be used between `namespace`, `environment`, `stage`, `name` and `attributes`.<br>Defaults to `-` (hyphen). Set to `""` to use no delimiter at all. | `string` | `null` | no |
+| enabled | Set to false to prevent the module from creating any resources | `bool` | `null` | no |
+| environment | Environment, e.g. 'uw2', 'us-west-2', OR 'prod', 'staging', 'dev', 'UAT' | `string` | `null` | no |
+| iam\_role\_kubernetes\_namespace\_delimiter | Delimiter for the Kubernetes namespace in the IAM Role name | `string` | `"-"` | no |
+| id\_length\_limit | Limit `id` to this many characters.<br>Set to `0` for unlimited length.<br>Set to `null` for default, which is `0`.<br>Does not affect `id_full`. | `number` | `null` | no |
 | kubernetes\_labels | Key-value mapping of Kubernetes labels for selection | `map(string)` | `{}` | no |
 | kubernetes\_namespace | Kubernetes namespace for selection | `string` | n/a | yes |
-| name | Solution name, e.g. 'app' or 'cluster' | `string` | n/a | yes |
-| namespace | Namespace, which could be your organization name, e.g. 'eg' or 'cp' | `string` | `""` | no |
-| stage | Stage, e.g. 'prod', 'staging', 'dev', or 'test' | `string` | `""` | no |
+| label\_order | The naming order of the id output and Name tag.<br>Defaults to ["namespace", "environment", "stage", "name", "attributes"].<br>You can omit any of the 5 elements, but at least one must be present. | `list(string)` | `null` | no |
+| name | Solution name, e.g. 'app' or 'jenkins' | `string` | `null` | no |
+| namespace | Namespace, which could be your organization name or abbreviation, e.g. 'eg' or 'cp' | `string` | `null` | no |
+| regex\_replace\_chars | Regex to replace chars with empty string in `namespace`, `environment`, `stage` and `name`.<br>If not set, `"/[^a-zA-Z0-9-]/"` is used to remove all characters other than hyphens, letters and digits. | `string` | `null` | no |
+| stage | Stage, e.g. 'prod', 'staging', 'dev', OR 'source', 'build', 'test', 'deploy', 'release' | `string` | `null` | no |
 | subnet\_ids | Identifiers of private EC2 Subnets to associate with the EKS Fargate Profile. These subnets must have the following resource tag: kubernetes.io/cluster/CLUSTER\_NAME (where CLUSTER\_NAME is replaced with the name of the EKS Cluster) | `list(string)` | n/a | yes |
-| tags | Additional tags (e.g. `{ BusinessUnit = "XYZ" }` | `map(string)` | `{}` | no |
+| tags | Additional tags (e.g. `map('BusinessUnit','XYZ')` | `map(string)` | `{}` | no |
 
 ## Outputs