diff --git a/.github/workflows/Yor.yml b/.github/workflows/Yor.yml index 7c710c3ddb..52d9102e61 100644 --- a/.github/workflows/Yor.yml +++ b/.github/workflows/Yor.yml @@ -1,14 +1,8 @@ -name: IaC trace +name: IaC tag and trace on: - # Triggers the workflow on push or pull request events but only for the main branch -# push: -# branches: [ master ] -# pull_request: -# branches: [ master ] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: + push: + pull_request: jobs: yor: @@ -18,8 +12,5 @@ jobs: name: Checkout repo with: fetch-depth: 0 - ref: ${{ github.head_ref }} - name: Run yor action uses: bridgecrewio/yor-action@main - - name: Commit tag changes - uses: stefanzweifel/git-auto-commit-action@v4 diff --git a/phimm.yaml b/phimm.yaml new file mode 100644 index 0000000000..dda50dd256 --- /dev/null +++ b/phimm.yaml @@ -0,0 +1 @@ +#phimm \ No newline at end of file diff --git a/terraform-aws-ec2-bastion-server-master/examples/complete/main.tf b/terraform-aws-ec2-bastion-server-master/examples/complete/main.tf index 5a4bcc7fb1..37cb3ad80e 100644 --- a/terraform-aws-ec2-bastion-server-master/examples/complete/main.tf +++ b/terraform-aws-ec2-bastion-server-master/examples/complete/main.tf @@ -8,6 +8,16 @@ module "vpc" { stage = var.stage name = var.name cidr_block = "172.16.0.0/16" + tags = { + git_commit = "f1a3726cb53d99856f4e4a77388f3756ba9969ce" + git_file = "terraform-aws-ec2-bastion-server-master/examples/complete/main.tf" + git_last_modified_at = "2020-11-09 16:45:37" + git_last_modified_by = "68634672+guyeisenkot@users.noreply.github.com" + git_modifiers = "68634672+guyeisenkot" + git_org = "phimm-hub" + git_repo = "terragoat" + yor_trace = "c2656435-f988-49b8-8176-6406bb993580" + } } module "subnets" { @@ -21,6 +31,16 @@ module "subnets" { cidr_block = module.vpc.vpc_cidr_block nat_gateway_enabled = false nat_instance_enabled = false + tags = { + git_commit = "f1a3726cb53d99856f4e4a77388f3756ba9969ce" + git_file = "terraform-aws-ec2-bastion-server-master/examples/complete/main.tf" + git_last_modified_at = "2020-11-09 16:45:37" + git_last_modified_by = "68634672+guyeisenkot@users.noreply.github.com" + git_modifiers = "68634672+guyeisenkot" + git_org = "phimm-hub" + git_repo = "terragoat" + yor_trace = "e6094d2b-be55-4517-9ae4-af4d527ec31d" + } } module "aws_key_pair" { @@ -31,6 +51,16 @@ module "aws_key_pair" { attributes = ["ssh", "key"] ssh_public_key_path = var.ssh_key_path generate_ssh_key = var.generate_ssh_key + tags = { + git_commit = "f1a3726cb53d99856f4e4a77388f3756ba9969ce" + git_file = "terraform-aws-ec2-bastion-server-master/examples/complete/main.tf" + git_last_modified_at = "2020-11-09 16:45:37" + git_last_modified_by = "68634672+guyeisenkot@users.noreply.github.com" + git_modifiers = "68634672+guyeisenkot" + git_org = "phimm-hub" + git_repo = "terragoat" + yor_trace = "29babf3b-4316-433f-8af5-6024ebf38500" + } } module "ec2_bastion" { diff --git a/terraform/aws/db-app.tf b/terraform/aws/db-app.tf index 938de28dc8..752ccdcef7 100644 --- a/terraform/aws/db-app.tf +++ b/terraform/aws/db-app.tf @@ -28,7 +28,7 @@ resource "aws_db_instance" "default" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "fbcbf0b9-8ede-4eb1-bdc1-7d5abcb42881" } @@ -53,7 +53,7 @@ resource "aws_db_option_group" "default" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "fc499810-8ac3-4807-bd72-8d55904a02e8" } @@ -84,7 +84,7 @@ resource "aws_db_parameter_group" "default" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "d729e4b9-f8bc-4d0d-81f4-c226191ad170" } @@ -103,7 +103,7 @@ resource "aws_db_subnet_group" "default" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "3ac7f6bf-120a-496c-9028-2638b399e8b6" } @@ -121,7 +121,7 @@ resource "aws_security_group" "default" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "f8a42a90-11ea-42e1-8f25-aa0375ff1632" } @@ -156,7 +156,7 @@ resource "aws_iam_instance_profile" "ec2profile" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "a9e84db7-31c4-4440-a474-2802c7181967" } @@ -190,7 +190,7 @@ EOF git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "ee26bbfe-daea-4177-8be8-b15279a21401" } @@ -398,7 +398,7 @@ EOF git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "b3b25ba1-64e2-46d9-a359-49848c7d43ed" } diff --git a/terraform/aws/ec2.tf b/terraform/aws/ec2.tf index e0c5f10515..b359ba5c1d 100644 --- a/terraform/aws/ec2.tf +++ b/terraform/aws/ec2.tf @@ -24,7 +24,7 @@ EOF git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "cff9836a-83cb-4449-80fb-708d70c3d82f" } @@ -42,7 +42,7 @@ resource "aws_ebs_volume" "web_host_storage" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "39317050-34d5-449d-a9fc-818eb1774f33" } @@ -59,7 +59,7 @@ resource "aws_ebs_snapshot" "example_snapshot" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "5b7df4d5-a191-4369-aca3-b2138d439a18" } @@ -105,7 +105,7 @@ resource "aws_security_group" "web-node" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "9b1c81bd-21c2-469e-bc39-80a54aad8888" } @@ -122,7 +122,7 @@ resource "aws_vpc" "web_vpc" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "307d74c8-c192-43ff-ac94-898b943be6ef" } @@ -141,7 +141,7 @@ resource "aws_subnet" "web_subnet" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "eb2d1a82-858e-442e-b468-e48b241525b6" } @@ -160,7 +160,7 @@ resource "aws_subnet" "web_subnet2" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "21a68ad1-a390-4103-ae3f-7ae03a08db3a" } @@ -177,7 +177,7 @@ resource "aws_internet_gateway" "web_igw" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "10a101ef-338e-456d-bddd-a495a798d672" } @@ -193,7 +193,7 @@ resource "aws_route_table" "web_rtb" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "b9682f4c-fdc0-425b-92f2-79875e2076a2" } @@ -231,7 +231,7 @@ resource "aws_network_interface" "web-eni" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "bbdb7f22-2f8e-41f2-b16a-620f132f2dd1" } @@ -252,7 +252,7 @@ resource "aws_flow_log" "vpcflowlogs" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "cf63bd13-dfcb-4361-a9e2-8729714935c9" } @@ -270,7 +270,7 @@ resource "aws_s3_bucket" "flowbucket" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "b2b673c8-31f9-46cf-a8f5-2be454893f3b" } diff --git a/terraform/aws/ecr.tf b/terraform/aws/ecr.tf index 3873ce2fe9..89b454c087 100644 --- a/terraform/aws/ecr.tf +++ b/terraform/aws/ecr.tf @@ -9,7 +9,7 @@ resource aws_ecr_repository "repository" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "62b4c542-6734-4fa4-83b1-bc7f0cc26332" } diff --git a/terraform/aws/eks.tf b/terraform/aws/eks.tf index d51b22b965..67f9efa387 100644 --- a/terraform/aws/eks.tf +++ b/terraform/aws/eks.tf @@ -24,7 +24,7 @@ resource aws_iam_role "iam_for_eks" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "bd7adb80-641d-458c-afcb-7444f6cf62c9" } @@ -51,32 +51,32 @@ resource aws_vpc "eks_vpc" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "c8a9e1c6-7d3e-4082-bac8-4af8695b7482" } } resource aws_subnet "eks_subnet1" { - vpc_id = aws_vpc.eks_vpc.id - cidr_block = "10.10.10.0/24" - availability_zone = var.availability_zone - map_public_ip_on_launch = true + vpc_id = aws_vpc.eks_vpc.id + cidr_block = "10.10.10.0/24" + availability_zone = var.availability_zone tags = { Name = "${local.resource_prefix.value}-eks-subnet" "kubernetes.io/cluster/${local.eks_name.value}" = "shared" - git_commit = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0" + git_commit = "8c608edf4fea35ebb32c7d1e7060fd2e05e8a56d" git_file = "terraform/aws/eks.tf" - git_last_modified_at = "2020-06-16 14:46:24" - git_last_modified_by = "nimrodkor@gmail.com" - git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_last_modified_at = "2021-11-16 14:28:20" + git_last_modified_by = "phimmasone@gmail.com" + git_modifiers = "nimrodkor/phimmasone" + git_org = "phimm-hub" git_repo = "terragoat" "kubernetes.io/cluster/$${local.eks_name.value}" = "shared" yor_trace = "52b1253b-b6b6-4f12-8537-e37996f2064b" } } + resource aws_subnet "eks_subnet2" { vpc_id = aws_vpc.eks_vpc.id cidr_block = "10.10.11.0/24" @@ -90,7 +90,7 @@ resource aws_subnet "eks_subnet2" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" "kubernetes.io/cluster/$${local.eks_name.value}" = "shared" yor_trace = "76599b94-8cbc-430e-9dd5-92efeda9cea1" @@ -116,7 +116,7 @@ resource aws_eks_cluster "eks_cluster" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "939faa1c-a25b-4d31-ad75-b713c840fe87" } @@ -129,3 +129,4 @@ output "endpoint" { output "kubeconfig-certificate-authority-data" { value = "${aws_eks_cluster.eks_cluster.certificate_authority.0.data}" } +#fortim \ No newline at end of file diff --git a/terraform/aws/elb.tf b/terraform/aws/elb.tf index 12eca4f50a..cac4317609 100644 --- a/terraform/aws/elb.tf +++ b/terraform/aws/elb.tf @@ -32,7 +32,7 @@ resource "aws_elb" "weblb" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "9a19ccdb-03ff-4893-9063-75a03294b33a" } diff --git a/terraform/aws/es.tf b/terraform/aws/es.tf index e62edc5493..12f26e13d3 100644 --- a/terraform/aws/es.tf +++ b/terraform/aws/es.tf @@ -20,7 +20,7 @@ resource "aws_elasticsearch_domain" "monitoring-framework" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "118fd7f8-b3d7-43d9-b418-7dd16a646a4c" } diff --git a/terraform/aws/iam.tf b/terraform/aws/iam.tf index 334949c5e9..0efcda5f51 100644 --- a/terraform/aws/iam.tf +++ b/terraform/aws/iam.tf @@ -10,7 +10,7 @@ resource "aws_iam_user" "user" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "f9d81ed3-9207-49f5-8761-f3bde6bdb125" } diff --git a/terraform/aws/kms.tf b/terraform/aws/kms.tf index a75b6c9f4e..de1e2293d1 100644 --- a/terraform/aws/kms.tf +++ b/terraform/aws/kms.tf @@ -9,7 +9,7 @@ resource "aws_kms_key" "logs_key" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "651492b6-4d42-4633-a9ce-3b9be25b9152" } @@ -33,7 +33,7 @@ resource "aws_kms_key" "customer_key" { git_last_modified_at = "2020-12-08 22:29:14" git_last_modified_by = "schosterbarak@gmail.com" git_modifiers = "mike/schosterbarak" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "5fbd52d8-2726-4d86-afaf-836296566d69" } diff --git a/terraform/aws/lambda.tf b/terraform/aws/lambda.tf index c06c647c8f..71aa349218 100644 --- a/terraform/aws/lambda.tf +++ b/terraform/aws/lambda.tf @@ -22,7 +22,7 @@ EOF git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "25847052-213e-4654-9000-c57924a6ad04" } @@ -51,7 +51,7 @@ resource "aws_lambda_function" "analysis_lambda" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "611e7f1a-047c-4b66-9028-39dd298833b4" } diff --git a/terraform/aws/modules/security_group/main.tf b/terraform/aws/modules/security_group/main.tf index 59ce4cbb53..a1595ea53d 100644 --- a/terraform/aws/modules/security_group/main.tf +++ b/terraform/aws/modules/security_group/main.tf @@ -27,7 +27,7 @@ resource "aws_security_group" "sg" { git_last_modified_at = "2020-12-02 20:40:15" git_last_modified_by = "mike@bridgecrew.io" git_modifiers = "mike" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "02dd6ff5-f153-4c6d-bc14-24ca7414b0b4" } diff --git a/terraform/aws/s3.tf b/terraform/aws/s3.tf index eacc83d46f..bc093c99c7 100644 --- a/terraform/aws/s3.tf +++ b/terraform/aws/s3.tf @@ -14,7 +14,7 @@ resource "aws_s3_bucket" "data" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "fc8c2d7a-1997-4fc2-95c1-277cba5c2a38" } @@ -35,7 +35,7 @@ resource "aws_s3_bucket_object" "data_object" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "b77af90c-712d-4209-90ad-d46815ab3eb7" } @@ -56,7 +56,7 @@ resource "aws_s3_bucket" "financials" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "cecbef60-a2ea-4710-9d45-b865340e6095" } @@ -80,7 +80,7 @@ resource "aws_s3_bucket" "operations" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "e62dfbc0-cc44-408b-a26a-13938d22e2f0" } @@ -105,7 +105,7 @@ resource "aws_s3_bucket" "data_science" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "25565a41-2c9e-45f2-a9e9-6c15b7afcfb6" } @@ -134,7 +134,7 @@ resource "aws_s3_bucket" "logs" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "ce72f84f-4cb6-4f67-b540-54d7e998df19" } diff --git a/terraform/azure/aks.tf b/terraform/azure/aks.tf index 8280afa8c5..146cdc496a 100644 --- a/terraform/azure/aks.tf +++ b/terraform/azure/aks.tf @@ -28,7 +28,7 @@ resource azurerm_kubernetes_cluster "k8s_cluster" { git_last_modified_at = "2020-06-17 12:59:55" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "f25ff168-9614-4205-96d4-f212a22cabbb" } diff --git a/terraform/azure/app_service.tf b/terraform/azure/app_service.tf index f65c2b81ef..6318248770 100644 --- a/terraform/azure/app_service.tf +++ b/terraform/azure/app_service.tf @@ -13,7 +13,7 @@ resource azurerm_app_service_plan "example" { git_last_modified_at = "2020-06-17 12:59:55" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "f5871797-060b-42c1-a95e-f9090b56ed77" } @@ -34,7 +34,7 @@ resource azurerm_app_service "app-service1" { git_last_modified_at = "2020-06-19 21:14:50" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "20163505-c921-43bf-a6ce-4dbcf50a4406" } @@ -56,7 +56,7 @@ resource azurerm_app_service "app-service2" { git_last_modified_at = "2020-06-19 21:14:50" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "1c004765-6fe5-4bcb-9035-553f46ad4bb4" } diff --git a/terraform/azure/instance.tf b/terraform/azure/instance.tf index 8e0fbc2dd1..38314b5553 100644 --- a/terraform/azure/instance.tf +++ b/terraform/azure/instance.tf @@ -34,7 +34,7 @@ resource azurerm_linux_virtual_machine "linux_machine" { git_last_modified_at = "2020-06-17 15:48:15" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "3ae2e82f-bde6-4915-bcd7-9c42a405de73" } @@ -68,7 +68,7 @@ resource azurerm_windows_virtual_machine "windows_machine" { git_last_modified_at = "2020-06-17 15:48:15" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "47c19e97-e3aa-4463-b1c0-b0c29a20f3cf" } diff --git a/terraform/azure/key_vault.tf b/terraform/azure/key_vault.tf index 4a4c621061..eb47c66d67 100644 --- a/terraform/azure/key_vault.tf +++ b/terraform/azure/key_vault.tf @@ -23,7 +23,7 @@ resource "azurerm_key_vault" "example" { git_last_modified_at = "2020-06-19 21:14:50" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "8755a006-6548-499b-839c-15e218556f94" } @@ -48,7 +48,7 @@ resource "azurerm_key_vault_key" "generated" { git_last_modified_at = "2020-06-17 12:59:55" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "f6bae3fd-c0c8-4b88-8395-28f9a3d6ec79" } @@ -64,7 +64,7 @@ resource "azurerm_key_vault_secret" "secret" { git_last_modified_at = "2020-06-19 21:16:08" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "3ec84e55-c2f6-41c5-a136-44a1e61107c7" } diff --git a/terraform/azure/networking.tf b/terraform/azure/networking.tf index 1a03ec1323..4345c2d1ba 100644 --- a/terraform/azure/networking.tf +++ b/terraform/azure/networking.tf @@ -9,7 +9,7 @@ resource "azurerm_virtual_network" "example" { git_last_modified_at = "2020-06-17 12:59:55" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "6e4b4d6f-e827-4c74-8375-217e82f0c42a" } @@ -38,7 +38,7 @@ resource "azurerm_network_interface" "ni_linux" { git_last_modified_at = "2020-06-17 15:48:15" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "c193559b-d423-4123-b54b-3ee74a2fb3f0" } @@ -60,7 +60,7 @@ resource "azurerm_network_interface" "ni_win" { git_last_modified_at = "2020-06-17 15:48:15" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "dab0d80e-252a-441b-b4f5-dae6f1baf23e" } @@ -95,12 +95,12 @@ resource azurerm_network_security_group "bad_sg" { destination_address_prefix = "*" } tags = { - git_commit = "898d5beaec7ffdef6df0d7abecff407362e2a74e" + git_commit = "de3bb777f967989c2c3332faea16cb614c55ccc9" git_file = "terraform/azure/networking.tf" - git_last_modified_at = "2020-06-17 12:59:55" + git_last_modified_at = "2020-06-17 15:48:15" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "b013aa2c-a9de-445c-a155-809d952235a2" } @@ -116,7 +116,7 @@ resource azurerm_network_watcher "network_watcher" { git_last_modified_at = "2020-06-17 12:59:55" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "06cc0461-37df-40b6-bb07-1dc931944ec0" } @@ -132,4 +132,14 @@ resource azurerm_network_watcher_flow_log "flow_log" { enabled = false days = 10 } + tags = { + git_commit = "898d5beaec7ffdef6df0d7abecff407362e2a74e" + git_file = "terraform/azure/networking.tf" + git_last_modified_at = "2020-06-17 12:59:55" + git_last_modified_by = "nimrodkor@gmail.com" + git_modifiers = "nimrodkor" + git_org = "phimm-hub" + git_repo = "terragoat" + yor_trace = "5c9213c6-bf67-4b53-aaea-a4b24514a9e4" + } } \ No newline at end of file diff --git a/terraform/azure/resource_group.tf b/terraform/azure/resource_group.tf index 4220701070..22f0da9ac5 100644 --- a/terraform/azure/resource_group.tf +++ b/terraform/azure/resource_group.tf @@ -7,7 +7,7 @@ resource "azurerm_resource_group" "example" { git_last_modified_at = "2020-06-16 14:46:24" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "6bd7ed71-a0c1-4fa5-9c1e-69919579994b" } diff --git a/terraform/azure/sql.tf b/terraform/azure/sql.tf index 5e3f04c4e2..7e5516213b 100644 --- a/terraform/azure/sql.tf +++ b/terraform/azure/sql.tf @@ -21,7 +21,7 @@ resource "azurerm_sql_server" "example" { git_last_modified_at = "2020-06-19 21:14:50" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "21c91803-d96d-4147-be87-7f08cda88864" } @@ -63,7 +63,7 @@ resource "azurerm_mysql_server" "example" { git_last_modified_at = "2020-06-19 21:14:50" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "3f28ffc5-e9e7-4830-8779-031e52933166" } @@ -88,7 +88,7 @@ resource "azurerm_postgresql_server" "example" { git_last_modified_at = "2020-06-19 21:14:50" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "e5dfc9ef-49de-4e8a-a61e-fad7cc4844b6" } diff --git a/terraform/azure/storage.tf b/terraform/azure/storage.tf index 1c0f556ed0..40f6e24935 100644 --- a/terraform/azure/storage.tf +++ b/terraform/azure/storage.tf @@ -9,12 +9,12 @@ resource "azurerm_managed_disk" "example" { enabled = false } tags = { - git_commit = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0" + git_commit = "898d5beaec7ffdef6df0d7abecff407362e2a74e" git_file = "terraform/azure/storage.tf" - git_last_modified_at = "2020-06-16 14:46:24" + git_last_modified_at = "2020-06-17 12:59:55" git_last_modified_by = "nimrodkor@gmail.com" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "414b46d1-e217-4c9c-a3e1-c41429e81a99" } @@ -53,7 +53,7 @@ resource "azurerm_storage_account" "example" { git_last_modified_at = "2020-06-19 21:14:50" git_last_modified_by = "Adin.Ermie@outlook.com" git_modifiers = "Adin.Ermie/nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "162a7bb2-53c6-41fa-bcf9-d810f493bc2f" } @@ -92,7 +92,7 @@ resource "azurerm_storage_account" "data" { git_last_modified_at = "2020-09-02 23:24:06" git_last_modified_by = "mikeurbanski1@users.noreply.github.com" git_modifiers = "mikeurbanski1" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "2b9bff69-ac76-45b9-8902-4204052c8695" } diff --git a/terraform/gcp/big_data.tf b/terraform/gcp/big_data.tf index 7a1b6a8ded..34147ad3d4 100644 --- a/terraform/gcp/big_data.tf +++ b/terraform/gcp/big_data.tf @@ -25,12 +25,12 @@ resource google_bigquery_dataset "dataset" { role = "READER" } labels = { - git_commit = "83661b5e88dd3768c10dbcfa2050c04d85b62fa8" - git_file = "terraform/gcp/big_data.tf" - git_last_modified_at = "2020-07-09 13:34:36" - git_last_modified_by = "nimrodkor@gmail.com" + git_commit = "37914a45800114d263c0dcd74b81b9dd01307e13" + git_file = "terraform__gcp__big_data_tf" + git_last_modified_at = "2020-07-09-13-43-30" + git_last_modified_by = "nimrodkor" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "2e0da432-edec-4ccf-9017-a1dd63a1f8db" } diff --git a/terraform/gcp/gcs.tf b/terraform/gcp/gcs.tf index 60e95dd43c..7895a12108 100644 --- a/terraform/gcp/gcs.tf +++ b/terraform/gcp/gcs.tf @@ -3,11 +3,11 @@ resource "google_storage_bucket" "terragoat_website" { force_destroy = true labels = { git_commit = "ff3ee8387837a499665630ebb0371be39ce35fb6" - git_file = "terraform/gcp/gcs.tf" - git_last_modified_at = "2020-07-08 12:02:14" - git_last_modified_by = "nimrodkor@gmail.com" + git_file = "terraform__gcp__gcs_tf" + git_last_modified_at = "2020-07-08-12-02-14" + git_last_modified_by = "nimrodkor" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "6b4a2e7a-c149-4082-91de-72ea665ce0ac" } @@ -24,11 +24,11 @@ resource "google_storage_bucket" "internal_storage" { force_destroy = true labels = { git_commit = "14c8868a3a13d0c92540595862543e3050df6248" - git_file = "terraform/gcp/gcs.tf" - git_last_modified_at = "2020-07-30 15:31:05" - git_last_modified_by = "mikeurbanski1@users.noreply.github.com" + git_file = "terraform__gcp__gcs_tf" + git_last_modified_at = "2020-07-30-15-31-05" + git_last_modified_by = "mikeurbanski1" git_modifiers = "mikeurbanski1" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "8fb535d3-d75b-4557-8f1c-8260b7bc9230" } diff --git a/terraform/gcp/instances.tf b/terraform/gcp/instances.tf index 182836aa86..fc26a5e123 100644 --- a/terraform/gcp/instances.tf +++ b/terraform/gcp/instances.tf @@ -23,11 +23,11 @@ resource google_compute_instance "server" { } labels = { git_commit = "37914a45800114d263c0dcd74b81b9dd01307e13" - git_file = "terraform/gcp/instances.tf" - git_last_modified_at = "2020-07-09 13:43:30" - git_last_modified_by = "nimrodkor@gmail.com" + git_file = "terraform__gcp__instances_tf" + git_last_modified_at = "2020-07-09-13-43-30" + git_last_modified_by = "nimrodkor" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "f3b60229-9824-4961-bc87-3365958badb4" } @@ -37,11 +37,11 @@ resource google_compute_disk "unencrypted_disk" { name = "terragoat-${var.environment}-disk" labels = { git_commit = "83661b5e88dd3768c10dbcfa2050c04d85b62fa8" - git_file = "terraform/gcp/instances.tf" - git_last_modified_at = "2020-07-09 13:34:36" - git_last_modified_by = "nimrodkor@gmail.com" + git_file = "terraform__gcp__instances_tf" + git_last_modified_at = "2020-07-09-13-34-36" + git_last_modified_by = "nimrodkor" git_modifiers = "nimrodkor" - git_org = "try-bridgecrew" + git_org = "phimm-hub" git_repo = "terragoat" yor_trace = "db914048-2ec8-4c0f-b081-1a71588b80eb" }