tag fablab's AWS resources and name environments distinctly

openziti · Sep 20, 2023 · 46fb81a · 46fb81a
1 parent 42279ce
commit 46fb81a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -172,7 +172,7 @@ jobs:
       - name: Create Test Environment
         run: |
           echo "ZITI_ROOT=$(go env GOPATH)/bin" >> "$GITHUB_ENV"
-          $(go env GOPATH)/bin/simple-transfer create -d simple-transfer-${GITHUB_RUN_NUMBER} -n simple-transfer-${GITHUB_RUN_NUMBER} -l environment=gh,ziti_version=$($(go env GOPATH)/bin/ziti-ci -q get-current-version)
+          $(go env GOPATH)/bin/simple-transfer create -d simple-transfer-${GITHUB_RUN_NUMBER} -n simple-transfer-${GITHUB_RUN_NUMBER} -l environment=gh-fablab-smoketest,ziti_version=$($(go env GOPATH)/bin/ziti-ci -q get-current-version)
           $(go env GOPATH)/bin/simple-transfer up
 
       - name: Test Ziti Command
@@ -273,7 +273,7 @@ jobs:
       - name: Create Test Environment
         run: |
           echo "ZITI_ROOT=$(go env GOPATH)/bin" >> "$GITHUB_ENV"
-          $(go env GOPATH)/bin/simple-transfer create -d simple-transfer-ha-${GITHUB_RUN_NUMBER} -n simple-transfer-ha-${GITHUB_RUN_NUMBER} -l ha=true,environment=gh,ziti_version=$($(go env GOPATH)/bin/ziti-ci -q get-current-version)
+          $(go env GOPATH)/bin/simple-transfer create -d simple-transfer-ha-${GITHUB_RUN_NUMBER} -n simple-transfer-ha-${GITHUB_RUN_NUMBER} -l ha=true,environment=gh-fablab-ha-smoketest,ziti_version=$($(go env GOPATH)/bin/ziti-ci -q get-current-version)
           $(go env GOPATH)/bin/simple-transfer up
 
       #      - name: Test Ziti Command

diff --git a/zititest/models/test_resources/terraform/vpc/main.tf b/zititest/models/test_resources/terraform/vpc/main.tf
@@ -20,11 +20,16 @@ resource "aws_vpc" "fablab" {
   enable_dns_hostnames = true
   tags = {
     Name = var.environment_tag
+    source = "fablab"
   }
 }
 
 resource "aws_internet_gateway" "fablab" {
   vpc_id = aws_vpc.fablab.id
+  tags = {
+    Name = var.environment_tag
+    source = "fablab"
+  }
 }
 
 resource "aws_subnet" "fablab" {
@@ -33,6 +38,7 @@ resource "aws_subnet" "fablab" {
   availability_zone = var.az
   tags = {
     Name = var.environment_tag
+    source = "fablab"
   }
 }
 
@@ -44,6 +50,7 @@ resource "aws_route_table" "fablab" {
   }
   tags = {
     Name = var.environment_tag
+    source = "fablab"
   }
 }
 
@@ -125,5 +132,6 @@ resource "aws_security_group" "fablab" {
   }
   tags = {
     Name = var.environment_tag
+    source = "fablab"
   }
 }