Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

commit for jeff #648

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

commit for jeff #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
53735cc
test
phimm-hub Nov 15, 2021
2d0c7fc
update yor.yml
phimm-hub Nov 15, 2021
0806403
asdf
phimm-hub Nov 15, 2021
09ce793
Merge branch 'master' of https://github.com/phimm-hub/terragoat
phimm-hub Nov 15, 2021
1645094
asdf
phimm-hub Nov 15, 2021
148153d
asdff
phimm-hub Nov 15, 2021
5fc2bea
Update tags (by Yor)
github-actions[bot] Nov 15, 2021
8c608ed
asdfdsf
phimm-hub Nov 16, 2021
d8c7075
Merge branch 'master' of https://github.com/phimm-hub/terragoat
phimm-hub Nov 16, 2021
0b8e0e8
Update tags (by Yor)
github-actions[bot] Nov 16, 2021
e40d818
testcommit
phimm-hub Apr 5, 2022
5b01b43
Merge branch 'master' of https://github.com/phimm-hub/terragoat
phimm-hub Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .github/workflows/Yor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
1 change: 1 addition & 0 deletions phimm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#phimm
30 changes: 30 additions & 0 deletions terraform-aws-ec2-bastion-server-master/examples/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "[email protected]"
git_modifiers = "68634672+guyeisenkot"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "c2656435-f988-49b8-8176-6406bb993580"
}
}

module "subnets" {
Expand All @@ -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 = "[email protected]"
git_modifiers = "68634672+guyeisenkot"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "e6094d2b-be55-4517-9ae4-af4d527ec31d"
}
}

module "aws_key_pair" {
Expand All @@ -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 = "[email protected]"
git_modifiers = "68634672+guyeisenkot"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "29babf3b-4316-433f-8af5-6024ebf38500"
}
}

module "ec2_bastion" {
Expand Down
16 changes: 8 additions & 8 deletions terraform/aws/db-app.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ resource "aws_db_instance" "default" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "fbcbf0b9-8ede-4eb1-bdc1-7d5abcb42881"
}
Expand All @@ -53,7 +53,7 @@ resource "aws_db_option_group" "default" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "fc499810-8ac3-4807-bd72-8d55904a02e8"
}
Expand Down Expand Up @@ -84,7 +84,7 @@ resource "aws_db_parameter_group" "default" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "d729e4b9-f8bc-4d0d-81f4-c226191ad170"
}
Expand All @@ -103,7 +103,7 @@ resource "aws_db_subnet_group" "default" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "3ac7f6bf-120a-496c-9028-2638b399e8b6"
}
Expand All @@ -121,7 +121,7 @@ resource "aws_security_group" "default" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "f8a42a90-11ea-42e1-8f25-aa0375ff1632"
}
Expand Down Expand Up @@ -156,7 +156,7 @@ resource "aws_iam_instance_profile" "ec2profile" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "a9e84db7-31c4-4440-a474-2802c7181967"
}
Expand Down Expand Up @@ -190,7 +190,7 @@ EOF
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "ee26bbfe-daea-4177-8be8-b15279a21401"
}
Expand Down Expand Up @@ -398,7 +398,7 @@ EOF
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "b3b25ba1-64e2-46d9-a359-49848c7d43ed"
}
Expand Down
24 changes: 12 additions & 12 deletions terraform/aws/ec2.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ EOF
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "cff9836a-83cb-4449-80fb-708d70c3d82f"
}
Expand All @@ -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 = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "39317050-34d5-449d-a9fc-818eb1774f33"
}
Expand All @@ -59,7 +59,7 @@ resource "aws_ebs_snapshot" "example_snapshot" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "5b7df4d5-a191-4369-aca3-b2138d439a18"
}
Expand Down Expand Up @@ -105,7 +105,7 @@ resource "aws_security_group" "web-node" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "9b1c81bd-21c2-469e-bc39-80a54aad8888"
}
Expand All @@ -122,7 +122,7 @@ resource "aws_vpc" "web_vpc" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "307d74c8-c192-43ff-ac94-898b943be6ef"
}
Expand All @@ -141,7 +141,7 @@ resource "aws_subnet" "web_subnet" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "eb2d1a82-858e-442e-b468-e48b241525b6"
}
Expand All @@ -160,7 +160,7 @@ resource "aws_subnet" "web_subnet2" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "21a68ad1-a390-4103-ae3f-7ae03a08db3a"
}
Expand All @@ -177,7 +177,7 @@ resource "aws_internet_gateway" "web_igw" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "10a101ef-338e-456d-bddd-a495a798d672"
}
Expand All @@ -193,7 +193,7 @@ resource "aws_route_table" "web_rtb" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "b9682f4c-fdc0-425b-92f2-79875e2076a2"
}
Expand Down Expand Up @@ -231,7 +231,7 @@ resource "aws_network_interface" "web-eni" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "bbdb7f22-2f8e-41f2-b16a-620f132f2dd1"
}
Expand All @@ -252,7 +252,7 @@ resource "aws_flow_log" "vpcflowlogs" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "cf63bd13-dfcb-4361-a9e2-8729714935c9"
}
Expand All @@ -270,7 +270,7 @@ resource "aws_s3_bucket" "flowbucket" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "b2b673c8-31f9-46cf-a8f5-2be454893f3b"
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/aws/ecr.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource aws_ecr_repository "repository" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "62b4c542-6734-4fa4-83b1-bc7f0cc26332"
}
Expand Down
27 changes: 14 additions & 13 deletions terraform/aws/eks.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "bd7adb80-641d-458c-afcb-7444f6cf62c9"
}
Expand All @@ -51,32 +51,32 @@ resource aws_vpc "eks_vpc" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
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"
Expand All @@ -90,7 +90,7 @@ resource aws_subnet "eks_subnet2" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
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"
Expand All @@ -116,7 +116,7 @@ resource aws_eks_cluster "eks_cluster" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "939faa1c-a25b-4d31-ad75-b713c840fe87"
}
Expand All @@ -129,3 +129,4 @@ output "endpoint" {
output "kubeconfig-certificate-authority-data" {
value = "${aws_eks_cluster.eks_cluster.certificate_authority.0.data}"
}
#fortim
2 changes: 1 addition & 1 deletion terraform/aws/elb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ resource "aws_elb" "weblb" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "9a19ccdb-03ff-4893-9063-75a03294b33a"
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/aws/es.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ resource "aws_elasticsearch_domain" "monitoring-framework" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "118fd7f8-b3d7-43d9-b418-7dd16a646a4c"
}
Expand Down
2 changes: 1 addition & 1 deletion terraform/aws/iam.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_iam_user" "user" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "f9d81ed3-9207-49f5-8761-f3bde6bdb125"
}
Expand Down
4 changes: 2 additions & 2 deletions terraform/aws/kms.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resource "aws_kms_key" "logs_key" {
git_last_modified_at = "2020-06-16 14:46:24"
git_last_modified_by = "[email protected]"
git_modifiers = "nimrodkor"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "651492b6-4d42-4633-a9ce-3b9be25b9152"
}
Expand All @@ -33,7 +33,7 @@ resource "aws_kms_key" "customer_key" {
git_last_modified_at = "2020-12-08 22:29:14"
git_last_modified_by = "[email protected]"
git_modifiers = "mike/schosterbarak"
git_org = "try-bridgecrew"
git_org = "phimm-hub"
git_repo = "terragoat"
yor_trace = "5fbd52d8-2726-4d86-afaf-836296566d69"
}
Expand Down
Loading