From d7977c6f2cb5ea5ca77c1ebcb0cd214461bccfd9 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 3 Nov 2023 09:15:06 -0400 Subject: [PATCH 01/13] Use the new and improved hardening role created by @bra1ncramp --- src/requirements.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/requirements.yml b/src/requirements.yml index 7d8c985..a9a04c6 100644 --- a/src/requirements.yml +++ b/src/requirements.yml @@ -23,7 +23,8 @@ roles: - name: freeipa_client src: https://github.com/cisagov/ansible-role-freeipa-client - name: harden - src: https://github.com/cisagov/ansible-role-hardening + src: https://github.com/cisagov/ansible-role-hardening-2 + version: cisagov-changes - name: htop src: https://github.com/cisagov/ansible-role-htop - name: nvme From 32c073fe10639035086a445c919db68641aa5c3f Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 3 Nov 2023 11:01:11 -0400 Subject: [PATCH 02/13] Bump version from 0.3.7 to 0.3.8 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 8879c6c..4ad67eb 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.7" +__version__ = "0.3.8" From bbb4d495d01ffac97261aaad54456ea7f6a4a2b0 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 3 Nov 2023 11:01:27 -0400 Subject: [PATCH 03/13] Bump version from 0.3.8 to 0.3.8-rc.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 4ad67eb..2c93c27 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8" +__version__ = "0.3.8-rc.1" From 95996b5808dc57fdad77fda68c88bb1ba841d653 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 6 Nov 2023 11:17:52 -0500 Subject: [PATCH 04/13] Bump version from 0.3.8-rc.1 to 0.3.8-rc.2 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 2c93c27..5c33352 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8-rc.1" +__version__ = "0.3.8-rc.2" From 6e3904b96cab1d1e5d67fb2e2636bad949de1e40 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 29 Nov 2023 16:51:35 -0500 Subject: [PATCH 05/13] Bump version from 0.3.8-rc.2 to 0.3.8-rc.3 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 5c33352..0208319 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8-rc.2" +__version__ = "0.3.8-rc.3" From 6d27bf81df5d720f7cb60d0dd8a2cb5db3d8b258 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 8 Dec 2023 11:38:52 -0500 Subject: [PATCH 06/13] Revert to using the default branch of cisagov/ansible-role-hardening-2 We can do this because cisagov/ansible-role-hardening-2#1 has been merged. --- src/requirements.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/requirements.yml b/src/requirements.yml index a9a04c6..05fdc68 100644 --- a/src/requirements.yml +++ b/src/requirements.yml @@ -24,7 +24,6 @@ roles: src: https://github.com/cisagov/ansible-role-freeipa-client - name: harden src: https://github.com/cisagov/ansible-role-hardening-2 - version: cisagov-changes - name: htop src: https://github.com/cisagov/ansible-role-htop - name: nvme From 1a4f90e5f13ddab20c4d9bd3592354c234669a9c Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Fri, 8 Dec 2023 11:40:27 -0500 Subject: [PATCH 07/13] Finalize version from 0.3.8-rc.3 to 0.3.8 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 0208319..4ad67eb 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8-rc.3" +__version__ = "0.3.8" From d4f771a5b3e399a732f3c054a2f8f6fe16c91608 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 5 Dec 2023 09:46:50 -0500 Subject: [PATCH 08/13] Bump the AWS Terraform provider version to 4.9 This agrees with the changes in cisagov/skeleton-tf-module#188. --- terraform-build-user/versions.tf | 14 ++++++++++---- terraform-post-packer/versions.tf | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/terraform-build-user/versions.tf b/terraform-build-user/versions.tf index 3919fa5..80277d5 100644 --- a/terraform-build-user/versions.tf +++ b/terraform-build-user/versions.tf @@ -6,12 +6,18 @@ terraform { # major version currently being used. This practice will help us # avoid unwelcome surprises. required_providers { - # Version 3.38.0 of the Terraform AWS provider is the first - # version to support default tags. - # https://www.hashicorp.com/blog/default-tags-in-the-terraform-aws-provider + # Version 4.9 of the Terraform AWS provider made changes to the S3 bucket + # refactor that is in place for versions 4.0-4.8 of the provider. With v4.9 + # only non-breaking changes and deprecation notices are introduced. Using + # this version will simplify migration to the new, broken out AWS S3 bucket + # configuration resources. Please see + # https://github.com/hashicorp/terraform-provider-aws/pull/23985 + # for more information about the changes in v4.9 and + # https://www.hashicorp.com/blog/terraform-aws-provider-4-0-refactors-s3-bucket-resource + # for more information about the S3 bucket refactor. aws = { source = "hashicorp/aws" - version = "~> 3.38" + version = "~> 4.9" } } } diff --git a/terraform-post-packer/versions.tf b/terraform-post-packer/versions.tf index 3919fa5..80277d5 100644 --- a/terraform-post-packer/versions.tf +++ b/terraform-post-packer/versions.tf @@ -6,12 +6,18 @@ terraform { # major version currently being used. This practice will help us # avoid unwelcome surprises. required_providers { - # Version 3.38.0 of the Terraform AWS provider is the first - # version to support default tags. - # https://www.hashicorp.com/blog/default-tags-in-the-terraform-aws-provider + # Version 4.9 of the Terraform AWS provider made changes to the S3 bucket + # refactor that is in place for versions 4.0-4.8 of the provider. With v4.9 + # only non-breaking changes and deprecation notices are introduced. Using + # this version will simplify migration to the new, broken out AWS S3 bucket + # configuration resources. Please see + # https://github.com/hashicorp/terraform-provider-aws/pull/23985 + # for more information about the changes in v4.9 and + # https://www.hashicorp.com/blog/terraform-aws-provider-4-0-refactors-s3-bucket-resource + # for more information about the S3 bucket refactor. aws = { source = "hashicorp/aws" - version = "~> 3.38" + version = "~> 4.9" } } } From 479be44d471d06433309254a63977c899752337e Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 20 Dec 2023 12:52:00 -0500 Subject: [PATCH 09/13] Bump version from 0.3.8 to 0.3.8-rc.1 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 4ad67eb..2c93c27 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8" +__version__ = "0.3.8-rc.1" From 2b702960b6633cee6670289a8fdece3227345231 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 20 Dec 2023 12:52:13 -0500 Subject: [PATCH 10/13] Bump version from 0.3.8-rc.1 to 0.3.8-rc.2 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 2c93c27..5c33352 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8-rc.1" +__version__ = "0.3.8-rc.2" From 6b9ee1c17dde9a52693cb8a04245e05eeb76851e Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 20 Dec 2023 12:52:22 -0500 Subject: [PATCH 11/13] Bump version from 0.3.8-rc.2 to 0.3.8-rc.3 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 5c33352..0208319 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8-rc.2" +__version__ = "0.3.8-rc.3" From 04bbe1f071088aae8434322063fa4e69c615fe40 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 20 Dec 2023 12:52:30 -0500 Subject: [PATCH 12/13] Bump version from 0.3.8-rc.3 to 0.3.8-rc.4 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index 0208319..ea71c16 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8-rc.3" +__version__ = "0.3.8-rc.4" From 5c832bd55c3189d13b4f261c26357b6efab4322e Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Thu, 21 Dec 2023 17:32:43 -0500 Subject: [PATCH 13/13] Finalize version from 0.3.8-rc.4 to 0.3.8 --- src/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.txt b/src/version.txt index ea71c16..4ad67eb 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "0.3.8-rc.4" +__version__ = "0.3.8"