diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index eaba43fd4..58ab1b2fd 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -26,7 +26,7 @@ golangci-lint: extends: .go-cache allow_failure: false rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - echo "Checking for issues in new code" - golangci-lint run -v @@ -37,7 +37,7 @@ build lattice: variables: CI: "false" rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - cd lattice - yarn install @@ -57,7 +57,7 @@ run jest tests: variables: CI: "true" rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - echo "Testing lattice..." - cd lattice @@ -72,7 +72,7 @@ run go tests: image: golang:$GOVERSION extends: .go-cache rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - echo "Running featurebase unit tests..." - PKG_LIST=$(go list ./... | grep -v internal/clustertests | paste -s -d, -) @@ -86,7 +86,7 @@ run go tests future: image: golang:1.17.3 extends: .go-cache rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - echo "Running featurebase unit tests..." - PKG_LIST=$(go list ./... | grep -v internal/clustertests | paste -s -d, -) @@ -95,12 +95,11 @@ run go tests future: paths: - coverage.out - run go tests with output: stage: test image: golang:$GOVERSION rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - echo "Running featurebase unit tests to capture JSON output..." - go test -json > test-report.out @@ -114,7 +113,7 @@ upload to sonarcloud: variables: SONAR_TOKEN: $SONAR_TOKEN rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - sonar-scanner -Dsonar.projectKey=molecula_featurebase -Dsonar.organization=molecula -Dsonar.sources=. -Dsonar.host.url=https://sonarcloud.io -Dsonar.go.coverage.reportPaths=coverage.out -Dsonar.go.tests.reportPaths=test-report.out -Dsonar.javascript.lcov.reportPaths=lattice/coverage/lcov.info needs: @@ -126,7 +125,7 @@ build for linux amd64: stage: build image: golang:$GOVERSION rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - rm -r lattice - tar -xvf lattice.tar.gz @@ -141,7 +140,7 @@ build for linux arm64: stage: build image: golang:$GOVERSION rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - rm -r lattice - tar -xvf lattice.tar.gz @@ -156,7 +155,7 @@ build for darwin amd64: stage: build image: golang:$GOVERSION rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - rm -r lattice - tar -xvf lattice.tar.gz @@ -171,7 +170,7 @@ build for darwin arm64: stage: build image: golang:$GOVERSION rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' script: - rm -r lattice - tar -xvf lattice.tar.gz @@ -186,7 +185,7 @@ package for linux amd64: stage: build image: golang:$GOVERSION rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' variables: GOOS: "linux" GOARCH: "amd64" @@ -208,7 +207,7 @@ build container fb: tags: - shell rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' before_script: - echo "${DOCKER_DEPLOY_TOKEN}" | docker login -u ${DOCKER_DEPLOY_USER} --password-stdin ${CI_REGISTRY} script: @@ -226,8 +225,9 @@ smoke test: AWS_ACCESS_KEY_ID: $AWS_FBCI_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY: $AWS_FBCI_SECRET_ACCESS_KEY TF_VAR_cluster_prefix: "" + TF_VAR_branch: "" rules: - - if: '$CI_PIPELINE_SOURCE == "push"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' before_script: - apt-get update && apt-get install -y gnupg software-properties-common curl git - curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add - @@ -253,6 +253,8 @@ smoke test: - export PATH=$PATH:/usr/local/go/bin - TF_VAR_cluster_prefix="smoke-$(openssl rand -base64 12 | tr -d /=+ | cut -c -16)" - echo "Cluster Prefix --> $TF_VAR_cluster_prefix" + - TF_VAR_branch=$CI_COMMIT_BRANCH + - echo "Branch --> $TF_VAR_branch" script: - ./qa/scripts/setupSmokeTest.sh - ./qa/scripts/testSmokeTest.sh @@ -270,8 +272,12 @@ gauntlet: AWS_SSH_PRIVATE_KEY: $AWS_FBCI_SSH_KEY AWS_ACCESS_KEY_ID: $AWS_FBCI_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY: $AWS_FBCI_SECRET_ACCESS_KEY + TF_VAR_cluster_prefix: "" + TF_VAR_branch: "" rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && ($CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web")' +# - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' +# - if: '$CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' + - if: '$CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "schedule" || $CI_PIPELINE_SOURCE == "web"' before_script: - apt-get update && apt-get install -y gnupg software-properties-common curl git - curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add - @@ -295,8 +301,12 @@ gauntlet: - wget https://go.dev/dl/go1.17.5.linux-amd64.tar.gz - tar -C /usr/local -xzf go1.17.5.linux-amd64.tar.gz - export PATH=$PATH:/usr/local/go/bin + - TF_VAR_cluster_prefix="smoke-$(openssl rand -base64 12 | tr -d /=+ | cut -c -16)" + - echo "Cluster Prefix --> $TF_VAR_cluster_prefix" + - TF_VAR_branch=$CI_COMMIT_BRANCH + - echo "Branch --> $TF_VAR_branch" script: - ./qa/scripts/setupSamsungGauntlet.sh - - ./qa/scripts/testSamsungGauntlet.sh +# - ./qa/scripts/testSamsungGauntlet.sh after_script: - ./qa/scripts/teardownSamsungGauntlet.sh \ No newline at end of file diff --git a/qa/tf/.modules/featurebase-cluster/main.tf b/qa/tf/.modules/featurebase-cluster/main.tf index f8c612e49..133226e75 100644 --- a/qa/tf/.modules/featurebase-cluster/main.tf +++ b/qa/tf/.modules/featurebase-cluster/main.tf @@ -46,7 +46,7 @@ resource "aws_instance" "fb_cluster_nodes" { Role = "cluster_node" } - user_data = base64encode(templatefile("${path.module}/setup_cluster_node.sh.tpl", { gitlab_token = var.gitlab_token, cluster_prefix = var.cluster_prefix, node_count = var.fb_data_node_count, fb_cluster_replica_count = var.fb_cluster_replica_count, region = var.region })) + user_data = base64encode(templatefile("${path.module}/setup_cluster_node.sh.tpl", { gitlab_token = var.gitlab_token, branch = var.branch, cluster_prefix = var.cluster_prefix, node_count = var.fb_data_node_count, fb_cluster_replica_count = var.fb_cluster_replica_count, region = var.region })) } resource "aws_instance" "fb_ingest" { @@ -79,7 +79,7 @@ resource "aws_instance" "fb_ingest" { Role = "ingest_node" } - user_data = base64encode(templatefile("${path.module}/setup_ingest_node.sh.tpl", { gitlab_token = var.gitlab_token, cluster_prefix = var.cluster_prefix, node_count = var.fb_ingest_node_count, this_node = count.index, region = var.region })) + user_data = base64encode(templatefile("${path.module}/setup_ingest_node.sh.tpl", { gitlab_token = var.gitlab_token, branch = var.branch, cluster_prefix = var.cluster_prefix, node_count = var.fb_ingest_node_count, this_node = count.index, region = var.region })) } resource "aws_key_pair" "gitlab-featurebase-ci" { diff --git a/qa/tf/.modules/featurebase-cluster/setup_cluster_node.sh.tpl b/qa/tf/.modules/featurebase-cluster/setup_cluster_node.sh.tpl index 05d55d973..9a7e71a93 100644 --- a/qa/tf/.modules/featurebase-cluster/setup_cluster_node.sh.tpl +++ b/qa/tf/.modules/featurebase-cluster/setup_cluster_node.sh.tpl @@ -164,7 +164,7 @@ write_featurebase_service_file #get the featurebase binary and put in in the right spot echo "Getting featurebase binary..." -curl --header "PRIVATE-TOKEN: ${gitlab_token}" -o "/home/ec2-user/featurebase_linux_arm64" https://gitlab.com/api/v4/projects/molecula%2Ffeaturebase/jobs/artifacts/master/raw/featurebase_linux_arm64?job=build%20for%20linux%20arm64 +curl --fail --header "PRIVATE-TOKEN: ${gitlab_token}" -o "/home/ec2-user/featurebase_linux_arm64" https://gitlab.com/api/v4/projects/molecula%2Ffeaturebase/jobs/artifacts/${branch}/raw/featurebase_linux_arm64?job=build%20for%20linux%20arm64 chown ec2-user:ec2-user "/home/ec2-user/featurebase_linux_arm64" chmod ugo+x "/home/ec2-user/featurebase_linux_arm64" diff --git a/qa/tf/.modules/featurebase-cluster/setup_ingest_node.sh.tpl b/qa/tf/.modules/featurebase-cluster/setup_ingest_node.sh.tpl index 51c98d65f..8c032f0e5 100644 --- a/qa/tf/.modules/featurebase-cluster/setup_ingest_node.sh.tpl +++ b/qa/tf/.modules/featurebase-cluster/setup_ingest_node.sh.tpl @@ -48,7 +48,7 @@ get_aws_instance_id wait_on_all_ingest_ips echo "Getting featurebase binary..." -curl --header "PRIVATE-TOKEN: ${gitlab_token}" -o "/home/ec2-user/featurebase_linux_arm64" https://gitlab.com/api/v4/projects/molecula%2Ffeaturebase/jobs/artifacts/master/raw/featurebase_linux_arm64?job=build%20for%20linux%20arm64 +curl --fail --header "PRIVATE-TOKEN: ${gitlab_token}" -o "/home/ec2-user/featurebase_linux_arm64" https://gitlab.com/api/v4/projects/molecula%2Ffeaturebase/jobs/artifacts/${branch}/raw/featurebase_linux_arm64?job=build%20for%20linux%20arm64 chown ec2-user:ec2-user "/home/ec2-user/featurebase_linux_arm64" chmod ugo+x "/home/ec2-user/featurebase_linux_arm64" diff --git a/qa/tf/.modules/featurebase-cluster/variables.tf b/qa/tf/.modules/featurebase-cluster/variables.tf index dd0da90c7..dcb159820 100644 --- a/qa/tf/.modules/featurebase-cluster/variables.tf +++ b/qa/tf/.modules/featurebase-cluster/variables.tf @@ -91,3 +91,8 @@ variable "gitlab_token" { description = "Gitlab API token" type = string } + +variable "branch" { + description = "The branch we are on" + type = string +} diff --git a/qa/tf/ci/smoketest/main.tf b/qa/tf/ci/smoketest/main.tf index a05c6898d..80753a1f9 100644 --- a/qa/tf/ci/smoketest/main.tf +++ b/qa/tf/ci/smoketest/main.tf @@ -7,4 +7,5 @@ module "ci-cluster" { fb_data_node_type = "m6g.large" fb_data_node_count = 1 gitlab_token = var.gitlab_token + branch = var.branch } diff --git a/qa/tf/ci/smoketest/outputs.json b/qa/tf/ci/smoketest/outputs.json new file mode 100644 index 000000000..ba5a4859d --- /dev/null +++ b/qa/tf/ci/smoketest/outputs.json @@ -0,0 +1,26 @@ +{ + "data_node_ips": { + "sensitive": false, + "type": [ + "tuple", + [ + "string" + ] + ], + "value": [ + "10.0.1.135" + ] + }, + "ingest_ips": { + "sensitive": false, + "type": [ + "tuple", + [ + "string" + ] + ], + "value": [ + "3.128.205.2" + ] + } +} diff --git a/qa/tf/ci/smoketest/terraform.tfstate.backup b/qa/tf/ci/smoketest/terraform.tfstate.backup new file mode 100644 index 000000000..363b79370 --- /dev/null +++ b/qa/tf/ci/smoketest/terraform.tfstate.backup @@ -0,0 +1,1596 @@ +{ + "version": 4, + "terraform_version": "1.1.2", + "serial": 109, + "lineage": "bf91272c-d504-5c98-ce46-2ced1888bf74", + "outputs": { + "data_node_ips": { + "value": [ + "10.0.1.135" + ], + "type": [ + "tuple", + [ + "string" + ] + ] + }, + "ingest_ips": { + "value": [ + "3.128.205.2" + ], + "type": [ + "tuple", + [ + "string" + ] + ] + } + }, + "resources": [ + { + "module": "module.ci-cluster", + "mode": "data", + "type": "aws_ami", + "name": "amazon_linux_2", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "architecture": "arm64", + "arn": "arn:aws:ec2:us-east-2::image/ami-0b09f36be67d32fff", + "block_device_mappings": [ + { + "device_name": "/dev/xvda", + "ebs": { + "delete_on_termination": "true", + "encrypted": "false", + "iops": "0", + "snapshot_id": "snap-0617b00e90bae012b", + "throughput": "0", + "volume_size": "8", + "volume_type": "gp2" + }, + "no_device": "", + "virtual_name": "" + } + ], + "creation_date": "2021-12-01T19:36:11.000Z", + "description": "Amazon Linux 2 LTS Arm64 AMI 2.0.20211201.0 arm64 HVM gp2", + "ena_support": true, + "executable_users": null, + "filter": [ + { + "name": "architecture", + "values": [ + "arm64" + ] + }, + { + "name": "name", + "values": [ + "amzn2-ami-hvm-*" + ] + }, + { + "name": "virtualization-type", + "values": [ + "hvm" + ] + } + ], + "hypervisor": "xen", + "id": "ami-0b09f36be67d32fff", + "image_id": "ami-0b09f36be67d32fff", + "image_location": "amazon/amzn2-ami-hvm-2.0.20211201.0-arm64-gp2", + "image_owner_alias": "amazon", + "image_type": "machine", + "kernel_id": null, + "most_recent": true, + "name": "amzn2-ami-hvm-2.0.20211201.0-arm64-gp2", + "name_regex": null, + "owner_id": "137112412989", + "owners": [ + "amazon" + ], + "platform": null, + "platform_details": "Linux/UNIX", + "product_codes": [], + "public": true, + "ramdisk_id": null, + "root_device_name": "/dev/xvda", + "root_device_type": "ebs", + "root_snapshot_id": "snap-0617b00e90bae012b", + "sriov_net_support": "simple", + "state": "available", + "state_reason": { + "code": "UNSET", + "message": "UNSET" + }, + "tags": {}, + "usage_operation": "RunInstances", + "virtualization_type": "hvm" + }, + "sensitive_attributes": [] + } + ] + }, + { + "module": "module.ci-cluster", + "mode": "managed", + "type": "aws_iam_instance_profile", + "name": "fb_cluster_node_profile", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "arn": "arn:aws:iam::941206295814:instance-profile/fb_cluster_node_profile", + "create_date": "2022-01-05T18:02:15Z", + "id": "fb_cluster_node_profile", + "name": "fb_cluster_node_profile", + "name_prefix": null, + "path": "/", + "role": "fb_cluster_node", + "tags": null, + "tags_all": {}, + "unique_id": "AIPA5WJCEKUDNRHDL27WH" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.aws_iam_role.fb_cluster_node_role" + ] + } + ] + }, + { + "module": "module.ci-cluster", + "mode": "managed", + "type": "aws_iam_role", + "name": "fb_cluster_node_role", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 0, + "attributes": { + "arn": "arn:aws:iam::941206295814:role/fb_cluster_node", + "assume_role_policy": "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Sid\":\"\",\"Effect\":\"Allow\",\"Principal\":{\"Service\":\"ec2.amazonaws.com\"},\"Action\":\"sts:AssumeRole\"}]}", + "create_date": "2022-01-05T18:02:13Z", + "description": "", + "force_detach_policies": false, + "id": "fb_cluster_node", + "inline_policy": [ + { + "name": "ec2_read_all", + "policy": "{\"Statement\":[{\"Action\":[\"ec2:Describe*\"],\"Effect\":\"Allow\",\"Resource\":\"*\"}],\"Version\":\"2012-10-17\"}" + } + ], + "managed_policy_arns": [], + "max_session_duration": 3600, + "name": "fb_cluster_node", + "name_prefix": "", + "path": "/", + "permissions_boundary": null, + "tags": null, + "tags_all": {}, + "unique_id": "AROA5WJCEKUDIIQN2KEYA" + }, + "sensitive_attributes": [], + "private": "bnVsbA==" + } + ] + }, + { + "module": "module.ci-cluster", + "mode": "managed", + "type": "aws_instance", + "name": "fb_cluster_nodes", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 1, + "attributes": { + "ami": "ami-0b09f36be67d32fff", + "arn": "arn:aws:ec2:us-east-2:941206295814:instance/i-0359a7f7630703867", + "associate_public_ip_address": false, + "availability_zone": "us-east-2a", + "capacity_reservation_specification": [ + { + "capacity_reservation_preference": "open", + "capacity_reservation_target": [] + } + ], + "cpu_core_count": 2, + "cpu_threads_per_core": 1, + "credit_specification": [], + "disable_api_termination": false, + "ebs_block_device": [ + { + "delete_on_termination": true, + "device_name": "/dev/sdb", + "encrypted": false, + "iops": 3000, + "kms_key_id": "", + "snapshot_id": "", + "tags": {}, + "throughput": 125, + "volume_id": "vol-0d5538434b9b8aeb2", + "volume_size": 100, + "volume_type": "gp3" + } + ], + "ebs_optimized": false, + "enclave_options": [ + { + "enabled": false + } + ], + "ephemeral_block_device": [], + "get_password_data": false, + "hibernation": false, + "host_id": null, + "iam_instance_profile": "fb_cluster_node_profile", + "id": "i-0359a7f7630703867", + "instance_initiated_shutdown_behavior": "stop", + "instance_state": "running", + "instance_type": "m6g.large", + "ipv6_address_count": 0, + "ipv6_addresses": [], + "key_name": "gitlab-featurebase-ci", + "launch_template": [], + "metadata_options": [ + { + "http_endpoint": "enabled", + "http_put_response_hop_limit": 1, + "http_tokens": "optional" + } + ], + "monitoring": true, + "network_interface": [], + "outpost_arn": "", + "password_data": "", + "placement_group": "", + "placement_partition_number": null, + "primary_network_interface_id": "eni-02763cc155602c23c", + "private_dns": "ip-10-0-1-135.us-east-2.compute.internal", + "private_ip": "10.0.1.135", + "public_dns": "", + "public_ip": "", + "root_block_device": [ + { + "delete_on_termination": true, + "device_name": "/dev/xvda", + "encrypted": false, + "iops": 3000, + "kms_key_id": "", + "tags": null, + "throughput": 125, + "volume_id": "vol-0e1456a8b7d16d0cb", + "volume_size": 20, + "volume_type": "gp3" + } + ], + "secondary_private_ips": [], + "security_groups": [], + "source_dest_check": true, + "subnet_id": "subnet-01c395e32d2b3a5ac", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV-featurebase-cluster-0", + "Prefix": "smoke-X8A0attf2zz6EhnV", + "Role": "cluster_node" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV-featurebase-cluster-0", + "Prefix": "smoke-X8A0attf2zz6EhnV", + "Role": "cluster_node" + }, + "tenancy": "default", + "timeouts": null, + "user_data": "fbb8ce5cb065f8eae2a7229a1c226331e2ee77f3", + "user_data_base64": null, + "volume_tags": null, + "vpc_security_group_ids": [ + "sg-07a1fc4ec5e80120d" + ] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9LCJzY2hlbWFfdmVyc2lvbiI6IjEifQ==", + "dependencies": [ + "module.ci-cluster.aws_iam_instance_profile.fb_cluster_node_profile", + "module.ci-cluster.aws_iam_role.fb_cluster_node_role", + "module.ci-cluster.aws_key_pair.gitlab-featurebase-ci", + "module.ci-cluster.aws_security_group.featurebase", + "module.ci-cluster.data.aws_ami.amazon_linux_2", + "module.ci-cluster.module.vpc.aws_subnet.private", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster", + "mode": "managed", + "type": "aws_instance", + "name": "fb_ingest", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 1, + "attributes": { + "ami": "ami-0b09f36be67d32fff", + "arn": "arn:aws:ec2:us-east-2:941206295814:instance/i-041f0d0f7200dc7a7", + "associate_public_ip_address": true, + "availability_zone": "us-east-2a", + "capacity_reservation_specification": [ + { + "capacity_reservation_preference": "open", + "capacity_reservation_target": [] + } + ], + "cpu_core_count": 8, + "cpu_threads_per_core": 1, + "credit_specification": [], + "disable_api_termination": false, + "ebs_block_device": [ + { + "delete_on_termination": true, + "device_name": "/dev/sdb", + "encrypted": false, + "iops": 3000, + "kms_key_id": "", + "snapshot_id": "", + "tags": {}, + "throughput": 125, + "volume_id": "vol-0f37e5ea06a7b49b6", + "volume_size": 100, + "volume_type": "gp3" + } + ], + "ebs_optimized": false, + "enclave_options": [ + { + "enabled": false + } + ], + "ephemeral_block_device": [], + "get_password_data": false, + "hibernation": false, + "host_id": null, + "iam_instance_profile": "fb_cluster_node_profile", + "id": "i-041f0d0f7200dc7a7", + "instance_initiated_shutdown_behavior": "stop", + "instance_state": "running", + "instance_type": "c6g.2xlarge", + "ipv6_address_count": 0, + "ipv6_addresses": [], + "key_name": "gitlab-featurebase-ci", + "launch_template": [], + "metadata_options": [ + { + "http_endpoint": "enabled", + "http_put_response_hop_limit": 1, + "http_tokens": "optional" + } + ], + "monitoring": true, + "network_interface": [], + "outpost_arn": "", + "password_data": "", + "placement_group": "", + "placement_partition_number": null, + "primary_network_interface_id": "eni-022602c8f08eb8c5c", + "private_dns": "ip-10-0-101-25.us-east-2.compute.internal", + "private_ip": "10.0.101.25", + "public_dns": "", + "public_ip": "3.128.205.2", + "root_block_device": [ + { + "delete_on_termination": true, + "device_name": "/dev/xvda", + "encrypted": false, + "iops": 3000, + "kms_key_id": "", + "tags": null, + "throughput": 125, + "volume_id": "vol-0fed4f2554dbdb52e", + "volume_size": 20, + "volume_type": "gp3" + } + ], + "secondary_private_ips": [], + "security_groups": [], + "source_dest_check": true, + "subnet_id": "subnet-0247886cd34c1cdf9", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV-featurebase-ingest-0", + "Prefix": "smoke-X8A0attf2zz6EhnV", + "Role": "ingest_node" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV-featurebase-ingest-0", + "Prefix": "smoke-X8A0attf2zz6EhnV", + "Role": "ingest_node" + }, + "tenancy": "default", + "timeouts": null, + "user_data": "c49980e192228c371d034c166b809f26e8257ff0", + "user_data_base64": null, + "volume_tags": null, + "vpc_security_group_ids": [ + "sg-074a678f421249282" + ] + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMCwidXBkYXRlIjo2MDAwMDAwMDAwMDB9LCJzY2hlbWFfdmVyc2lvbiI6IjEifQ==", + "dependencies": [ + "module.ci-cluster.aws_iam_instance_profile.fb_cluster_node_profile", + "module.ci-cluster.aws_iam_role.fb_cluster_node_role", + "module.ci-cluster.aws_key_pair.gitlab-featurebase-ci", + "module.ci-cluster.aws_security_group.ingest", + "module.ci-cluster.data.aws_ami.amazon_linux_2", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster", + "mode": "managed", + "type": "aws_key_pair", + "name": "gitlab-featurebase-ci", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:key-pair/gitlab-featurebase-ci", + "fingerprint": "69:e5:4b:15:8d:1f:22:61:de:08:a9:ee:f3:29:5c:69", + "id": "gitlab-featurebase-ci", + "key_name": "gitlab-featurebase-ci", + "key_name_prefix": "", + "key_pair_id": "key-02708bd9529ba15b7", + "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC91hhpVHNonAG7ku2ugpxEskf9KHeyHJPQJT26OHrMUw7R+T5A8TjqSzTau07sXQ/E9SO3ebV8SJ5PqeaQOnQB8VEvVNK0DjQH7ppvNg1Rfs42FZT9ttzTMvOjsSbK3vZTHXdoKQEdC9NxBwSkFIRGQojK1HUOq9xGrw31fA1OjSwlpLcbx7yyg18lcqW6UOptnVR8U9Yy9qQ5jZF1HtkQ6L9J+gv4o1UyNAUK2bopeGiXpBc3PQ/CFaFT2h/aqLBP66qAHsHVyAFD3PIRtplC5EHa8jXDgLacEls0uF7Q3kRPxvzcuo4g4VkOn1rDy9qH3vd2hT3aKVnM73FIDUiL", + "tags": null, + "tags_all": {} + }, + "sensitive_attributes": [], + "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" + } + ] + }, + { + "module": "module.ci-cluster", + "mode": "managed", + "type": "aws_security_group", + "name": "featurebase", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:security-group/sg-07a1fc4ec5e80120d", + "description": "Allow featurebase inbound traffic", + "egress": [ + { + "cidr_blocks": [ + "0.0.0.0/0" + ], + "description": "", + "from_port": 0, + "ipv6_cidr_blocks": [ + "::/0" + ], + "prefix_list_ids": [], + "protocol": "-1", + "security_groups": [], + "self": false, + "to_port": 0 + } + ], + "id": "sg-07a1fc4ec5e80120d", + "ingress": [ + { + "cidr_blocks": [ + "0.0.0.0/0" + ], + "description": "SSH", + "from_port": 22, + "ipv6_cidr_blocks": [ + "::/0" + ], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 22 + }, + { + "cidr_blocks": [ + "10.0.0.0/16" + ], + "description": "GRPC from Internal", + "from_port": 20101, + "ipv6_cidr_blocks": [], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 20101 + }, + { + "cidr_blocks": [ + "10.0.0.0/16" + ], + "description": "PostgreSQL from Internal", + "from_port": 55432, + "ipv6_cidr_blocks": [], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 55432 + }, + { + "cidr_blocks": [ + "10.0.0.0/16" + ], + "description": "TLS from Internal", + "from_port": 10101, + "ipv6_cidr_blocks": [], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 10101 + }, + { + "cidr_blocks": [ + "10.0.0.0/16" + ], + "description": "etcd from internal 2", + "from_port": 10401, + "ipv6_cidr_blocks": [], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 10401 + }, + { + "cidr_blocks": [ + "10.0.0.0/16" + ], + "description": "etcd from internal", + "from_port": 10301, + "ipv6_cidr_blocks": [], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 10301 + } + ], + "name": "allow_featurebase", + "name_prefix": "", + "owner_id": "941206295814", + "revoke_rules_on_delete": false, + "tags": { + "Name": "allow_featurebase" + }, + "tags_all": { + "Name": "allow_featurebase" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6OTAwMDAwMDAwMDAwfSwic2NoZW1hX3ZlcnNpb24iOiIxIn0=", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this" + ] + } + ] + }, + { + "module": "module.ci-cluster", + "mode": "managed", + "type": "aws_security_group", + "name": "ingest", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:security-group/sg-074a678f421249282", + "description": "Allow ingest inbound traffic", + "egress": [ + { + "cidr_blocks": [ + "0.0.0.0/0" + ], + "description": "", + "from_port": 0, + "ipv6_cidr_blocks": [ + "::/0" + ], + "prefix_list_ids": [], + "protocol": "-1", + "security_groups": [], + "self": false, + "to_port": 0 + } + ], + "id": "sg-074a678f421249282", + "ingress": [ + { + "cidr_blocks": [ + "0.0.0.0/0" + ], + "description": "", + "from_port": 10101, + "ipv6_cidr_blocks": [ + "::/0" + ], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 10101 + }, + { + "cidr_blocks": [ + "0.0.0.0/0" + ], + "description": "SSH", + "from_port": 22, + "ipv6_cidr_blocks": [ + "::/0" + ], + "prefix_list_ids": [], + "protocol": "tcp", + "security_groups": [], + "self": false, + "to_port": 22 + } + ], + "name": "allow_ingest", + "name_prefix": "", + "owner_id": "941206295814", + "revoke_rules_on_delete": false, + "tags": { + "Name": "allow_ingest" + }, + "tags_all": { + "Name": "allow_ingest" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6OTAwMDAwMDAwMDAwfSwic2NoZW1hX3ZlcnNpb24iOiIxIn0=", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_eip", + "name": "nat", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "address": null, + "allocation_id": "eipalloc-0ba403bbd04c4c421", + "associate_with_private_ip": null, + "association_id": "", + "carrier_ip": "", + "customer_owned_ip": "", + "customer_owned_ipv4_pool": "", + "domain": "vpc", + "id": "eipalloc-0ba403bbd04c4c421", + "instance": "", + "network_border_group": "us-east-2", + "network_interface": "", + "private_dns": null, + "private_ip": "", + "public_dns": "ec2-3-135-120-186.us-east-2.compute.amazonaws.com", + "public_ip": "3.135.120.186", + "public_ipv4_pool": "amazon", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc": true + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjkwMDAwMDAwMDAwMCwidXBkYXRlIjozMDAwMDAwMDAwMDB9fQ==" + }, + { + "index_key": 1, + "schema_version": 0, + "attributes": { + "address": null, + "allocation_id": "eipalloc-038bb403d3ac622bb", + "associate_with_private_ip": null, + "association_id": "", + "carrier_ip": "", + "customer_owned_ip": "", + "customer_owned_ipv4_pool": "", + "domain": "vpc", + "id": "eipalloc-038bb403d3ac622bb", + "instance": "", + "network_border_group": "us-east-2", + "network_interface": "", + "private_dns": null, + "private_ip": "", + "public_dns": "ec2-3-21-208-152.us-east-2.compute.amazonaws.com", + "public_ip": "3.21.208.152", + "public_ipv4_pool": "amazon", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc": true + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjkwMDAwMDAwMDAwMCwidXBkYXRlIjozMDAwMDAwMDAwMDB9fQ==" + }, + { + "index_key": 2, + "schema_version": 0, + "attributes": { + "address": null, + "allocation_id": "eipalloc-0a2d294a1a2988b8a", + "associate_with_private_ip": null, + "association_id": "", + "carrier_ip": "", + "customer_owned_ip": "", + "customer_owned_ipv4_pool": "", + "domain": "vpc", + "id": "eipalloc-0a2d294a1a2988b8a", + "instance": "", + "network_border_group": "us-east-2", + "network_interface": "", + "private_dns": null, + "private_ip": "", + "public_dns": "ec2-3-15-77-161.us-east-2.compute.amazonaws.com", + "public_ip": "3.15.77.161", + "public_ipv4_pool": "amazon", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc": true + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiZGVsZXRlIjoxODAwMDAwMDAwMDAsInJlYWQiOjkwMDAwMDAwMDAwMCwidXBkYXRlIjozMDAwMDAwMDAwMDB9fQ==" + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_internet_gateway", + "name": "this", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:internet-gateway/igw-0ce70f3cc98fad59d", + "id": "igw-0ce70f3cc98fad59d", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_nat_gateway", + "name": "this", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "allocation_id": "eipalloc-0ba403bbd04c4c421", + "connectivity_type": "public", + "id": "nat-08b3e77096bf673c0", + "network_interface_id": "eni-0cb08495b42772e7e", + "private_ip": "10.0.101.150", + "public_ip": "3.135.120.186", + "subnet_id": "subnet-0247886cd34c1cdf9", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + } + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_eip.nat", + "module.ci-cluster.module.vpc.aws_internet_gateway.this", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 1, + "schema_version": 0, + "attributes": { + "allocation_id": "eipalloc-038bb403d3ac622bb", + "connectivity_type": "public", + "id": "nat-074e3de49239f4b6d", + "network_interface_id": "eni-0c188b22b5c37e4ce", + "private_ip": "10.0.102.92", + "public_ip": "3.21.208.152", + "subnet_id": "subnet-06e4c8999144bceac", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + } + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_eip.nat", + "module.ci-cluster.module.vpc.aws_internet_gateway.this", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 2, + "schema_version": 0, + "attributes": { + "allocation_id": "eipalloc-0a2d294a1a2988b8a", + "connectivity_type": "public", + "id": "nat-0887acc016e829f29", + "network_interface_id": "eni-09b022afffa124d2d", + "private_ip": "10.0.103.107", + "public_ip": "3.15.77.161", + "subnet_id": "subnet-03329ab9b28b5033d", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + } + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_eip.nat", + "module.ci-cluster.module.vpc.aws_internet_gateway.this", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_route", + "name": "private_nat_gateway", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "carrier_gateway_id": "", + "destination_cidr_block": "0.0.0.0/0", + "destination_ipv6_cidr_block": "", + "destination_prefix_list_id": "", + "egress_only_gateway_id": "", + "gateway_id": "", + "id": "r-rtb-0188526b3e8b76b171080289494", + "instance_id": "", + "instance_owner_id": "", + "local_gateway_id": "", + "nat_gateway_id": "nat-08b3e77096bf673c0", + "network_interface_id": "", + "origin": "CreateRoute", + "route_table_id": "rtb-0188526b3e8b76b17", + "state": "active", + "timeouts": { + "create": "5m", + "delete": null, + "update": null + }, + "transit_gateway_id": "", + "vpc_endpoint_id": "", + "vpc_peering_connection_id": "" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_eip.nat", + "module.ci-cluster.module.vpc.aws_internet_gateway.this", + "module.ci-cluster.module.vpc.aws_nat_gateway.this", + "module.ci-cluster.module.vpc.aws_route_table.private", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 1, + "schema_version": 0, + "attributes": { + "carrier_gateway_id": "", + "destination_cidr_block": "0.0.0.0/0", + "destination_ipv6_cidr_block": "", + "destination_prefix_list_id": "", + "egress_only_gateway_id": "", + "gateway_id": "", + "id": "r-rtb-002c011bd5c041ebd1080289494", + "instance_id": "", + "instance_owner_id": "", + "local_gateway_id": "", + "nat_gateway_id": "nat-074e3de49239f4b6d", + "network_interface_id": "", + "origin": "CreateRoute", + "route_table_id": "rtb-002c011bd5c041ebd", + "state": "active", + "timeouts": { + "create": "5m", + "delete": null, + "update": null + }, + "transit_gateway_id": "", + "vpc_endpoint_id": "", + "vpc_peering_connection_id": "" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_eip.nat", + "module.ci-cluster.module.vpc.aws_internet_gateway.this", + "module.ci-cluster.module.vpc.aws_nat_gateway.this", + "module.ci-cluster.module.vpc.aws_route_table.private", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 2, + "schema_version": 0, + "attributes": { + "carrier_gateway_id": "", + "destination_cidr_block": "0.0.0.0/0", + "destination_ipv6_cidr_block": "", + "destination_prefix_list_id": "", + "egress_only_gateway_id": "", + "gateway_id": "", + "id": "r-rtb-0b7761b88054288c91080289494", + "instance_id": "", + "instance_owner_id": "", + "local_gateway_id": "", + "nat_gateway_id": "nat-0887acc016e829f29", + "network_interface_id": "", + "origin": "CreateRoute", + "route_table_id": "rtb-0b7761b88054288c9", + "state": "active", + "timeouts": { + "create": "5m", + "delete": null, + "update": null + }, + "transit_gateway_id": "", + "vpc_endpoint_id": "", + "vpc_peering_connection_id": "" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_eip.nat", + "module.ci-cluster.module.vpc.aws_internet_gateway.this", + "module.ci-cluster.module.vpc.aws_nat_gateway.this", + "module.ci-cluster.module.vpc.aws_route_table.private", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_route", + "name": "public_internet_gateway", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "carrier_gateway_id": "", + "destination_cidr_block": "0.0.0.0/0", + "destination_ipv6_cidr_block": "", + "destination_prefix_list_id": "", + "egress_only_gateway_id": "", + "gateway_id": "igw-0ce70f3cc98fad59d", + "id": "r-rtb-081f0aeab88a969af1080289494", + "instance_id": "", + "instance_owner_id": "", + "local_gateway_id": "", + "nat_gateway_id": "", + "network_interface_id": "", + "origin": "CreateRoute", + "route_table_id": "rtb-081f0aeab88a969af", + "state": "active", + "timeouts": { + "create": "5m", + "delete": null, + "update": null + }, + "transit_gateway_id": "", + "vpc_endpoint_id": "", + "vpc_peering_connection_id": "" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_internet_gateway.this", + "module.ci-cluster.module.vpc.aws_route_table.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_route_table", + "name": "private", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:route-table/rtb-0188526b3e8b76b17", + "id": "rtb-0188526b3e8b76b17", + "owner_id": "941206295814", + "propagating_vgws": [], + "route": [], + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 1, + "schema_version": 0, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:route-table/rtb-002c011bd5c041ebd", + "id": "rtb-002c011bd5c041ebd", + "owner_id": "941206295814", + "propagating_vgws": [], + "route": [], + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 2, + "schema_version": 0, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:route-table/rtb-0b7761b88054288c9", + "id": "rtb-0b7761b88054288c9", + "owner_id": "941206295814", + "propagating_vgws": [], + "route": [], + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_route_table", + "name": "public", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:route-table/rtb-081f0aeab88a969af", + "id": "rtb-081f0aeab88a969af", + "owner_id": "941206295814", + "propagating_vgws": [], + "route": [], + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjozMDAwMDAwMDAwMDAsImRlbGV0ZSI6MzAwMDAwMDAwMDAwLCJ1cGRhdGUiOjEyMDAwMDAwMDAwMH19", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_route_table_association", + "name": "private", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "gateway_id": "", + "id": "rtbassoc-0a662e03498742b2c", + "route_table_id": "rtb-0188526b3e8b76b17", + "subnet_id": "subnet-01c395e32d2b3a5ac" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_route_table.private", + "module.ci-cluster.module.vpc.aws_subnet.private", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 1, + "schema_version": 0, + "attributes": { + "gateway_id": "", + "id": "rtbassoc-01c410cbbda04507c", + "route_table_id": "rtb-002c011bd5c041ebd", + "subnet_id": "subnet-0cc5286545afde633" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_route_table.private", + "module.ci-cluster.module.vpc.aws_subnet.private", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 2, + "schema_version": 0, + "attributes": { + "gateway_id": "", + "id": "rtbassoc-00bb83233a6f9ac74", + "route_table_id": "rtb-0b7761b88054288c9", + "subnet_id": "subnet-080978fac46dd1f1a" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_route_table.private", + "module.ci-cluster.module.vpc.aws_subnet.private", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_route_table_association", + "name": "public", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 0, + "attributes": { + "gateway_id": "", + "id": "rtbassoc-04ca1629b056b5c8f", + "route_table_id": "rtb-081f0aeab88a969af", + "subnet_id": "subnet-0247886cd34c1cdf9" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_route_table.public", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 1, + "schema_version": 0, + "attributes": { + "gateway_id": "", + "id": "rtbassoc-0e500d62b6c879e14", + "route_table_id": "rtb-081f0aeab88a969af", + "subnet_id": "subnet-06e4c8999144bceac" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_route_table.public", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 2, + "schema_version": 0, + "attributes": { + "gateway_id": "", + "id": "rtbassoc-0f6c15d4b042d42a2", + "route_table_id": "rtb-081f0aeab88a969af", + "subnet_id": "subnet-03329ab9b28b5033d" + }, + "sensitive_attributes": [], + "private": "bnVsbA==", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_route_table.public", + "module.ci-cluster.module.vpc.aws_subnet.public", + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_subnet", + "name": "private", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:subnet/subnet-01c395e32d2b3a5ac", + "assign_ipv6_address_on_creation": false, + "availability_zone": "us-east-2a", + "availability_zone_id": "use2-az1", + "cidr_block": "10.0.1.0/24", + "customer_owned_ipv4_pool": "", + "id": "subnet-01c395e32d2b3a5ac", + "ipv6_cidr_block": "", + "ipv6_cidr_block_association_id": "", + "map_customer_owned_ip_on_launch": false, + "map_public_ip_on_launch": false, + "outpost_arn": "", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 1, + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:subnet/subnet-0cc5286545afde633", + "assign_ipv6_address_on_creation": false, + "availability_zone": "us-east-2b", + "availability_zone_id": "use2-az2", + "cidr_block": "10.0.2.0/24", + "customer_owned_ipv4_pool": "", + "id": "subnet-0cc5286545afde633", + "ipv6_cidr_block": "", + "ipv6_cidr_block_association_id": "", + "map_customer_owned_ip_on_launch": false, + "map_public_ip_on_launch": false, + "outpost_arn": "", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 2, + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:subnet/subnet-080978fac46dd1f1a", + "assign_ipv6_address_on_creation": false, + "availability_zone": "us-east-2c", + "availability_zone_id": "use2-az3", + "cidr_block": "10.0.3.0/24", + "customer_owned_ipv4_pool": "", + "id": "subnet-080978fac46dd1f1a", + "ipv6_cidr_block": "", + "ipv6_cidr_block_association_id": "", + "map_customer_owned_ip_on_launch": false, + "map_public_ip_on_launch": false, + "outpost_arn": "", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_subnet", + "name": "public", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:subnet/subnet-0247886cd34c1cdf9", + "assign_ipv6_address_on_creation": false, + "availability_zone": "us-east-2a", + "availability_zone_id": "use2-az1", + "cidr_block": "10.0.101.0/24", + "customer_owned_ipv4_pool": "", + "id": "subnet-0247886cd34c1cdf9", + "ipv6_cidr_block": "", + "ipv6_cidr_block_association_id": "", + "map_customer_owned_ip_on_launch": false, + "map_public_ip_on_launch": true, + "outpost_arn": "", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 1, + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:subnet/subnet-06e4c8999144bceac", + "assign_ipv6_address_on_creation": false, + "availability_zone": "us-east-2b", + "availability_zone_id": "use2-az2", + "cidr_block": "10.0.102.0/24", + "customer_owned_ipv4_pool": "", + "id": "subnet-06e4c8999144bceac", + "ipv6_cidr_block": "", + "ipv6_cidr_block_association_id": "", + "map_customer_owned_ip_on_launch": false, + "map_public_ip_on_launch": true, + "outpost_arn": "", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + }, + { + "index_key": 2, + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:subnet/subnet-03329ab9b28b5033d", + "assign_ipv6_address_on_creation": false, + "availability_zone": "us-east-2c", + "availability_zone_id": "use2-az3", + "cidr_block": "10.0.103.0/24", + "customer_owned_ipv4_pool": "", + "id": "subnet-03329ab9b28b5033d", + "ipv6_cidr_block": "", + "ipv6_cidr_block_association_id": "", + "map_customer_owned_ip_on_launch": false, + "map_public_ip_on_launch": true, + "outpost_arn": "", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "timeouts": null, + "vpc_id": "vpc-09399fb96f3e97abb" + }, + "sensitive_attributes": [], + "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9", + "dependencies": [ + "module.ci-cluster.module.vpc.aws_vpc.this", + "module.ci-cluster.module.vpc.aws_vpc_ipv4_cidr_block_association.this" + ] + } + ] + }, + { + "module": "module.ci-cluster.module.vpc", + "mode": "managed", + "type": "aws_vpc", + "name": "this", + "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]", + "instances": [ + { + "index_key": 0, + "schema_version": 1, + "attributes": { + "arn": "arn:aws:ec2:us-east-2:941206295814:vpc/vpc-09399fb96f3e97abb", + "assign_generated_ipv6_cidr_block": false, + "cidr_block": "10.0.0.0/16", + "default_network_acl_id": "acl-0e775e2274b35eb81", + "default_route_table_id": "rtb-0ce9b4e74fdbdc1ef", + "default_security_group_id": "sg-0147d81e8e9887ad2", + "dhcp_options_id": "dopt-0398725faf4f782c8", + "enable_classiclink": null, + "enable_classiclink_dns_support": null, + "enable_dns_hostnames": false, + "enable_dns_support": true, + "id": "vpc-09399fb96f3e97abb", + "instance_tenancy": "default", + "ipv4_ipam_pool_id": null, + "ipv4_netmask_length": null, + "ipv6_association_id": "", + "ipv6_cidr_block": "", + "ipv6_ipam_pool_id": null, + "ipv6_netmask_length": null, + "main_route_table_id": "rtb-0ce9b4e74fdbdc1ef", + "owner_id": "941206295814", + "tags": { + "Name": "smoke-X8A0attf2zz6EhnV" + }, + "tags_all": { + "Name": "smoke-X8A0attf2zz6EhnV" + } + }, + "sensitive_attributes": [], + "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==" + } + ] + } + ] +} diff --git a/qa/tf/ci/smoketest/variables.tf b/qa/tf/ci/smoketest/variables.tf index eab8ecd51..bab877497 100644 --- a/qa/tf/ci/smoketest/variables.tf +++ b/qa/tf/ci/smoketest/variables.tf @@ -16,4 +16,9 @@ variable "gitlab_token" { variable "cluster_prefix" { type = string description = "This is a identifier that will be prefixed to created resources" +} + +variable "branch" { + type = string + description = "The branch we are on" } \ No newline at end of file diff --git a/qa/tf/gauntlet/samsung/main.tf b/qa/tf/gauntlet/samsung/main.tf index 926e54cc3..8a5101d7c 100644 --- a/qa/tf/gauntlet/samsung/main.tf +++ b/qa/tf/gauntlet/samsung/main.tf @@ -10,4 +10,5 @@ module "samsung-cluster" { fb_ingest_disk_iops = 10000 fb_ingest_node_count = 1 gitlab_token = var.gitlab_token + branch = var.branch } diff --git a/qa/tf/gauntlet/samsung/variables.tf b/qa/tf/gauntlet/samsung/variables.tf index eab8ecd51..bab877497 100644 --- a/qa/tf/gauntlet/samsung/variables.tf +++ b/qa/tf/gauntlet/samsung/variables.tf @@ -16,4 +16,9 @@ variable "gitlab_token" { variable "cluster_prefix" { type = string description = "This is a identifier that will be prefixed to created resources" +} + +variable "branch" { + type = string + description = "The branch we are on" } \ No newline at end of file