Skip to content

Commit 2826b53

Browse files
author
Sean Sundberg
authored
Removes unnecessary 'enabled' flag (#54)
Signed-off-by: Sean Sundberg <[email protected]>
1 parent 2be02f3 commit 2826b53

File tree

5 files changed

+0
-27
lines changed

5 files changed

+0
-27
lines changed

.github/scripts/validate-deploy.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ SCRIPT_DIR=$(cd $(dirname "$0"); pwd -P)
55
echo "terraform.tfvars"
66
cat terraform.tfvars
77

8-
ENABLED=$(cat .enabled)
9-
10-
if [[ "${ENABLED}" == "false" ]]; then
11-
echo "The VPC is not enabled. Listing terraform state."
12-
13-
terraform state list
14-
exit 0
15-
fi
16-
178
PREFIX_NAME=$(cat terraform.tfvars | grep name_prefix | sed "s/name_prefix=//g" | sed 's/"//g' | sed "s/_/-/g")
189
REGION=$(cat terraform.tfvars | grep -E "^region" | sed "s/region=//g" | sed 's/"//g')
1910
RESOURCE_GROUP_NAME=$(cat terraform.tfvars | grep resource_group_name | sed "s/resource_group_name=//g" | sed 's/"//g')

.github/workflows/verify.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ jobs:
2020
platform:
2121
- vpc_count
2222
- vpc_count_cidr
23-
enabled:
24-
- true
25-
- false
2623
max-parallel: 1
2724
fail-fast: true
2825

@@ -41,7 +38,6 @@ jobs:
4138
validateDeployScript: .github/scripts/validate-deploy.sh
4239
env:
4340
TF_VAR_ibmcloud_api_key: ${{ secrets.IBMCLOUD_API_KEY }}
44-
TF_VAR_enabled: ${{ matrix.enabled }}
4541
IBMCLOUD_API_KEY: ${{ secrets.IBMCLOUD_API_KEY }}
4642

4743
- name: Verify destroy on ${{ matrix.platform }}
@@ -51,7 +47,6 @@ jobs:
5147
clusterId: ${{ matrix.platform }}
5248
env:
5349
TF_VAR_ibmcloud_api_key: ${{ secrets.IBMCLOUD_API_KEY }}
54-
TF_VAR_enabled: ${{ matrix.enabled }}
5550
IBMCLOUD_API_KEY: ${{ secrets.IBMCLOUD_API_KEY }}
5651

5752
verifyMetadata:

test/stages/stage1-resource-group.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ module "resource_group" {
33

44
resource_group_name = var.resource_group_name
55
provision = false
6-
enabled = var.enabled
76
}

test/stages/stage2-vpc.tf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,4 @@ module "dev_vpc" {
66
name_prefix = var.name_prefix
77
address_prefix_count = var.address_prefix_count
88
address_prefixes = jsondecode(var.address_prefixes)
9-
enabled = var.enabled
10-
}
11-
12-
resource null_resource print_enabled {
13-
provisioner "local-exec" {
14-
command = "echo -n '${var.enabled}' > .enabled"
15-
}
169
}

test/stages/variables.tf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,3 @@ variable "address_prefixes" {
5757
variable "address_prefix_count" {
5858
default = 0
5959
}
60-
61-
variable "enabled" {
62-
default = true
63-
type = bool
64-
}

0 commit comments

Comments
 (0)