Skip to content

Commit bbb28b7

Browse files
author
AWS
committed
Release: 1.11.0
1 parent 6c0b356 commit bbb28b7

File tree

56 files changed

+140
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+140
-80
lines changed

.coveragerc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Copyright Amazon.com, Inc. or its affiliates. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
#
4+
[run]
5+
branch = True
6+
omit = tests/*
7+
8+
[report]
9+
show_missing = True
10+
precision = 1
11+
exclude_lines =
12+
# Required due to conditional mypy imports
13+
if TYPE_CHECKING:

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ override.tf.json
226226
.terraformrc
227227
terraform.rc
228228

229+
# Always ignore layer build directories
230+
sources/aft-lambda-layer/build
231+
229232
### Windows ###
230233
# Windows thumbnail cache files
231234
Thumbs.db

PYTHON_VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.11

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ As of version 1.6.0, AFT collects anonymous operational metrics to help AWS impr
6363

6464
| Name | Version |
6565
|------|---------|
66-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.15.1, < 2.0.0 |
67-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.27.0, < 5.0.0 |
66+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0, < 2.0.0 |
67+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.11.0, < 6.0.0 |
6868

6969
## Providers
7070

7171
| Name | Version |
7272
|------|---------|
73-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.27.0, < 5.0.0 |
73+
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.11.0, < 6.0.0 |
7474
| <a name="provider_local"></a> [local](#provider\_local) | n/a |
7575

7676
## Modules
@@ -93,6 +93,7 @@ As of version 1.6.0, AFT collects anonymous operational metrics to help AWS impr
9393
| Name | Type |
9494
|------|------|
9595
| [aws_partition.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/partition) | data source |
96+
| [local_file.python_version](https://registry.terraform.io/providers/hashicorp/local/latest/docs/data-sources/file) | data source |
9697
| [local_file.version](https://registry.terraform.io/providers/hashicorp/local/latest/docs/data-sources/file) | data source |
9798

9899
## Inputs
@@ -133,7 +134,7 @@ As of version 1.6.0, AFT collects anonymous operational metrics to help AWS impr
133134
| <a name="input_terraform_distribution"></a> [terraform\_distribution](#input\_terraform\_distribution) | Terraform distribution being used for AFT - valid values are oss, tfc, or tfe | `string` | `"oss"` | no |
134135
| <a name="input_terraform_org_name"></a> [terraform\_org\_name](#input\_terraform\_org\_name) | Organization name for Terraform Cloud or Enterprise | `string` | `"null"` | no |
135136
| <a name="input_terraform_token"></a> [terraform\_token](#input\_terraform\_token) | Terraform token for Cloud or Enterprise | `string` | `"null"` | no |
136-
| <a name="input_terraform_version"></a> [terraform\_version](#input\_terraform\_version) | Terraform version being used for AFT | `string` | `"0.15.5"` | no |
137+
| <a name="input_terraform_version"></a> [terraform\_version](#input\_terraform\_version) | Terraform version being used for AFT | `string` | `"1.5.7"` | no |
137138
| <a name="input_tf_backend_secondary_region"></a> [tf\_backend\_secondary\_region](#input\_tf\_backend\_secondary\_region) | AFT creates a backend for state tracking for its own state as well as OSS cases. The backend's primary region is the same as the AFT region, but this defines the secondary region to replicate to. | `string` | `""` | no |
138139
| <a name="input_vcs_provider"></a> [vcs\_provider](#input\_vcs\_provider) | Customer VCS Provider - valid inputs are codecommit, bitbucket, github, or githubenterprise | `string` | `"codecommit"` | no |
139140

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.4
1+
1.11.0

data.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,8 @@ data "local_file" "version" {
55
filename = "${path.module}/VERSION"
66
}
77

8+
data "local_file" "python_version" {
9+
filename = "${path.module}/PYTHON_VERSION"
10+
}
11+
812
data "aws_partition" "current" {}

examples/multiple-account-customizations/account-customization-dev/terraform/backend.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% if tf_distribution_type == "oss" -%}
55
terraform {
6-
required_version = ">= 0.15.1"
6+
required_version = ">= {{ tf_version }}"
77
backend "s3" {
88
region = "{{ region }}"
99
bucket = "{{ bucket }}"

examples/multiple-account-customizations/account-customization-prod/terraform/backend.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% if tf_distribution_type == "oss" -%}
55
terraform {
6-
required_version = ">= 0.15.1"
6+
required_version = ">= {{ tf_version }}"
77
backend "s3" {
88
region = "{{ region }}"
99
bucket = "{{ bucket }}"

examples/multiple-regions-customization/multiple-regions/terraform/backend.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% if tf_distribution_type == "oss" -%}
55
terraform {
6-
required_version = ">= 0.15.1"
6+
required_version = ">= {{ tf_version }}"
77
backend "s3" {
88
region = "{{ region }}"
99
bucket = "{{ bucket }}"

locals.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ locals {
1616
log_archive_access_logs_bucket_name = "aws-aft-s3-access-logs"
1717
log_archive_bucket_object_expiration_days = "365"
1818
lambda_layer_codebuild_delay = "420s"
19-
lambda_layer_python_version = "3.9"
19+
lambda_layer_python_version = chomp(trimspace(data.local_file.python_version.content))
20+
lambda_runtime_python_version = format("%s%s", "python", chomp(trimspace(data.local_file.python_version.content)))
2021
lambda_layer_name = "aft-common"
2122
create_role_lambda_function_name = "aft-account-provisioning-framework-create-aft-execution-role"
2223
tag_account_lambda_function_name = "aft-account-provisioning-framework-tag-account"

0 commit comments

Comments
 (0)