updated README.md files, local.tf, main.tf, output.tf, variable.tf, and post deploy test file

Airhis · Airhis · commit aa98560d22e4 · 2024-09-16T20:18:12.000-07:00
diff --git a/README.md b/README.md
@@ -146,25 +146,13 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [aws_cloudwatch_event_rule.pipeline_event](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_rule) | resource |
-| [aws_cloudwatch_event_target.code_pipeline](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_target) | resource |
 | [aws_codepipeline.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/codepipeline) | resource |
-| [aws_iam_policy.pipeline_event_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_role.codepipeline_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
-| [aws_iam_role.pipeline_event_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource |
 | [aws_iam_role_policy.codepipeline_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) | resource |
-| [aws_iam_role_policy_attachment.pipeline_event_role_attach_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |
-| [aws_s3_bucket.codepipeline_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
-| [aws_s3_bucket.source](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
-| [aws_s3_bucket_logging.codepipeline_bucket_logging](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_logging) | resource |
-| [aws_s3_bucket_logging.source_bucket_logging](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_logging) | resource |
-| [aws_s3_bucket_server_side_encryption_configuration.sse](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_server_side_encryption_configuration) | resource |
-| [aws_s3_bucket_versioning.versioning](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_versioning) | resource |
 | [random_string.random](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
 | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_iam_policy_document.assume_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 | [aws_iam_policy_document.codepipeline_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
-| [aws_iam_policy_document.event_bridge_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 | [aws_iam_policy_document.pipeline_event_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
 
 ## Inputs
@@ -174,11 +162,7 @@ No modules.
 | <a name="input_name"></a> [name](#input\_name) | The name of the pipeline | `string` | n/a | yes |
 | <a name="input_artifact_stores"></a> [artifact\_stores](#input\_artifact\_stores) | One or more artifact\_store blocks. | `list(map(string))` | <pre>[<br>  {<br>    "use_kms": false<br>  }<br>]</pre> | no |
 | <a name="input_stages"></a> [stages](#input\_stages) | One or more stage blocks. | `any` | n/a | yes |
-| <a name="input_create_s3_source"></a> [create\_s3\_source](#input\_create\_s3\_source) | Create S3 source bucket for CodePipeline. | `string` | `false` | no |
-| <a name="input_source_s3_bucket"></a> [source\_s3\_bucket](#input\_source\_s3\_bucket) | Name of the S3 source bucket. | `string` | `null` | no |
-| <a name="input_s3_trigger_file"></a> [s3\_trigger\_file](#input\_s3\_trigger\_file) | S3 file that the event rule is looking for to trigger the pipeline. | `string` | `"trigger_pipeline.zip"` | no |
-| <a name="input_log_target_bucket"></a> [log\_target\_bucket](#input\_log\_target\_bucket) | Target bucket for S3 Access Logs. If left blank, access logging is disabled. | `string` | `""` | no |
-| <a name="input_log_target_prefix"></a> [log\_target\_prefix](#input\_log\_target\_prefix) | Prefix for S3 Access logs. Defaults to AWSLogs/<AWS Account ID>/s3audit if not otherwise provided. | `string` | `""` | no |
+| <a name="input_source_s3_bucket"></a> [artifact\_bucket\_name](#input\_source\_s3\_bucket) | Name of the S3 source bucket. | `string` | `null` | no |
 | <a name="input_codepipeline_iam"></a> [codepipeline\_iam](#input\_codepipeline\_iam) | Additional IAM actions to add to CodePipeline IAM role. | `map(list(string))` | `null` | no |
 | <a name="input_pipeline_type"></a> [pipeline\_type](#input\_pipeline\_type) | The CodePipeline pipeline\_type. Valid options are V1, V2 | `string` | `"V1"` | no |
 | <a name="input_execution_mode"></a> [execution\_mode](#input\_execution\_mode) | The CodePipeline execution\_mode. Valid options are `PARALLEL`, `QUEUED`, `SUPERSEDED` (default) | `string` | `"SUPERSEDED"` | no |
@@ -190,5 +174,4 @@ No modules.
 |------|-------------|
 | <a name="output_id"></a> [id](#output\_id) | The codepipeline ID |
 | <a name="output_arn"></a> [arn](#output\_arn) | The codepipeline ARN |
-| <a name="output_source_s3_bucket_arn"></a> [source\_s3\_bucket\_arn](#output\_source\_s3\_bucket\_arn) | The codepipeline source s3 bucket ARN |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/complete/locals.tf b/examples/complete/locals.tf
@@ -10,6 +10,3 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-# locals {
-#   source_bucket_name = "${var.source_s3_bucket_prefix}-${random_string.random.result}"
-# }
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -20,9 +20,7 @@ module "codepipeline" {
   source = "../.."
 
   name = var.name
-
-  #create_s3_source = var.create_s3_source
-  #source_s3_bucket = var.a
+  
   artifact_bucket_name = var.artifact_bucket_name
   stages               = var.stages
   pipeline_type        = var.pipeline_type
diff --git a/examples/complete/outputs.tf b/examples/complete/outputs.tf
@@ -20,7 +20,3 @@ output "arn" {
   value       = module.codepipeline.arn
 }
 
-# output "source_s3_bucket_arn" {
-#   description = "The codepipeline source s3 bucket ARN"
-#   value       = module.codepipeline.source_s3_bucket_arn
-# }
diff --git a/examples/complete/variables.tf b/examples/complete/variables.tf
@@ -15,18 +15,6 @@ variable "name" {
   type        = string
 }
 
-# variable "create_s3_source" {
-#   description = "Create S3 source bucket for CodePipeline."
-#   type        = string
-#   default     = false
-# }
-
-# variable "source_s3_bucket_prefix" {
-#   description = "Prefix of the S3 source bucket. Random characters will be added to the end to ensure uniqueness."
-#   type        = string
-#   default     = null
-# }
-
 variable "stages" {
   description = "One or more stage blocks."
   type        = any
diff --git a/locals.tf b/locals.tf
@@ -15,8 +15,7 @@ locals {
     provisioner = "Terraform"
   }
   account_id = data.aws_caller_identity.current.account_id
-  #bucket_prefix = length(var.log_target_prefix) == 0 ? "AWSLogs/${local.account_id}/s3audit" : var.log_target_prefix
-
+  
   tags = merge(local.default_tags, var.tags)
 }
 
diff --git a/tests/post_deploy_functional/module_codepipeline_test.go b/tests/post_deploy_functional/module_codepipeline_test.go
@@ -44,8 +44,6 @@ type Stage struct {
 
 type TestTfvars struct {
 	Name           string  `json:"name"`
-	CreateS3Source bool    `json:"create_s3_source"`
-	SourceS3Bucket string  `json:"source_s3_bucket"`
 	Stages         []Stage `json:"stages"`
 }
 
diff --git a/variables.tf b/variables.tf
@@ -29,11 +29,6 @@ variable "stages" {
   description = "One or more stage blocks."
   type        = any
 }
-# variable "codepipeline_iam" {
-#   description = "Additional IAM actions to add to CodePipeline IAM role."
-#   type        = map(list(string))
-#   default     = null
-# }
 
 variable "pipeline_type" {
   description = "The CodePipeline pipeline_type. Valid options are V1, V2"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,3 @@ output "arn" {`
`20`	`20`	`value = module.codepipeline.arn`
`21`	`21`	`}`
`22`	`22`
`23`		`-# output "source_s3_bucket_arn" {`
`24`		`-# description = "The codepipeline source s3 bucket ARN"`
`25`		`-# value = module.codepipeline.source_s3_bucket_arn`
`26`		`-# }`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@ locals {`
`15`	`15`	`provisioner = "Terraform"`
`16`	`16`	`}`
`17`	`17`	`account_id = data.aws_caller_identity.current.account_id`
`18`		`- #bucket_prefix = length(var.log_target_prefix) == 0 ? "AWSLogs/${local.account_id}/s3audit" : var.log_target_prefix`
`19`		`-`
	`18`	`+`
`20`	`19`	`tags = merge(local.default_tags, var.tags)`
`21`	`20`	`}`
`22`	`21`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ type Stage struct {`
`44`	`44`
`45`	`45`	`type TestTfvars struct {`
`46`	`46`	Name string `json:"name"`
`47`		- CreateS3Source bool `json:"create_s3_source"`
`48`		- SourceS3Bucket string `json:"source_s3_bucket"`
`49`	`47`	Stages []Stage `json:"stages"`
`50`	`48`	`}`
`51`	`49`