Skip to content

Commit 810988a

Browse files
committed
Revert "Merge remote-tracking branch 'origin/main' into feature/CCM-13009_correct-doc-links"
This reverts commit 000a490, reversing changes made to 2362ef7.
1 parent a8d1784 commit 810988a

File tree

7 files changed

+5
-135
lines changed

7 files changed

+5
-135
lines changed

.github/actions/acceptance-tests/action.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/actions/test-types.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/stage-4-acceptance.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,6 @@ on:
3535
required: true
3636
type: string
3737

38-
permissions:
39-
id-token: write
40-
contents: read
41-
4238
jobs:
4339
# environment-set-up:
4440
# name: "Environment set up"

infrastructure/terraform/components/api/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ No requirements.
1111
|------|-------------|------|---------|:--------:|
1212
| <a name="input_aws_account_id"></a> [aws\_account\_id](#input\_aws\_account\_id) | The AWS Account ID (numeric) | `string` | n/a | yes |
1313
| <a name="input_ca_pem_filename"></a> [ca\_pem\_filename](#input\_ca\_pem\_filename) | Filename for the CA truststore file within the s3 bucket | `string` | `null` | no |
14-
| <a name="input_commit_id"></a> [commit\_id](#input\_commit\_id) | The commit to deploy. Must be in the tree for branch\_name | `string` | `"HEAD"` | no |
1514
| <a name="input_component"></a> [component](#input\_component) | The variable encapsulating the name of this component | `string` | `"supapi"` | no |
1615
| <a name="input_default_tags"></a> [default\_tags](#input\_default\_tags) | A map of default tags to apply to all taggable resources within the component | `map(string)` | `{}` | no |
1716
| <a name="input_enable_backups"></a> [enable\_backups](#input\_enable\_backups) | Enable backups | `bool` | `false` | no |
@@ -60,7 +59,6 @@ No requirements.
6059
| Name | Description |
6160
|------|-------------|
6261
| <a name="output_api_urll"></a> [api\_urll](#output\_api\_urll) | n/a |
63-
| <a name="output_deployment"></a> [deployment](#output\_deployment) | Deployment details used for post-deployment scripts |
6462
<!-- vale on -->
6563
<!-- markdownlint-enable -->
6664
<!-- END_TF_DOCS -->
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
11
output "api_urll" {
22
value = aws_api_gateway_stage.main.invoke_url
33
}
4-
5-
output "deployment" {
6-
description = "Deployment details used for post-deployment scripts"
7-
value = {
8-
aws_region = var.region
9-
aws_account_id = var.aws_account_id
10-
project = var.project
11-
environment = var.environment
12-
group = var.group
13-
component = var.component
14-
commit_id = var.commit_id
15-
}
16-
}

infrastructure/terraform/components/api/variables.tf

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -51,46 +51,16 @@ variable "default_tags" {
5151
# Variables specific to the component
5252
##
5353

54-
variable "ca_pem_filename" {
55-
type = string
56-
description = "Filename for the CA truststore file within the s3 bucket"
57-
default = null
58-
}
59-
60-
variable "commit_id" {
61-
type = string
62-
description = "The commit to deploy. Must be in the tree for branch_name"
63-
default = "HEAD"
64-
}
65-
66-
variable "enable_backups" {
67-
type = bool
68-
description = "Enable backups"
69-
default = false
70-
}
71-
72-
variable "force_destroy" {
73-
type = bool
74-
description = "Flag to force deletion of S3 buckets"
75-
default = false
76-
}
77-
78-
variable "force_lambda_code_deploy" {
79-
type = bool
80-
description = "If the lambda package in s3 has the same commit id tag as the terraform build branch, the lambda will not update automatically. Set to True if making changes to Lambda code from on the same commit for example during development"
81-
default = false
82-
}
83-
8454
variable "kms_deletion_window" {
8555
type = string
8656
description = "When a kms key is deleted, how long should it wait in the pending deletion state?"
8757
default = "30"
8858
}
8959

90-
variable "letter_table_ttl_hours" {
60+
variable "log_retention_in_days" {
9161
type = number
92-
description = "Number of hours to set as TTL on letters table"
93-
default = 24
62+
description = "The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite"
63+
default = 0
9464
}
9565

9666
variable "log_level" {
@@ -99,24 +69,12 @@ variable "log_level" {
9969
default = "INFO"
10070
}
10171

102-
variable "log_retention_in_days" {
103-
type = number
104-
description = "The retention period in days for the Cloudwatch Logs events to be retained, default of 0 is indefinite"
105-
default = 0
106-
}
107-
108-
variable "manually_configure_mtls_truststore" {
72+
variable "force_lambda_code_deploy" {
10973
type = bool
110-
description = "Manually manage the truststore used for API Gateway mTLS (e.g. for prod environment)"
74+
description = "If the lambda package in s3 has the same commit id tag as the terraform build branch, the lambda will not update automatically. Set to True if making changes to Lambda code from on the same commit for example during development"
11175
default = false
11276
}
11377

114-
variable "max_get_limit" {
115-
type = number
116-
description = "Default limit to apply to GET requests that support pagination"
117-
default = 2500
118-
}
119-
12078
variable "parent_acct_environment" {
12179
type = string
12280
description = "Name of the environment responsible for the acct resources used, affects things like DNS zone. Useful for named dev environments"

scripts/tests/component.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)