diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..455993f
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/Com traducao.yml b/.github/workflows/Com traducao.yml
new file mode 100644
index 0000000..18159b9
--- /dev/null
+++ b/.github/workflows/Com traducao.yml	
@@ -0,0 +1,125 @@
+name: Resultados_PTBR
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+jobs:
+  Download_Wrapper:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Veracode Pipeline Scan
+        run: |
+          curl -sSO https://tools.veracode.com/integrations/API-Wrappers/C%23/bin/VeracodeC%23API.zip
+          unzip VeracodeC%23API.zip
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: WrapperVeracode
+          path: VeracodeC#API.exe
+
+  Download_XML:
+    runs-on: windows-latest
+    needs: Download_Wrapper
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: WrapperVeracode
+      - name: Download XML
+        env:
+          veracodeID: ${{ secrets.VID }}
+          veracodeAPIkey: ${{ secrets.VKEY }}
+        run: |
+          # Recebe as infos
+          [xml]$INFO = $(.\VeracodeC#API.exe -vid "$veracodeID" -vkey "$veracodeAPIkey" -action GetAppList | Select-String -Pattern 'Github Actions - IGDEXE/NodeGoat-JS')
+          $appID = $INFO.app.app_id
+          [string]$INFO = .\VeracodeC#API.exe -vid $veracodeID -vkey $veracodeAPIkey -action GetAppBuilds -appid "$appID"
+          [xml]$INFO = $INFO.Replace(' xmlns=', ' _xmlns=')
+          $buildINFO = $INFO.SelectSingleNode("//application[@app_id='$appId']")
+          $buildID = $buildINFO.build.build_id
+          # Gera o relatorio
+          $out = .\VeracodeC#API.exe -vid $veracodeID -vkey $veracodeAPIkey -action detailedreport -buildid "$buildID" -outputfilepath "${{ github.run_id }}.xml"
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: WrapperVeracode
+          path: ${{ github.run_id }}.xml
+
+  Resultados:
+    runs-on: windows-latest
+    needs: Download_XML
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      
+      - name: Resultado do Scan
+        run: |
+          function Traduzir {
+              param (
+                  [parameter(position=0,Mandatory=$True)]
+                  $texto,
+                  [parameter(position=1)]
+                  $idiomaAlvo = "pt"
+              )
+
+              # Utiliza a API do Google para traduzir
+              Try {
+                  $Uri = “https://translate.googleapis.com/translate_a/single?client=gtx&sl=auto&tl=$($idiomaAlvo)&dt=t&q=$texto”
+                  $Response = Invoke-RestMethod -Uri $Uri -Method Get
+                  # Retorna o valor traduzido
+                  $traducao = $Response[0].SyncRoot | foreach { $_[0] }
+                  return $traducao
+              }
+              Catch {
+                  # Recebe o erro
+                  $ErrorMessage = $_.Exception.Message # Recebe o erro
+                  # Exibe a mensagem de erro
+                  Write-Host "Erro ao traduzir"
+                  Write-host $ErrorMessage
+              }
+          }
+
+          # Recebendo informacoes
+          $securityINFO = [xml](Get-Content "${{ github.run_id }}.xml")
+          $notaLetra = $securityINFO.detailedreport.'static-analysis'.rating
+          $notaScore = $securityINFO.detailedreport.'static-analysis'.score
+          $veracodeAppName = $securityINFO.detailedreport.app_name
+          $numeroVersao = $securityINFO.detailedreport.version
+          $appID = $securityINFO.detailedreport.app_id
+          $quemEnviou = $securityINFO.detailedreport.submitter
+          $politica = $securityINFO.detailedreport.policy_name
+          $complicanceStatus = $securityINFO.detailedreport.policy_compliance_status
+          # Exibe os resultados
+          Write-Host "Resultado do Scan: $numeroVersao"
+          Write-Host "Nome App: $veracodeAppName - App ID: $appID"
+          Write-Host "Enviado por: $quemEnviou"
+          Write-Host "Politica: $politica"
+          Write-Host "Nota: $notaLetra - Score: $notaScore - Resultado: $complicanceStatus"
+          Write-Host "Lista dos problemas encontrados:"
+          # Recebe os leveis e reordena
+          $levels = $securityINFO.detailedreport.severity.level
+          [array]::Reverse($levels)
+          foreach ($level in $levels) {
+              Write-Host "Prioridade: $level"
+              # Recebe as informações
+              $itensCategoria = $securityINFO.detailedreport.severity[$level].category
+              foreach ($item in $itensCategoria) {
+                  $idCWE = $item.cwe.cweid
+                  $nomeCategoria = $item.categoryname
+                  $descricao = $item.desc.para.text
+                  $recomendacoes = $item.recommendations.para.text
+                  # Faz a tradução
+                  $descricao = Traduzir $descricao
+                  $recomendacoes = Traduzir $recomendacoes
+                  # Exibe o resultado
+                  Write-Host "Categoria: $nomeCategoria - ID CWE: $idCWE"
+                  Write-Host "Descrição: $descricao"
+                  Write-Host " "
+                  Write-Host "Remediação: $recomendacoes"
+                  Write-Host " "
+                  Write-Host " "
+              }
+              Write-Host "..."
+          }
diff --git a/.github/workflows/Comparativo.yml b/.github/workflows/Comparativo.yml
new file mode 100644
index 0000000..8594efe
--- /dev/null
+++ b/.github/workflows/Comparativo.yml
@@ -0,0 +1,71 @@
+name: Comparativo
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Empacotamento dos arquivos
+        uses: thedoctor0/zip-release@master
+        with:
+          filename: 'veracode.zip'
+          path: .
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: pacoteVeracode
+          path: veracode.zip
+  
+  Veracode_SCA:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Veracode SCA
+        env:
+          SRCCLR_API_TOKEN: ${{ secrets.SCA }} # Lembrar de criar as credenciais no Secrets
+        run: |
+          curl -sSL 'https://download.sourceclear.com/ci.sh' | bash -s – scan --update-advisor --allow-dirty
+
+  Veracode_SAST:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
+        env:
+          VID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
+          VKEY: ${{ secrets.VKEY }}
+          AppName: Github Actions - ${{ github.repository }}
+        with:
+          vid: '$VID'
+          vkey: '$VKEY'
+          criticality: 'VeryHigh'
+          appname: '$AppName'
+          scanpollinginterval: 30
+          scantimeout: 45
+          filepath: 'veracode.zip'
+          version: ${{ github.run_id }}
+
+  Veracode_PipelineScan:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - name: Veracode Pipeline Scan
+        env:
+          VID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
+          VKEY: ${{ secrets.VKEY }}
+          CaminhoArquivo: './veracode.zip'
+        run: |
+          curl -sSO https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
+          unzip pipeline-scan-LATEST.zip
+          java -jar pipeline-scan.jar -vid $VID -vkey $VKEY -f $CaminhoArquivo --issue_details true
diff --git a/.github/workflows/Default.yml b/.github/workflows/Default.yml
deleted file mode 100644
index f7a337a..0000000
--- a/.github/workflows/Default.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-name: Default
-on:
-  push:
-    branches: [ master ]
-  workflow_dispatch:
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Use Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: '12.x'
-
-    - name: Archive Release
-      uses: thedoctor0/zip-release@master
-      with:
-        filename: 'veracode.zip'
-        path: .
-
-    - uses: actions/setup-java@v1 # Make java accessible on path so the uploadandscan action can run.
-      with:
-        java-version: '8'
-
-    - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
-      env:
-        VID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-        VKEY: ${{ secrets.VKEY }}
-        AppName: Github Actions - ${{ github.repository }}
-      with:
-        vid: '$VID'
-        vkey: '$VKEY'
-        criticality: 'VeryHigh'
-        appname: '$AppName'
-        createprofile: true
-        filepath: 'veracode.zip'
-        deleteIncompleteScan: false
-        version: ${{ github.run_id }}
-
-    - name: Veracode SCA
-      env:
-        SRCCLR_API_TOKEN: ${{ secrets.SCA }} # Lembrar de criar as credenciais no Secrets
-      run: |
-        curl -sSL 'https://download.sourceclear.com/ci.sh' | bash -s scan --update-advisor
-
-    - name: build
-      run: npm build
-    
-    - name: Veracode Pipeline Scan
-      env:
-        VID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-        VKEY: ${{ secrets.VKEY }}
-        CaminhoArquivo: 'veracode.zip'
-      run: |
-        curl -sSO https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
-        unzip -o pipeline-scan-LATEST.zip
-        java -jar pipeline-scan.jar -vid $VID -vkey $VKEY -f $CaminhoArquivo --issue_details true
diff --git a/.github/workflows/PipelineIdeal.yml b/.github/workflows/PipelineIdeal.yml
index 0879adb..780ef51 100644
--- a/.github/workflows/PipelineIdeal.yml
+++ b/.github/workflows/PipelineIdeal.yml
@@ -8,12 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '12.x'
-      - name: Install dependencies
-        run: npm install
       - name: Empacotamento dos arquivos
         uses: thedoctor0/zip-release@master
         with:
diff --git a/.github/workflows/Veracode-Expert.yml b/.github/workflows/Veracode-Expert.yml
new file mode 100644
index 0000000..a355805
--- /dev/null
+++ b/.github/workflows/Veracode-Expert.yml
@@ -0,0 +1,104 @@
+name: Veracode_Expert
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Empacotamento dos arquivos
+        uses: thedoctor0/zip-release@master
+        with:
+          filename: 'veracode.zip'
+          path: .
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: pacoteVeracode
+          path: veracode.zip
+  
+  Veracode_SCA:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Veracode SCA
+        env:
+          SRCCLR_API_TOKEN: ${{ secrets.SCA }} # Lembrar de criar as credenciais no Secrets
+        run: |
+          curl -sSL 'https://download.sourceclear.com/ci.sh' | bash -s – scan --update-advisor --pull-request --allow-dirty
+
+  Veracode-container_iac_secrets-scan:
+    runs-on: ubuntu-latest
+    name: Veracode Container/IaC/Secrets
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Verracode Container/IaC/Secrets action step
+        uses: veracode/container_iac_secrets_scanning@v1.0.0
+        with:
+          vid: ${{ secrets.VeracodeID }}
+          vkey: ${{ secrets.VeracodeKey }}
+          command: "scan" 
+          type: "directory"
+          source: "./"
+          format: "json"
+          debug: false
+          fail_build: true
+
+  Veracode_UploadAndScan:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
+        env:
+          VeracodeID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VeracodeKey: ${{ secrets.VeracodeKey }}
+          AppName: Github Actions - ${{ github.repository }}
+        with:
+          vid: '$VeracodeID'
+          vkey: '$VeracodeKey'
+          criticality: 'VeryHigh'
+          appname: '$AppName'
+          createsandbox: true
+          filepath: 'veracode.zip'
+          deleteIncompleteScan: false
+          version: ${{ github.run_id }}
+
+  Veracode_PipelineScan:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - name: Veracode Pipeline Scan
+        continue-on-error: true
+        env:
+          VID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VKEY: ${{ secrets.VeracodeKey }}
+          CaminhoArquivo: './veracode.zip'
+        run: |
+          curl -sSO https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
+          unzip pipeline-scan-LATEST.zip
+          java -jar pipeline-scan.jar -vid $VID -vkey $VKEY -f $CaminhoArquivo --issue_details true 
+      - name: Converte para o formato SARIF
+        id: convert
+        uses: Veracode/veracode-pipeline-scan-results-to-sarif@v1.0.5
+        with:
+          pipeline-results-json: results.json
+          output-results-sarif: veracode-results.sarif
+          finding-rule-level: "3:1:0"
+      - name: Publica os resultados
+        uses: github/codeql-action/upload-sarif@v2
+        with: # Path to SARIF file relative to the root of the repository
+          sarif_file: veracode-results.sarif
diff --git a/.github/workflows/Veracode-SB.yml b/.github/workflows/Veracode-SB.yml
new file mode 100644
index 0000000..75e0449
--- /dev/null
+++ b/.github/workflows/Veracode-SB.yml
@@ -0,0 +1,99 @@
+name: Veracode_SB
+on: 
+    push:
+
+jobs:
+  Package:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Empacotamento dos arquivos
+        uses: thedoctor0/zip-release@master
+        with:
+          filename: 'veracode.zip'
+          path: .
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: pacoteVeracode
+          path: veracode.zip
+  
+  Veracode_SCA:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Veracode SCA
+        env:
+          SRCCLR_API_TOKEN: ${{ secrets.SCA }} # Lembrar de criar as credenciais no Secrets
+        run: |
+          curl -sSL 'https://download.sourceclear.com/ci.sh' | bash -s – scan --update-advisor --pull-request --allow-dirty
+
+  Veracode_UploadAndScan:
+    runs-on: ubuntu-latest
+    if: ${{ github.ref == 'refs/heads/DEV' || github.ref == 'refs/heads/HMG' || github.ref == 'refs/heads/Main' }}
+    needs: Package
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
+        if: ${{ github.ref == 'refs/heads/DEV' || github.ref == 'refs/heads/HMG' }}
+        env:
+          VeracodeID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VeracodeKey: ${{ secrets.VeracodeKey }}
+          AppName: Github Actions - ${{ github.repository }}
+        with:
+          vid: '$VeracodeID'
+          vkey: '$VeracodeKey'
+          criticality: 'VeryHigh'
+          appname: '$AppName'
+          createsandbox: true
+          sandboxname: ${GITHUB_REF#refs/heads/}
+          filepath: 'veracode.zip'
+          deleteIncompleteScan: false
+          version: ${{ github.run_id }}
+      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
+        if: ${{ github.ref == 'refs/heads/Main' }}
+        env:
+          VeracodeID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VeracodeKey: ${{ secrets.VeracodeKey }}
+          AppName: Github Actions - ${{ github.repository }}
+        with:
+          vid: '$VeracodeID'
+          vkey: '$VeracodeKey'
+          criticality: 'VeryHigh'
+          appname: '$AppName'
+          filepath: 'veracode.zip'
+          deleteIncompleteScan: false
+          version: ${{ github.run_id }}
+
+  Veracode_PipelineScan:
+    runs-on: ubuntu-latest
+    needs: Package
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - name: Veracode Pipeline Scan
+        continue-on-error: true
+        env:
+          VID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VKEY: ${{ secrets.VeracodeKey }}
+          CaminhoArquivo: './veracode.zip'
+        run: |
+          curl -sSO https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
+          unzip pipeline-scan-LATEST.zip
+          java -jar pipeline-scan.jar -vid $VID -vkey $VKEY -f $CaminhoArquivo --issue_details true 
+      - name: Converte para o formato SARIF
+        id: convert
+        uses: Veracode/veracode-pipeline-scan-results-to-sarif@v1.0.5
+        with:
+          pipeline-results-json: results.json
+          output-results-sarif: veracode-results.sarif
+          finding-rule-level: "3:1:0"
+      - name: Publica os resultados
+        uses: github/codeql-action/upload-sarif@v2
+        with: # Path to SARIF file relative to the root of the repository
+          sarif_file: veracode-results.sarif
\ No newline at end of file
diff --git a/.github/workflows/Veracode-XGH.yml b/.github/workflows/Veracode-XGH.yml
new file mode 100644
index 0000000..cc07bb4
--- /dev/null
+++ b/.github/workflows/Veracode-XGH.yml
@@ -0,0 +1,71 @@
+name: Veracode_GoHorse
+on:
+  push
+
+jobs:
+  Package:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Empacotamento dos arquivos
+        uses: thedoctor0/zip-release@master
+        with:
+          filename: 'veracode.zip'
+          path: .
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: pacoteVeracode
+          path: veracode.zip
+  
+  Veracode_SCA:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Veracode SCA
+        env:
+          SRCCLR_API_TOKEN: ${{ secrets.SCA }} # Lembrar de criar as credenciais no Secrets
+        run: |
+          curl -sSL 'https://download.sourceclear.com/ci.sh' | bash -s – scan --update-advisor --pull-request --allow-dirty
+
+  Veracode_UploadAndScan:
+    runs-on: ubuntu-latest
+    needs: Package
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
+        env:
+          VeracodeID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VeracodeKey: ${{ secrets.VeracodeKey }}
+          AppName: ${{ github.repository }}
+        with:
+          vid: '$VeracodeID'
+          vkey: '$VeracodeKey'
+          criticality: 'VeryHigh'
+          appname: '$AppName'
+          filepath: 'veracode.zip'
+          deleteIncompleteScan: true
+          scanallnonfataltoplevelmodules: true
+          includenewmodules: true
+          version: ${{ github.run_id }}
+
+  Veracode_PipelineScan:
+    runs-on: ubuntu-latest
+    needs: Package
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - name: Veracode Pipeline Scan
+        env:
+          VID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VKEY: ${{ secrets.VeracodeKey }}
+          CaminhoArquivo: './veracode.zip'
+        run: |
+          curl -sSO https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
+          unzip pipeline-scan-LATEST.zip
+          java -jar pipeline-scan.jar -vid $VID -vkey $VKEY -f $CaminhoArquivo --issue_details true 
\ No newline at end of file
diff --git a/.github/workflows/allTools.yml b/.github/workflows/allTools.yml
deleted file mode 100644
index 39b4c2c..0000000
--- a/.github/workflows/allTools.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-name: All-Tools
-
-on:
-  push:
-    branches: [ master ]
-
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '12.x'
-      - name: Install dependencies
-        run: npm install
-      - name: Empacotamento dos arquivos
-        uses: thedoctor0/zip-release@master
-        with:
-          filename: 'veracode.zip'
-          path: .
-      - name: Publicando Artefato
-        uses: actions/upload-artifact@v2
-        with:
-          name: pacoteVeracode
-          path: veracode.zip
-  
-  Veracode_SCA:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Veracode SCA
-        env:
-          SRCCLR_API_TOKEN: ${{ secrets.SCA }} # Lembrar de criar as credenciais no Secrets
-        run: |
-          curl -sSL 'https://download.sourceclear.com/ci.sh' | bash -s – scan --update-advisor --pull-request
-      
-  Veracode_REST_API:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Download Artefato
-        uses: actions/download-artifact@v2
-        with:
-          name: pacoteVeracode
-      - name: Veracode REST API
-        env:
-          VERACODE_ID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-          VERACODE_KEY: ${{ secrets.VKEY }}
-          veracodeAppName: Github - ${{ github.repository }}
-          CaminhoArquivo: './veracode.zip'
-        run: |
-          aut_Veracode () {
-              URLPATH=$1
-              METHOD=$2
-              NONCE="$(cat /dev/random | xxd -p | head -c 32)"
-              TS="$(($(date +%s%N)/1000))"
-              encryptedNonce=$(echo "$NONCE" | xxd -r -p | openssl dgst -sha256 -mac HMAC -macopt hexkey:$VERACODE_KEY | cut -d ' ' -f 2)
-              encryptedTimestamp=$(echo -n "$TS" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$encryptedNonce | cut -d ' ' -f 2)
-              signingKey=$(echo -n "vcode_request_version_1" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$encryptedTimestamp | cut -d ' ' -f 2)
-              DATA="id=$VERACODE_ID&host=analysiscenter.veracode.com&url=$URLPATH&method=$METHOD"
-              signature=$(echo -n "$DATA" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$signingKey | cut -d ' ' -f 2)
-              VERACODE_AUTH_HEADER="VERACODE-HMAC-SHA-256 id=$VERACODE_ID,ts=$TS,nonce=$NONCE,sig=$signature"
-          }
-          URLPATH=/api/5.0/getapplist.do
-          METHOD=GET
-          aut_Veracode $URLPATH $METHOD
-          curl -s -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -o applist.xml
-          while read -r line
-          do
-              app_name=$(echo $line | grep -Po 'app_name="\K.*?(?=")')
-              AppID=$(echo $line | grep -Po 'app_id="\K.*?(?=")')
-              if [ "$app_name" = "$veracodeAppName" ]; then 
-              break
-              fi
-          done < <(grep $veracodeAppName applist.xml)
-          URLPATH=/api/5.0/uploadfile.do
-          METHOD=POST
-          aut_Veracode $URLPATH $METHOD
-          echo "Fazendo o Upload do arquivo: $CaminhoArquivo"
-          curl -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -F "app_id=$AppID" -F "file=@$CaminhoArquivo"
-          URLPATH=/api/5.0/beginprescan.do
-          METHOD=POST
-          aut_Veracode $URLPATH $METHOD
-          echo "   "
-          echo "Iniciando o scan no perfil: $veracodeAppName ID: $AppID"
-          curl -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -F "app_id=$AppID" -F "auto_scan=true"
-
-  Veracode_Wrapper:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Download Artefato
-        uses: actions/download-artifact@v2
-        with:
-          name: pacoteVeracode
-      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
-        env:
-          VID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-          VKEY: ${{ secrets.VKEY }}
-          AppName: Github Actions - ${{ github.repository }}
-        with:
-          vid: '$VID'
-          vkey: '$VKEY'
-          criticality: 'VeryHigh'
-          appname: '$AppName'
-          createprofile: true
-          sandboxname: 'HMG'
-          createsandbox: true
-          filepath: 'veracode.zip'
-          deleteIncompleteScan: false
-          version: ${{ github.run_id }}
-  
-  Veracode_PipelineScan:
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Download Artefato
-        uses: actions/download-artifact@v2
-        with:
-          name: pacoteVeracode
-      - name: Veracode Pipeline Scan
-        env:
-          VID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-          VKEY: ${{ secrets.VKEY }}
-          CaminhoArquivo: './veracode.zip'
-        run: |
-          curl -sSO https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
-          unzip pipeline-scan-LATEST.zip
-          java -jar pipeline-scan.jar -vid $VID -vkey $VKEY -f $CaminhoArquivo
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 7dc2a3b..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-name: Pipeline-Envs
-
-on:
-  push:
-    branches: [ master ]
-
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '12.x'
-      - name: Install dependencies
-        run: npm install
-      - name: Empacotamento dos arquivos
-        uses: thedoctor0/zip-release@master
-        with:
-          filename: 'veracode.zip'
-          path: .
-      - name: Publicando Artefato
-        uses: actions/upload-artifact@v2
-        with:
-          name: pacoteVeracode
-          path: veracode.zip
-      
-  Veracode_REST_API:
-    runs-on: ubuntu-latest
-    environment:
-      name: REST
-    needs: build
-    steps:
-      - name: Download math result for job 1
-        uses: actions/download-artifact@v2
-        with:
-          name: pacoteVeracode
-      - name: Veracode REST API
-        env:
-          VERACODE_ID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-          VERACODE_KEY: ${{ secrets.VKEY }}
-          veracodeAppName: Github Actions - ${{ github.repository }}
-          CaminhoArquivo: './veracode.zip'
-        run: |
-          aut_Veracode () {
-              URLPATH=$1
-              METHOD=$2
-              NONCE="$(cat /dev/random | xxd -p | head -c 32)"
-              TS="$(($(date +%s%N)/1000))"
-              encryptedNonce=$(echo "$NONCE" | xxd -r -p | openssl dgst -sha256 -mac HMAC -macopt hexkey:$VERACODE_KEY | cut -d ' ' -f 2)
-              encryptedTimestamp=$(echo -n "$TS" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$encryptedNonce | cut -d ' ' -f 2)
-              signingKey=$(echo -n "vcode_request_version_1" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$encryptedTimestamp | cut -d ' ' -f 2)
-              DATA="id=$VERACODE_ID&host=analysiscenter.veracode.com&url=$URLPATH&method=$METHOD"
-              signature=$(echo -n "$DATA" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$signingKey | cut -d ' ' -f 2)
-              VERACODE_AUTH_HEADER="VERACODE-HMAC-SHA-256 id=$VERACODE_ID,ts=$TS,nonce=$NONCE,sig=$signature"
-          }
-          URLPATH=/api/5.0/getapplist.do
-          METHOD=GET
-          aut_Veracode $URLPATH $METHOD
-          curl -s -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -o applist.xml
-          while read -r line
-          do
-              app_name=$(echo $line | grep -Po 'app_name="\K.*?(?=")')
-              AppID=$(echo $line | grep -Po 'app_id="\K.*?(?=")')
-              if [ "$app_name" = "$veracodeAppName" ]; then 
-              break
-              fi
-          done < <(grep $veracodeAppName applist.xml)
-          URLPATH=/api/5.0/uploadfile.do
-          METHOD=POST
-          aut_Veracode $URLPATH $METHOD
-          echo "Fazendo o Upload do arquivo: $CaminhoArquivo"
-          curl -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -F "app_id=$AppID" -F "file=@$CaminhoArquivo"
-          URLPATH=/api/5.0/beginprescan.do
-          METHOD=POST
-          aut_Veracode $URLPATH $METHOD
-          echo "   "
-          echo "Iniciando o scan no perfil: $veracodeAppName ID: $AppID"
-          curl -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -F "app_id=$AppID" -F "auto_scan=true"
-
-  Veracode_Wrapper:
-    runs-on: ubuntu-latest
-    environment:
-      name: Wrapper
-    needs: build
-    steps:
-      - name: Download math result for job 1
-        uses: actions/download-artifact@v2
-        with:
-          name: pacoteVeracode
-      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
-        env:
-          VID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-          VKEY: ${{ secrets.VKEY }}
-          AppName: Github Actions - ${{ github.repository }}
-        with:
-          vid: '$VID'
-          vkey: '$VKEY'
-          criticality: 'VeryHigh'
-          appname: '$AppName'
-          createprofile: true
-          sandboxname: 'Wrapper'
-          createsandbox: true
-          filepath: 'veracode.zip'
-          deleteIncompleteScan: false
-          version: ${{ github.run_id }}
-          scantimeout: 30
diff --git a/.github/workflows/restAPI.yml b/.github/workflows/restAPI.yml
deleted file mode 100644
index edee816..0000000
--- a/.github/workflows/restAPI.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: NodeJS
-
-on:
-  push:
-    branches: [ master ]
-
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '12.x'
-      - name: Install dependencies
-        run: npm install
-
-      - name: Empacotamento dos arquivos
-        uses: thedoctor0/zip-release@master
-        with:
-          filename: 'veracode.zip'
-          path: .
-      
-      - name: Veracode REST API
-        env:
-          VERACODE_ID: ${{ secrets.VID }} # Lembrar de criar as credenciais no Secrets
-          VERACODE_KEY: ${{ secrets.VKEY }}
-          veracodeAppName: Github Actions - ${{ github.repository }}
-          CaminhoArquivo: './veracode.zip'
-        run: |
-          aut_Veracode () {
-              URLPATH=$1
-              METHOD=$2
-
-              NONCE="$(cat /dev/random | xxd -p | head -c 32)"
-              TS="$(($(date +%s%N)/1000))"
-              encryptedNonce=$(echo "$NONCE" | xxd -r -p | openssl dgst -sha256 -mac HMAC -macopt hexkey:$VERACODE_KEY | cut -d ' ' -f 2)
-              encryptedTimestamp=$(echo -n "$TS" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$encryptedNonce | cut -d ' ' -f 2)
-              signingKey=$(echo -n "vcode_request_version_1" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$encryptedTimestamp | cut -d ' ' -f 2)
-              DATA="id=$VERACODE_ID&host=analysiscenter.veracode.com&url=$URLPATH&method=$METHOD"
-              signature=$(echo -n "$DATA" | openssl dgst -sha256 -mac HMAC -macopt hexkey:$signingKey | cut -d ' ' -f 2)
-              VERACODE_AUTH_HEADER="VERACODE-HMAC-SHA-256 id=$VERACODE_ID,ts=$TS,nonce=$NONCE,sig=$signature"
-          }
-
-          URLPATH=/api/5.0/getapplist.do
-          METHOD=GET
-          aut_Veracode $URLPATH $METHOD
-          curl -s -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -o applist.xml
-
-          while read -r line
-          do
-              app_name=$(echo $line | grep -Po 'app_name="\K.*?(?=")')
-              AppID=$(echo $line | grep -Po 'app_id="\K.*?(?=")')
-              if [ "$app_name" = "$veracodeAppName" ]; then 
-              break
-              fi
-          done < <(grep $veracodeAppName applist.xml)
-
-
-          URLPATH=/api/5.0/uploadfile.do
-          METHOD=POST
-          aut_Veracode $URLPATH $METHOD
-          echo "Fazendo o Upload do arquivo: $CaminhoArquivo"
-          curl -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -F "app_id=$AppID" -F "file=@$CaminhoArquivo"
-
-          URLPATH=/api/5.0/beginprescan.do
-          METHOD=POST
-          aut_Veracode $URLPATH $METHOD
-          echo "   "
-          echo "Iniciando o scan no perfil: $veracodeAppName ID: $AppID"
-          curl -X $METHOD -H "Authorization: $VERACODE_AUTH_HEADER" "https://analysiscenter.veracode.com$URLPATH" -F "app_id=$AppID" -F "auto_scan=true"
diff --git a/.github/workflows/veracode-basic.yml b/.github/workflows/veracode-basic.yml
new file mode 100644
index 0000000..624f14e
--- /dev/null
+++ b/.github/workflows/veracode-basic.yml
@@ -0,0 +1,44 @@
+name: Veracode_Basic
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Empacotamento dos arquivos
+        uses: thedoctor0/zip-release@master
+        with:
+          filename: 'veracode.zip'
+          path: .
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: pacoteVeracode
+          path: veracode.zip
+
+  Veracode_UploadAndScan:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
+        env:
+          VeracodeID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VeracodeKey: ${{ secrets.VeracodeKey }}
+          AppName: ${{ github.repository }}
+        with:
+          vid: '$VeracodeID'
+          vkey: '$VeracodeKey'
+          criticality: 'VeryHigh'
+          appname: '$AppName'
+          createprofile: true
+          filepath: 'veracode.zip'
+          deleteIncompleteScan: false
+          version: ${{ github.run_id }}
\ No newline at end of file
diff --git a/.github/workflows/veracode-expert.yml b/.github/workflows/veracode-expert.yml
new file mode 100644
index 0000000..a355805
--- /dev/null
+++ b/.github/workflows/veracode-expert.yml
@@ -0,0 +1,104 @@
+name: Veracode_Expert
+on:
+  push:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Empacotamento dos arquivos
+        uses: thedoctor0/zip-release@master
+        with:
+          filename: 'veracode.zip'
+          path: .
+      - name: Publicando Artefato
+        uses: actions/upload-artifact@v2
+        with:
+          name: pacoteVeracode
+          path: veracode.zip
+  
+  Veracode_SCA:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Veracode SCA
+        env:
+          SRCCLR_API_TOKEN: ${{ secrets.SCA }} # Lembrar de criar as credenciais no Secrets
+        run: |
+          curl -sSL 'https://download.sourceclear.com/ci.sh' | bash -s – scan --update-advisor --pull-request --allow-dirty
+
+  Veracode-container_iac_secrets-scan:
+    runs-on: ubuntu-latest
+    name: Veracode Container/IaC/Secrets
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Verracode Container/IaC/Secrets action step
+        uses: veracode/container_iac_secrets_scanning@v1.0.0
+        with:
+          vid: ${{ secrets.VeracodeID }}
+          vkey: ${{ secrets.VeracodeKey }}
+          command: "scan" 
+          type: "directory"
+          source: "./"
+          format: "json"
+          debug: false
+          fail_build: true
+
+  Veracode_UploadAndScan:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - uses: veracode/veracode-uploadandscan-action@master # Faz a analise da Veracode
+        env:
+          VeracodeID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VeracodeKey: ${{ secrets.VeracodeKey }}
+          AppName: Github Actions - ${{ github.repository }}
+        with:
+          vid: '$VeracodeID'
+          vkey: '$VeracodeKey'
+          criticality: 'VeryHigh'
+          appname: '$AppName'
+          createsandbox: true
+          filepath: 'veracode.zip'
+          deleteIncompleteScan: false
+          version: ${{ github.run_id }}
+
+  Veracode_PipelineScan:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Download Artefato
+        uses: actions/download-artifact@v2
+        with:
+          name: pacoteVeracode
+      - name: Veracode Pipeline Scan
+        continue-on-error: true
+        env:
+          VID: ${{ secrets.VeracodeID }} # Lembrar de criar as credenciais no Secrets
+          VKEY: ${{ secrets.VeracodeKey }}
+          CaminhoArquivo: './veracode.zip'
+        run: |
+          curl -sSO https://downloads.veracode.com/securityscan/pipeline-scan-LATEST.zip
+          unzip pipeline-scan-LATEST.zip
+          java -jar pipeline-scan.jar -vid $VID -vkey $VKEY -f $CaminhoArquivo --issue_details true 
+      - name: Converte para o formato SARIF
+        id: convert
+        uses: Veracode/veracode-pipeline-scan-results-to-sarif@v1.0.5
+        with:
+          pipeline-results-json: results.json
+          output-results-sarif: veracode-results.sarif
+          finding-rule-level: "3:1:0"
+      - name: Publica os resultados
+        uses: github/codeql-action/upload-sarif@v2
+        with: # Path to SARIF file relative to the root of the repository
+          sarif_file: veracode-results.sarif
diff --git a/terraform/alicloud/bucket.tf b/terraform/alicloud/bucket.tf
new file mode 100644
index 0000000..831f9bc
--- /dev/null
+++ b/terraform/alicloud/bucket.tf
@@ -0,0 +1,18 @@
+resource "alicloud_oss_bucket" "bad_bucket" {
+  # Public and writeable bucket 
+  # Versioning isn't enabled
+  # Not Encrypted with a Customer Master Key and no Server side encryption
+  # Doesn't have access logging enabled" 
+  bucket = "wildwestfreeforall"
+  acl    = "public-read-write"
+  tags = {
+    git_commit           = "9c114f23d311f787c137723e1f71b27a52f0adec"
+    git_file             = "terraform/alicloud/bucket.tf"
+    git_last_modified_at = "2022-04-05 15:17:55"
+    git_last_modified_by = "james.woolfenden@gmail.com"
+    git_modifiers        = "james.woolfenden"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "80373049-248d-4f5e-9d25-740c3e80f2b9"
+  }
+}
diff --git a/terraform/alicloud/provider.tf b/terraform/alicloud/provider.tf
new file mode 100644
index 0000000..955c266
--- /dev/null
+++ b/terraform/alicloud/provider.tf
@@ -0,0 +1,12 @@
+terraform {
+  required_providers {
+    alicloud = {
+      source  = "aliyun/alicloud"
+      version = "1.162.0"
+    }
+  }
+}
+
+provider "alicloud" {
+  region = "cn-hangzhou"
+}
\ No newline at end of file
diff --git a/terraform/alicloud/rds.tf b/terraform/alicloud/rds.tf
new file mode 100644
index 0000000..70660df
--- /dev/null
+++ b/terraform/alicloud/rds.tf
@@ -0,0 +1,30 @@
+resource "alicloud_db_instance" "seeme" {
+  # Is public due to Security IPS 0.0.0.0/0
+  engine           = "MySQL"
+  engine_version   = "5.6"
+  instance_type    = "rds.mysql.t1.small"
+  instance_storage = "10"
+  tde_status       = "Enabled"
+  security_ips = [
+    "0.0.0.0",
+    "10.23.12.24/24"
+  ]
+  parameters {
+    name  = "innodb_large_prefix"
+    value = "ON"
+  }
+  parameters {
+    name  = "connect_timeout"
+    value = "50"
+  }
+  tags = {
+    git_commit           = "c2ff052009d49c65e6af551eb1506abc73b5976c"
+    git_file             = "terraform/alicloud/rds.tf"
+    git_last_modified_at = "2022-04-05 15:14:28"
+    git_last_modified_by = "james.woolfenden@gmail.com"
+    git_modifiers        = "james.woolfenden"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "7bd1394e-0a79-4288-8f83-5abcca5bf1ba"
+  }
+}
diff --git a/terraform/alicloud/trail.tf b/terraform/alicloud/trail.tf
new file mode 100644
index 0000000..9e2daf8
--- /dev/null
+++ b/terraform/alicloud/trail.tf
@@ -0,0 +1,44 @@
+resource "alicloud_actiontrail_trail" "fail" {
+  # Action Trail not Logging for all regions
+  # Action Trail not Logging for all events
+  trail_name         = "action-trail"
+  oss_write_role_arn = alicloud_ram_role.trail.arn
+  oss_bucket_name    = alicloud_oss_bucket.trail.bucket
+  event_rw           = "Read"
+  trail_region       = "cn-hangzhou"
+}
+
+resource "alicloud_oss_bucket" "trail" {
+
+  tags = {
+    git_commit           = "c2ff052009d49c65e6af551eb1506abc73b5976c"
+    git_file             = "terraform/alicloud/trail.tf"
+    git_last_modified_at = "2022-04-05 15:14:28"
+    git_last_modified_by = "james.woolfenden@gmail.com"
+    git_modifiers        = "james.woolfenden"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "9ce7077b-8195-4e71-aec6-ed1f769555dc"
+  }
+}
+
+resource "alicloud_ram_role" "trail" {
+  name     = "trail"
+  document = <<EOF
+  {
+    "Statement": [
+      {
+        "Action": "sts:AssumeRole",
+        "Effect": "Allow",
+        "Principal": {
+          "Service": [
+            "actiontrail.aliyuncs.com"
+          ]
+        }
+      }
+    ],
+    "Version": "1"
+  }
+  EOF
+  force    = true
+}
\ No newline at end of file
diff --git a/terraform/aws/consts.tf b/terraform/aws/consts.tf
new file mode 100644
index 0000000..70fa8dc
--- /dev/null
+++ b/terraform/aws/consts.tf
@@ -0,0 +1,49 @@
+
+data "aws_caller_identity" "current" {}
+
+variable "company_name" {
+  default = "acme"
+}
+
+variable "environment" {
+  default = "dev"
+}
+
+locals {
+  resource_prefix = {
+    value = "${data.aws_caller_identity.current.account_id}-${var.company_name}-${var.environment}"
+  }
+}
+
+
+
+variable "profile" {
+  default = "default"
+}
+
+variable "region" {
+  default = "us-west-2"
+}
+
+variable ami {
+  type    = "string"
+  default = "ami-09a5b0b7edf08843d"
+}
+
+variable "dbname" {
+  type        = "string"
+  description = "Name of the Database"
+  default     = "db1"
+}
+
+variable "password" {
+  type        = "string"
+  description = "Database password"
+  default     = "Aa1234321Bb"
+}
+
+variable "neptune-dbname" {
+  type        = "string"
+  description = "Name of the Neptune graph database"
+  default     = "neptunedb1"
+}
\ No newline at end of file
diff --git a/terraform/aws/db-app.tf b/terraform/aws/db-app.tf
new file mode 100644
index 0000000..f0157e0
--- /dev/null
+++ b/terraform/aws/db-app.tf
@@ -0,0 +1,423 @@
+resource "aws_db_instance" "default" {
+  name                   = var.dbname
+  engine                 = "mysql"
+  option_group_name      = aws_db_option_group.default.name
+  parameter_group_name   = aws_db_parameter_group.default.name
+  db_subnet_group_name   = aws_db_subnet_group.default.name
+  vpc_security_group_ids = ["${aws_security_group.default.id}"]
+
+  identifier              = "rds-${local.resource_prefix.value}"
+  engine_version          = "8.0" # Latest major version 
+  instance_class          = "db.t3.micro"
+  allocated_storage       = "20"
+  username                = "admin"
+  password                = var.password
+  apply_immediately       = true
+  multi_az                = false
+  backup_retention_period = 0
+  storage_encrypted       = false
+  skip_final_snapshot     = true
+  monitoring_interval     = 0
+  publicly_accessible     = true
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-rds"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "47c13290-c2ce-48a7-b666-1b0085effb92"
+  })
+
+  # Ignore password changes from tf plan diff
+  lifecycle {
+    ignore_changes = ["password"]
+  }
+}
+
+resource "aws_db_option_group" "default" {
+  engine_name              = "mysql"
+  name                     = "og-${local.resource_prefix.value}"
+  major_engine_version     = "8.0"
+  option_group_description = "Terraform OG"
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-og"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "c8076043-5de7-4203-9a1c-b4e61900628a"
+  })
+}
+
+resource "aws_db_parameter_group" "default" {
+  name        = "pg-${local.resource_prefix.value}"
+  family      = "mysql8.0"
+  description = "Terraform PG"
+
+  parameter {
+    name         = "character_set_client"
+    value        = "utf8"
+    apply_method = "immediate"
+  }
+
+  parameter {
+    name         = "character_set_server"
+    value        = "utf8"
+    apply_method = "immediate"
+  }
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-pg"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "6432b3f9-3f45-4463-befc-2e0f2fbdffc1"
+  })
+}
+
+resource "aws_db_subnet_group" "default" {
+  name        = "sg-${local.resource_prefix.value}"
+  subnet_ids  = ["${aws_subnet.web_subnet.id}", "${aws_subnet.web_subnet2.id}"]
+  description = "Terraform DB Subnet Group"
+
+  tags = merge({
+    Name        = "sg-${local.resource_prefix.value}"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "b8368249-50c5-4a24-bdb0-9f83d197b11c"
+  })
+}
+
+resource "aws_security_group" "default" {
+  name   = "${local.resource_prefix.value}-rds-sg"
+  vpc_id = aws_vpc.web_vpc.id
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-rds-sg"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "7b251090-8ac1-4290-bd2e-bf3e16126430"
+  })
+}
+
+resource "aws_security_group_rule" "ingress" {
+  type              = "ingress"
+  from_port         = "3306"
+  to_port           = "3306"
+  protocol          = "tcp"
+  cidr_blocks       = ["${aws_vpc.web_vpc.cidr_block}"]
+  security_group_id = aws_security_group.default.id
+}
+
+resource "aws_security_group_rule" "egress" {
+  type              = "egress"
+  from_port         = 0
+  to_port           = 0
+  protocol          = "-1"
+  cidr_blocks       = ["0.0.0.0/0"]
+  security_group_id = "${aws_security_group.default.id}"
+}
+
+
+### EC2 instance 
+resource "aws_iam_instance_profile" "ec2profile" {
+  name = "${local.resource_prefix.value}-profile"
+  role = "${aws_iam_role.ec2role.name}"
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "6d33b2b9-2dd3-4915-b5d4-283152c928f1"
+  }
+}
+
+resource "aws_iam_role" "ec2role" {
+  name = "${local.resource_prefix.value}-role"
+  path = "/"
+
+  assume_role_policy = <<EOF
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Action": "sts:AssumeRole",
+            "Principal": {
+               "Service": "ec2.amazonaws.com"
+            },
+            "Effect": "Allow",
+            "Sid": ""
+        }
+    ]
+}
+EOF
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-role"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "d4b631c1-c1d0-4986-affb-fb8b94a6a7a5"
+  })
+}
+
+resource "aws_iam_role_policy" "ec2policy" {
+  name = "${local.resource_prefix.value}-policy"
+  role = aws_iam_role.ec2role.id
+
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": [
+        "s3:*",
+        "ec2:*",
+        "rds:*"
+      ],
+      "Effect": "Allow",
+      "Resource": "*"
+    }
+  ]
+}
+EOF
+}
+
+data "aws_ami" "amazon-linux-2" {
+  most_recent = true
+  owners      = ["amazon"]
+
+  filter {
+    name   = "owner-alias"
+    values = ["amazon"]
+  }
+
+  filter {
+    name   = "name"
+    values = ["amzn2-ami-hvm-*-x86_64-ebs"]
+  }
+}
+
+resource "aws_instance" "db_app" {
+  # ec2 have plain text secrets in user data
+  ami                  = data.aws_ami.amazon-linux-2.id
+  instance_type        = "t2.nano"
+  iam_instance_profile = aws_iam_instance_profile.ec2profile.name
+
+  vpc_security_group_ids = [
+  "${aws_security_group.web-node.id}"]
+  subnet_id = "${aws_subnet.web_subnet.id}"
+  user_data = <<EOF
+#! /bin/bash
+### Config from https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Tutorials.WebServerDB.CreateWebServer.html
+sudo yum -y update
+sudo yum -y install httpd php php-mysqlnd
+sudo systemctl enable httpd 
+sudo systemctl start httpd
+
+sudo mkdir /var/www/inc
+cat << EnD > /tmp/dbinfo.inc
+<?php
+define('DB_SERVER', '${aws_db_instance.default.endpoint}');
+define('DB_USERNAME', '${aws_db_instance.default.username}');
+define('DB_PASSWORD', '${var.password}');
+define('DB_DATABASE', '${aws_db_instance.default.name}');
+?>
+EnD
+sudo mv /tmp/dbinfo.inc /var/www/inc 
+sudo chown root:root /var/www/inc/dbinfo.inc
+
+cat << EnD > /tmp/index.php
+<?php include "../inc/dbinfo.inc"; ?>
+<html>
+<body>
+<h1>Sample page</h1>
+<?php
+
+  /* Connect to MySQL and select the database. */
+  \$connection = mysqli_connect(DB_SERVER, DB_USERNAME, DB_PASSWORD);
+
+  if (mysqli_connect_errno()) echo "Failed to connect to MySQL: " . mysqli_connect_error();
+
+  \$database = mysqli_select_db(\$connection, DB_DATABASE);
+
+  /* Ensure that the EMPLOYEES table exists. */
+  VerifyEmployeesTable(\$connection, DB_DATABASE);
+
+  /* If input fields are populated, add a row to the EMPLOYEES table. */
+  \$employee_name = htmlentities(\$_POST['NAME']);
+  \$employee_address = htmlentities(\$_POST['ADDRESS']);
+
+  if (strlen(\$employee_name) || strlen(\$employee_address)) {
+    AddEmployee(\$connection, \$employee_name, \$employee_address);
+  }
+?>
+
+<!-- Input form -->
+<form action="<?PHP echo \$_SERVER['SCRIPT_NAME'] ?>" method="POST">
+  <table border="0">
+    <tr>
+      <td>NAME</td>
+      <td>ADDRESS</td>
+    </tr>
+    <tr>
+      <td>
+        <input type="text" name="NAME" maxlength="45" size="30" />
+      </td>
+      <td>
+        <input type="text" name="ADDRESS" maxlength="90" size="60" />
+      </td>
+      <td>
+        <input type="submit" value="Add Data" />
+      </td>
+    </tr>
+  </table>
+</form>
+
+<!-- Display table data. -->
+<table border="1" cellpadding="2" cellspacing="2">
+  <tr>
+    <td>ID</td>
+    <td>NAME</td>
+    <td>ADDRESS</td>
+  </tr>
+
+<?php
+
+\$result = mysqli_query(\$connection, "SELECT * FROM EMPLOYEES");
+
+while(\$query_data = mysqli_fetch_row(\$result)) {
+  echo "<tr>";
+  echo "<td>",\$query_data[0], "</td>",
+       "<td>",\$query_data[1], "</td>",
+       "<td>",\$query_data[2], "</td>";
+  echo "</tr>";
+}
+?>
+
+</table>
+
+<!-- Clean up. -->
+<?php
+
+  mysqli_free_result(\$result);
+  mysqli_close(\$connection);
+
+?>
+
+</body>
+</html>
+
+
+<?php
+
+/* Add an employee to the table. */
+function AddEmployee(\$connection, \$name, \$address) {
+   \$n = mysqli_real_escape_string(\$connection, \$name);
+   \$a = mysqli_real_escape_string(\$connection, \$address);
+
+   \$query = "INSERT INTO EMPLOYEES (NAME, ADDRESS) VALUES ('\$n', '\$a');";
+
+   if(!mysqli_query(\$connection, \$query)) echo("<p>Error adding employee data.</p>");
+}
+
+/* Check whether the table exists and, if not, create it. */
+function VerifyEmployeesTable(\$connection, \$dbName) {
+  if(!TableExists("EMPLOYEES", \$connection, \$dbName))
+  {
+     \$query = "CREATE TABLE EMPLOYEES (
+         ID int(11) UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+         NAME VARCHAR(45),
+         ADDRESS VARCHAR(90)
+       )";
+
+     if(!mysqli_query(\$connection, \$query)) echo("<p>Error creating table.</p>");
+  }
+}
+
+/* Check for the existence of a table. */
+function TableExists(\$tableName, \$connection, \$dbName) {
+  \$t = mysqli_real_escape_string(\$connection, \$tableName);
+  \$d = mysqli_real_escape_string(\$connection, \$dbName);
+
+  \$checktable = mysqli_query(\$connection,
+      "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_NAME = '\$t' AND TABLE_SCHEMA = '\$d'");
+
+  if(mysqli_num_rows(\$checktable) > 0) return true;
+
+  return false;
+}
+?>               
+EnD
+
+sudo mv /tmp/index.php /var/www/html
+sudo chown root:root /var/www/html/index.php
+
+
+
+EOF
+  tags = merge({
+    Name = "${local.resource_prefix.value}-dbapp"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/db-app.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "f7999d4e-c983-43ee-bd88-7903a6f8483e"
+  })
+}
+
+output "db_app_public_dns" {
+  description = "DB Public DNS name"
+  value       = aws_instance.db_app.public_dns
+}
+
+output "db_endpoint" {
+  description = "DB Endpoint"
+  value       = aws_db_instance.default.endpoint
+}
+
diff --git a/terraform/aws/ec2.tf b/terraform/aws/ec2.tf
new file mode 100644
index 0000000..00e0ba9
--- /dev/null
+++ b/terraform/aws/ec2.tf
@@ -0,0 +1,308 @@
+resource "aws_instance" "web_host" {
+  # ec2 have plain text secrets in user data
+  ami           = "${var.ami}"
+  instance_type = "t2.nano"
+
+  vpc_security_group_ids = [
+  "${aws_security_group.web-node.id}"]
+  subnet_id = "${aws_subnet.web_subnet.id}"
+  user_data = <<EOF
+#! /bin/bash
+sudo apt-get update
+sudo apt-get install -y apache2
+sudo systemctl start apache2
+sudo systemctl enable apache2
+export AWS_ACCESS_KEY_ID=AKIAIOSFODNN7EXAMAAA
+export AWS_SECRET_ACCESS_KEY=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
+export AWS_DEFAULT_REGION=us-west-2
+echo "<h1>Deployed via Terraform</h1>" | sudo tee /var/www/html/index.html
+EOF
+  tags = merge({
+    Name = "${local.resource_prefix.value}-ec2"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "347af3cd-4f70-4632-aca3-4d5e30ffc0b6"
+  })
+}
+
+resource "aws_ebs_volume" "web_host_storage" {
+  # unencrypted volume
+  availability_zone = "${var.region}a"
+  #encrypted         = false  # Setting this causes the volume to be recreated on apply 
+  size = 1
+  tags = merge({
+    Name = "${local.resource_prefix.value}-ebs"
+    }, {
+    git_commit           = "d3439f0f2af62f6fa3521e14d6c27819ef8f12e1"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2021-05-02 11:17:26"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "c5509daf-10f0-46af-9e03-41989212521d"
+  })
+}
+
+resource "aws_ebs_snapshot" "example_snapshot" {
+  # ebs snapshot without encryption
+  volume_id   = "${aws_ebs_volume.web_host_storage.id}"
+  description = "${local.resource_prefix.value}-ebs-snapshot"
+  tags = merge({
+    Name = "${local.resource_prefix.value}-ebs-snapshot"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "c1008080-ec2f-4512-a0d0-2e9330aa58f0"
+  })
+}
+
+resource "aws_volume_attachment" "ebs_att" {
+  device_name = "/dev/sdh"
+  volume_id   = "${aws_ebs_volume.web_host_storage.id}"
+  instance_id = "${aws_instance.web_host.id}"
+}
+
+resource "aws_security_group" "web-node" {
+  # security group is open to the world in SSH port
+  name        = "${local.resource_prefix.value}-sg"
+  description = "${local.resource_prefix.value} Security Group"
+  vpc_id      = aws_vpc.web_vpc.id
+
+  ingress {
+    from_port = 80
+    to_port   = 80
+    protocol  = "tcp"
+    cidr_blocks = [
+    "0.0.0.0/0"]
+  }
+  ingress {
+    from_port = 22
+    to_port   = 22
+    protocol  = "tcp"
+    cidr_blocks = [
+    "0.0.0.0/0"]
+  }
+  egress {
+    from_port = 0
+    to_port   = 0
+    protocol  = "-1"
+    cidr_blocks = [
+    "0.0.0.0/0"]
+  }
+  depends_on = [aws_vpc.web_vpc]
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "b7af1b40-64eb-4519-a1a0-ab198db4b193"
+  }
+}
+
+resource "aws_vpc" "web_vpc" {
+  cidr_block           = "172.16.0.0/16"
+  enable_dns_hostnames = true
+  enable_dns_support   = true
+  tags = merge({
+    Name = "${local.resource_prefix.value}-vpc"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "9bf2359b-952e-4570-9595-52eba4c20473"
+  })
+}
+
+resource "aws_subnet" "web_subnet" {
+  vpc_id                  = aws_vpc.web_vpc.id
+  cidr_block              = "172.16.10.0/24"
+  availability_zone       = "${var.region}a"
+  map_public_ip_on_launch = true
+
+  tags = merge({
+    Name = "${local.resource_prefix.value}-subnet"
+    }, {
+    git_commit           = "6e62522d2ab8f63740e53752b84a6e99cd65696a"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2021-05-02 11:16:31"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "0345f650-d280-4ca8-86c9-c71c38c0eda8"
+  })
+}
+
+resource "aws_subnet" "web_subnet2" {
+  vpc_id                  = aws_vpc.web_vpc.id
+  cidr_block              = "172.16.11.0/24"
+  availability_zone       = "${var.region}b"
+  map_public_ip_on_launch = true
+
+  tags = merge({
+    Name = "${local.resource_prefix.value}-subnet2"
+    }, {
+    git_commit           = "6e62522d2ab8f63740e53752b84a6e99cd65696a"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2021-05-02 11:16:31"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "224af03a-00e0-4981-be30-14965833c2db"
+  })
+}
+
+
+resource "aws_internet_gateway" "web_igw" {
+  vpc_id = aws_vpc.web_vpc.id
+
+  tags = merge({
+    Name = "${local.resource_prefix.value}-igw"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "d8e63cb4-2fb5-4726-9c86-5fd05ef03674"
+  })
+}
+
+resource "aws_route_table" "web_rtb" {
+  vpc_id = aws_vpc.web_vpc.id
+
+  tags = merge({
+    Name = "${local.resource_prefix.value}-rtb"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "5e4fee6e-a6aa-4b61-a741-47c5efb463e1"
+  })
+}
+
+resource "aws_route_table_association" "rtbassoc" {
+  subnet_id      = aws_subnet.web_subnet.id
+  route_table_id = aws_route_table.web_rtb.id
+}
+
+resource "aws_route_table_association" "rtbassoc2" {
+  subnet_id      = aws_subnet.web_subnet2.id
+  route_table_id = aws_route_table.web_rtb.id
+}
+
+resource "aws_route" "public_internet_gateway" {
+  route_table_id         = aws_route_table.web_rtb.id
+  destination_cidr_block = "0.0.0.0/0"
+  gateway_id             = aws_internet_gateway.web_igw.id
+
+  timeouts {
+    create = "5m"
+  }
+}
+
+
+resource "aws_network_interface" "web-eni" {
+  subnet_id   = aws_subnet.web_subnet.id
+  private_ips = ["172.16.10.100"]
+
+  tags = merge({
+    Name = "${local.resource_prefix.value}-primary_network_interface"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "7e2ffea8-739f-467d-b57b-53cbc0d7ccbe"
+  })
+}
+
+# VPC Flow Logs to S3
+resource "aws_flow_log" "vpcflowlogs" {
+  log_destination      = aws_s3_bucket.flowbucket.arn
+  log_destination_type = "s3"
+  traffic_type         = "ALL"
+  vpc_id               = aws_vpc.web_vpc.id
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-flowlogs"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "6808d4b7-45bc-4d1d-9523-96757a3add3a"
+  })
+}
+
+resource "aws_s3_bucket" "flowbucket" {
+  bucket        = "${local.resource_prefix.value}-flowlogs"
+  force_destroy = true
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-flowlogs"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ec2.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "f058838a-b1e0-4383-b965-7e06e987ffb1"
+  })
+}
+
+output "ec2_public_dns" {
+  description = "Web Host Public DNS name"
+  value       = aws_instance.web_host.public_dns
+}
+
+output "vpc_id" {
+  description = "The ID of the VPC"
+  value       = aws_vpc.web_vpc.id
+}
+
+output "public_subnet" {
+  description = "The ID of the Public subnet"
+  value       = aws_subnet.web_subnet.id
+}
+
+output "public_subnet2" {
+  description = "The ID of the Public subnet"
+  value       = aws_subnet.web_subnet2.id
+}
diff --git a/terraform/aws/ecr.tf b/terraform/aws/ecr.tf
new file mode 100644
index 0000000..e578bac
--- /dev/null
+++ b/terraform/aws/ecr.tf
@@ -0,0 +1,34 @@
+resource aws_ecr_repository "repository" {
+  name                 = "${local.resource_prefix.value}-repository"
+  image_tag_mutability = "MUTABLE"
+
+  tags = merge({
+    Name = "${local.resource_prefix.value}-repository"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/ecr.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "7a3ec657-fa54-4aa2-8467-5d08d6c90bc2"
+  })
+}
+
+locals {
+  docker_image = "${data.aws_caller_identity.current.account_id}.dkr.ecr.${var.region}.amazonaws.com/${aws_ecr_repository.repository.name}"
+}
+
+
+resource null_resource "push_image" {
+  provisioner "local-exec" {
+    working_dir = "${path.module}/resources"
+    command     = <<BASH
+    aws ecr get-login-password --region ${var.region} | docker login --username AWS --password-stdin ${data.aws_caller_identity.current.account_id}.dkr.ecr.${var.region}.amazonaws.com
+    docker build -t ${aws_ecr_repository.repository.name} .
+    docker tag ${aws_ecr_repository.repository.name} ${local.docker_image}
+    docker push ${local.docker_image}
+    BASH
+  }
+}
\ No newline at end of file
diff --git a/terraform/aws/eks.tf b/terraform/aws/eks.tf
new file mode 100644
index 0000000..5370703
--- /dev/null
+++ b/terraform/aws/eks.tf
@@ -0,0 +1,148 @@
+locals {
+  eks_name = {
+    value = "${local.resource_prefix.value}-eks"
+  }
+}
+
+data aws_iam_policy_document "iam_policy_eks" {
+  statement {
+    effect  = "Allow"
+    actions = ["sts:AssumeRole"]
+    principals {
+      type        = "Service"
+      identifiers = ["eks.amazonaws.com"]
+    }
+  }
+}
+
+resource aws_iam_role "iam_for_eks" {
+  name               = "${local.resource_prefix.value}-iam-for-eks"
+  assume_role_policy = data.aws_iam_policy_document.iam_policy_eks.json
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "de052596-21a0-43de-8153-469add277b18"
+  }
+}
+
+resource aws_iam_role_policy_attachment "policy_attachment-AmazonEKSClusterPolicy" {
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSClusterPolicy"
+  role       = aws_iam_role.iam_for_eks.name
+}
+
+resource aws_iam_role_policy_attachment "policy_attachment-AmazonEKSServicePolicy" {
+  policy_arn = "arn:aws:iam::aws:policy/AmazonEKSServicePolicy"
+  role       = aws_iam_role.iam_for_eks.name
+}
+
+resource aws_vpc "eks_vpc" {
+  cidr_block           = "10.10.0.0/16"
+  enable_dns_hostnames = true
+  enable_dns_support   = true
+  tags = merge({
+    Name = "${local.resource_prefix.value}-eks-vpc"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "1600ca6c-72f6-45c0-a71d-88e117e51d6b"
+  })
+}
+
+resource aws_subnet "eks_subnet1" {
+  vpc_id                  = aws_vpc.eks_vpc.id
+  cidr_block              = "10.10.10.0/24"
+  availability_zone       = "${var.region}a"
+  map_public_ip_on_launch = true
+  tags = merge({
+    Name                                            = "${local.resource_prefix.value}-eks-subnet"
+    "kubernetes.io/cluster/${local.eks_name.value}" = "shared"
+    }, {
+    git_commit                                       = "6e62522d2ab8f63740e53752b84a6e99cd65696a"
+    git_file                                         = "terraform/aws/eks.tf"
+    git_last_modified_at                             = "2021-05-02 11:16:31"
+    git_last_modified_by                             = "nimrodkor@gmail.com"
+    git_modifiers                                    = "nimrodkor"
+    git_org                                          = "bridgecrewio"
+    git_repo                                         = "terragoat"
+    "kubernetes.io/cluster/$${local.eks_name.value}" = "shared"
+    yor_trace                                        = "1fb4fa23-a5d6-4d6a-b7dc-88749383f48d"
+    }, {
+    "kubernetes.io/cluster/$$${local.eks_name.value}" = "shared"
+    "kubernetes.io/cluster/$${local.eks_name.value}"  = "shared"
+    }, {
+    "kubernetes.io/cluster/$$$${local.eks_name.value}" = "shared"
+    "kubernetes.io/cluster/$$${local.eks_name.value}"  = "shared"
+    "kubernetes.io/cluster/$${local.eks_name.value}"   = "shared"
+  })
+}
+
+resource aws_subnet "eks_subnet2" {
+  vpc_id                  = aws_vpc.eks_vpc.id
+  cidr_block              = "10.10.11.0/24"
+  availability_zone       = "${var.region}b"
+  map_public_ip_on_launch = true
+  tags = merge({
+    Name                                            = "${local.resource_prefix.value}-eks-subnet2"
+    "kubernetes.io/cluster/${local.eks_name.value}" = "shared"
+    }, {
+    git_commit                                       = "6e62522d2ab8f63740e53752b84a6e99cd65696a"
+    git_file                                         = "terraform/aws/eks.tf"
+    git_last_modified_at                             = "2021-05-02 11:16:31"
+    git_last_modified_by                             = "nimrodkor@gmail.com"
+    git_modifiers                                    = "nimrodkor"
+    git_org                                          = "bridgecrewio"
+    git_repo                                         = "terragoat"
+    "kubernetes.io/cluster/$${local.eks_name.value}" = "shared"
+    yor_trace                                        = "9ce04af2-5321-4e6c-a262-e4d7c1f69525"
+    }, {
+    "kubernetes.io/cluster/$$${local.eks_name.value}" = "shared"
+    "kubernetes.io/cluster/$${local.eks_name.value}"  = "shared"
+    }, {
+    "kubernetes.io/cluster/$$$${local.eks_name.value}" = "shared"
+    "kubernetes.io/cluster/$$${local.eks_name.value}"  = "shared"
+    "kubernetes.io/cluster/$${local.eks_name.value}"   = "shared"
+  })
+}
+
+resource aws_eks_cluster "eks_cluster" {
+  name     = local.eks_name.value
+  role_arn = "${aws_iam_role.iam_for_eks.arn}"
+
+  vpc_config {
+    endpoint_private_access = true
+    subnet_ids              = ["${aws_subnet.eks_subnet1.id}", "${aws_subnet.eks_subnet2.id}"]
+  }
+
+  depends_on = [
+    "aws_iam_role_policy_attachment.policy_attachment-AmazonEKSClusterPolicy",
+    "aws_iam_role_policy_attachment.policy_attachment-AmazonEKSServicePolicy",
+  ]
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "7fa14261-c18d-4fa2-aec4-746f6e64d2d3"
+  }
+}
+
+output "endpoint" {
+  value = "${aws_eks_cluster.eks_cluster.endpoint}"
+}
+
+output "kubeconfig-certificate-authority-data" {
+  value = "${aws_eks_cluster.eks_cluster.certificate_authority.0.data}"
+}
diff --git a/terraform/aws/elb.tf b/terraform/aws/elb.tf
new file mode 100644
index 0000000..7327513
--- /dev/null
+++ b/terraform/aws/elb.tf
@@ -0,0 +1,40 @@
+# Create a new load balancer
+resource "aws_elb" "weblb" {
+  name = "weblb-terraform-elb"
+
+  listener {
+    instance_port     = 8000
+    instance_protocol = "http"
+    lb_port           = 80
+    lb_protocol       = "http"
+  }
+
+  health_check {
+    healthy_threshold   = 2
+    unhealthy_threshold = 2
+    timeout             = 3
+    target              = "HTTP:8000/"
+    interval            = 30
+  }
+
+  subnets                     = [aws_subnet.web_subnet.id]
+  security_groups             = [aws_security_group.web-node.id]
+  instances                   = [aws_instance.web_host.id]
+  cross_zone_load_balancing   = true
+  idle_timeout                = 400
+  connection_draining         = true
+  connection_draining_timeout = 400
+
+  tags = merge({
+    Name = "foobar-terraform-elb"
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/elb.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "b4a83ce9-9a45-43b4-b6d9-1783c282f702"
+  })
+}
\ No newline at end of file
diff --git a/terraform/aws/es.tf b/terraform/aws/es.tf
new file mode 100644
index 0000000..43e15ea
--- /dev/null
+++ b/terraform/aws/es.tf
@@ -0,0 +1,43 @@
+resource "aws_elasticsearch_domain" "monitoring-framework" {
+  domain_name           = "tg-${var.environment}-es"
+  elasticsearch_version = "2.3"
+
+  cluster_config {
+    instance_type            = "t2.small.elasticsearch"
+    instance_count           = 1
+    dedicated_master_enabled = false
+    dedicated_master_type    = "m4.large.elasticsearch"
+    dedicated_master_count   = 1
+  }
+
+  ebs_options {
+    ebs_enabled = true
+    volume_size = 30
+  }
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/es.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "95131dec-d7c9-49bb-9aff-eb0e2736603b"
+  }
+}
+
+data aws_iam_policy_document "policy" {
+  statement {
+    actions = ["es:*"]
+    principals {
+      type        = "AWS"
+      identifiers = ["*"]
+    }
+    resources = ["*"]
+  }
+}
+
+resource "aws_elasticsearch_domain_policy" "monitoring-framework-policy" {
+  domain_name     = aws_elasticsearch_domain.monitoring-framework.domain_name
+  access_policies = data.aws_iam_policy_document.policy.json
+}
diff --git a/terraform/aws/iam.tf b/terraform/aws/iam.tf
new file mode 100644
index 0000000..03d9360
--- /dev/null
+++ b/terraform/aws/iam.tf
@@ -0,0 +1,55 @@
+resource "aws_iam_user" "user" {
+  name          = "${local.resource_prefix.value}-user"
+  force_destroy = true
+
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-user"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/iam.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "9b45b298-c1ea-426a-9644-610780021eaa"
+  })
+
+}
+
+resource "aws_iam_access_key" "user" {
+  user = aws_iam_user.user.name
+}
+
+resource "aws_iam_user_policy" "userpolicy" {
+  name = "excess_policy"
+  user = "${aws_iam_user.user.name}"
+
+  policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": [
+        "ec2:*",
+        "s3:*",
+        "lambda:*",
+        "cloudwatch:*"
+      ],
+      "Effect": "Allow",
+      "Resource": "*"
+    }
+  ]
+}
+EOF
+}
+
+output "username" {
+  value = aws_iam_user.user.name
+}
+
+output "secret" {
+  value = aws_iam_access_key.user.encrypted_secret
+}
+
diff --git a/terraform/aws/kms.tf b/terraform/aws/kms.tf
new file mode 100644
index 0000000..8f27b4f
--- /dev/null
+++ b/terraform/aws/kms.tf
@@ -0,0 +1,21 @@
+resource "aws_kms_key" "logs_key" {
+  # key does not have rotation enabled
+  description = "${local.resource_prefix.value}-logs bucket key"
+
+  deletion_window_in_days = 7
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/kms.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "cd8fa2a7-4868-4cd1-993d-da4644808ce5"
+  }
+}
+
+resource "aws_kms_alias" "logs_key_alias" {
+  name          = "alias/${local.resource_prefix.value}-logs-bucket-key"
+  target_key_id = "${aws_kms_key.logs_key.key_id}"
+}
diff --git a/terraform/aws/lambda.tf b/terraform/aws/lambda.tf
new file mode 100644
index 0000000..1e9237d
--- /dev/null
+++ b/terraform/aws/lambda.tf
@@ -0,0 +1,58 @@
+resource "aws_iam_role" "iam_for_lambda" {
+  name = "${local.resource_prefix.value}-analysis-lambda"
+
+  assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/lambda.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "93cfa6f9-a257-40c3-b7dc-3c3686929734"
+  }
+}
+
+resource "aws_lambda_function" "analysis_lambda" {
+  # lambda have plain text secrets in environment variables
+  filename      = "resources/lambda_function_payload.zip"
+  function_name = "${local.resource_prefix.value}-analysis"
+  role          = "${aws_iam_role.iam_for_lambda.arn}"
+  handler       = "exports.test"
+
+  source_code_hash = "${filebase64sha256("resources/lambda_function_payload.zip")}"
+
+  runtime = "nodejs12.x"
+
+  environment {
+    variables = {
+      access_key = "AKIAIOSFODNN7EXAMPLE"
+      secret_key = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
+    }
+  }
+  tags = {
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
+    git_file             = "terraform/aws/lambda.tf"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "f7d8bc47-e5d9-4b09-9d8f-e7b9724d826e"
+  }
+}
\ No newline at end of file
diff --git a/terraform/aws/neptune.tf b/terraform/aws/neptune.tf
new file mode 100644
index 0000000..7dd4a0d
--- /dev/null
+++ b/terraform/aws/neptune.tf
@@ -0,0 +1,45 @@
+resource "aws_neptune_cluster" "default" {
+  cluster_identifier                  = var.neptune-dbname
+  engine                              = "neptune"
+  backup_retention_period             = 5
+  preferred_backup_window             = "07:00-09:00"
+  skip_final_snapshot                 = true
+  iam_database_authentication_enabled = false
+  apply_immediately                   = true
+  storage_encrypted                   = false
+  tags = {
+    git_commit           = "aa8fd16fd94cccf6af206e2f0922b5558f8ac514"
+    git_file             = "terraform/aws/neptune.tf"
+    git_last_modified_at = "2020-08-21 19:14:35"
+    git_last_modified_by = "matt@bridgecrew.io"
+    git_modifiers        = "matt"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "0d4cbb85-73ed-4ca0-b1da-296e4185f34e"
+  }
+}
+
+resource "aws_neptune_cluster_instance" "default" {
+  count              = 1
+  cluster_identifier = aws_neptune_cluster.default.id
+  engine             = "neptune"
+  instance_class     = "db.t3.medium" # Smallest instance type listed for neptune https://aws.amazon.com/neptune/pricing/
+  apply_immediately  = true
+  #publicly_accessible                = true # No longer supported, API returns create error. See https://docs.aws.amazon.com/neptune/latest/userguide/api-instances.html#CreateDBInstance
+  tags = {
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
+    git_file             = "terraform/aws/neptune.tf"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "matt/nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "9b2b45fd-6f9f-44fd-b8bc-868b1db178b3"
+  }
+}
+
+resource "aws_neptune_cluster_snapshot" "default" {
+  db_cluster_identifier          = aws_neptune_cluster.default.id
+  db_cluster_snapshot_identifier = "resourcetestsnapshot1"
+}
+
diff --git a/terraform/aws/providers.tf b/terraform/aws/providers.tf
new file mode 100644
index 0000000..1796891
--- /dev/null
+++ b/terraform/aws/providers.tf
@@ -0,0 +1,18 @@
+
+provider "aws" {
+  profile = var.profile
+  region  = var.region
+}
+
+provider "aws" {
+  alias      = "plain_text_access_keys_provider"
+  region     = "us-west-1"
+  access_key = "AKIAIOSFODNN7EXAMPLE"
+  secret_key = "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY"
+}
+
+terraform {
+  backend "s3" {
+    encrypt = true
+  }
+}
diff --git a/terraform/aws/rds.tf b/terraform/aws/rds.tf
new file mode 100644
index 0000000..b9d5b5a
--- /dev/null
+++ b/terraform/aws/rds.tf
@@ -0,0 +1,144 @@
+resource "aws_rds_cluster" "app1-rds-cluster" {
+  cluster_identifier      = "app1-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 0
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "b6f2c2ec-0715-46a0-83d4-502e588826d1"
+  }
+}
+
+resource "aws_rds_cluster" "app2-rds-cluster" {
+  cluster_identifier      = "app2-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 1
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "d33c9292-952b-4c1f-9973-b6dbad519461"
+  }
+}
+
+resource "aws_rds_cluster" "app3-rds-cluster" {
+  cluster_identifier      = "app3-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 15
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "2a8584b1-7e9d-4739-8e37-366620c92027"
+  }
+}
+
+resource "aws_rds_cluster" "app4-rds-cluster" {
+  cluster_identifier      = "app4-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 15
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "284aaeed-fd3f-4b7a-b5f8-61a8457f4d83"
+  }
+}
+
+resource "aws_rds_cluster" "app5-rds-cluster" {
+  cluster_identifier      = "app5-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 15
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "0b2bea23-5ca5-4bd1-956e-b9ed978daadf"
+  }
+}
+
+resource "aws_rds_cluster" "app6-rds-cluster" {
+  cluster_identifier      = "app6-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 15
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "fcffb961-d859-4be5-997f-d51b50665ada"
+  }
+}
+
+resource "aws_rds_cluster" "app7-rds-cluster" {
+  cluster_identifier      = "app7-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 25
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "ebc2ac20-23a3-4518-a7ef-3a102b003ab6"
+  }
+}
+
+resource "aws_rds_cluster" "app8-rds-cluster" {
+  cluster_identifier      = "app8-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 25
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "af643747-0967-4251-8645-3b54882c2507"
+
+  }
+}
+
+resource "aws_rds_cluster" "app9-rds-cluster" {
+  cluster_identifier      = "app9-rds-cluster"
+  allocated_storage       = 10
+  backup_retention_period = 25
+  tags = {
+    git_commit           = "079fe74f6b96d887c245664fbd8cf676c92f20e5"
+    git_file             = "terraform/aws/rds.tf"
+    git_last_modified_at = "2021-12-08 23:26:32"
+    git_last_modified_by = "tron47@gmail.com"
+    git_modifiers        = "tron47"
+    git_org              = "matansha"
+    git_repo             = "terragoat"
+    yor_trace            = "a0c98536-c751-4743-92f1-a106ce750249"
+  }
+}
diff --git a/terraform/aws/resources/Dockerfile b/terraform/aws/resources/Dockerfile
new file mode 100644
index 0000000..0ac3e24
--- /dev/null
+++ b/terraform/aws/resources/Dockerfile
@@ -0,0 +1 @@
+FROM python:3.7-slim
diff --git a/terraform/aws/resources/customer-master.xlsx b/terraform/aws/resources/customer-master.xlsx
new file mode 100644
index 0000000..86351ba
Binary files /dev/null and b/terraform/aws/resources/customer-master.xlsx differ
diff --git a/terraform/aws/resources/lambda_function_payload.zip b/terraform/aws/resources/lambda_function_payload.zip
new file mode 100644
index 0000000..63baca3
Binary files /dev/null and b/terraform/aws/resources/lambda_function_payload.zip differ
diff --git a/terraform/aws/s3.tf b/terraform/aws/s3.tf
new file mode 100644
index 0000000..a2a2ed7
--- /dev/null
+++ b/terraform/aws/s3.tf
@@ -0,0 +1,141 @@
+resource "aws_s3_bucket" "data" {
+  # bucket is public
+  # bucket is not encrypted
+  # bucket does not have access logs
+  # bucket does not have versioning
+  bucket        = "${local.resource_prefix.value}-data"
+  force_destroy = true
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-data"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "4d57f83ca4d3a78a44fb36d1dcf0d23983fa44f5"
+    git_file             = "terraform/aws/s3.tf"
+    git_last_modified_at = "2022-05-18 07:08:06"
+    git_last_modified_by = "nimrod@bridgecrew.io"
+    git_modifiers        = "34870196+LironElbaz/nimrod/nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "0874007d-903a-4b4c-945f-c9c233e13243"
+  })
+}
+
+resource "aws_s3_bucket_object" "data_object" {
+  bucket = aws_s3_bucket.data.id
+  key    = "customer-master.xlsx"
+  source = "resources/customer-master.xlsx"
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-customer-master"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/s3.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "a7f01cc7-63c2-41a8-8555-6665e5e39a64"
+  })
+}
+
+resource "aws_s3_bucket" "financials" {
+  # bucket is not encrypted
+  # bucket does not have access logs
+  # bucket does not have versioning
+  bucket        = "${local.resource_prefix.value}-financials"
+  acl           = "private"
+  force_destroy = true
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-financials"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/s3.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "0e012640-b597-4e5d-9378-d4b584aea913"
+  })
+
+}
+
+resource "aws_s3_bucket" "operations" {
+  # bucket is not encrypted
+  # bucket does not have access logs
+  bucket = "${local.resource_prefix.value}-operations"
+  acl    = "private"
+  versioning {
+    enabled = true
+  }
+  force_destroy = true
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-operations"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/s3.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "29efcf7b-22a8-4bd6-8e14-1f55b3a2d743"
+  })
+}
+
+resource "aws_s3_bucket" "data_science" {
+  # bucket is not encrypted
+  bucket = "${local.resource_prefix.value}-data-science"
+  acl    = "private"
+  versioning {
+    enabled = true
+  }
+  logging {
+    target_bucket = "${aws_s3_bucket.logs.id}"
+    target_prefix = "log/"
+  }
+  force_destroy = true
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/s3.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "9a7c8788-5655-4708-bbc3-64ead9847f64"
+  }
+}
+
+resource "aws_s3_bucket" "logs" {
+  bucket = "${local.resource_prefix.value}-logs"
+  acl    = "log-delivery-write"
+  versioning {
+    enabled = true
+  }
+  server_side_encryption_configuration {
+    rule {
+      apply_server_side_encryption_by_default {
+        sse_algorithm     = "aws:kms"
+        kms_master_key_id = "${aws_kms_key.logs_key.arn}"
+      }
+    }
+  }
+  force_destroy = true
+  tags = merge({
+    Name        = "${local.resource_prefix.value}-logs"
+    Environment = local.resource_prefix.value
+    }, {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/aws/s3.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "01946fe9-aae2-4c99-a975-e9b0d3a4696c"
+  })
+}
diff --git a/terraform/azure/aks.tf b/terraform/azure/aks.tf
new file mode 100644
index 0000000..ebb613b
--- /dev/null
+++ b/terraform/azure/aks.tf
@@ -0,0 +1,35 @@
+resource azurerm_kubernetes_cluster "k8s_cluster" {
+  dns_prefix          = "terragoat-${var.environment}"
+  location            = var.location
+  name                = "terragoat-aks-${var.environment}"
+  resource_group_name = azurerm_resource_group.example.name
+  identity {
+    type = "SystemAssigned"
+  }
+  default_node_pool {
+    name       = "default"
+    vm_size    = "Standard_D2_v2"
+    node_count = 2
+  }
+  addon_profile {
+    oms_agent {
+      enabled = false
+    }
+    kube_dashboard {
+      enabled = true
+    }
+  }
+  role_based_access_control {
+    enabled = false
+  }
+  tags = {
+    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_file             = "terraform/azure/aks.tf"
+    git_last_modified_at = "2020-06-17 12:59:55"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "6103d111-864e-42e5-899c-1864de281fd1"
+  }
+}
\ No newline at end of file
diff --git a/terraform/azure/app_service.tf b/terraform/azure/app_service.tf
new file mode 100644
index 0000000..fa4f23e
--- /dev/null
+++ b/terraform/azure/app_service.tf
@@ -0,0 +1,64 @@
+resource azurerm_app_service_plan "example" {
+  name                = "terragoat-app-service-plan-${var.environment}"
+  location            = azurerm_resource_group.example.location
+  resource_group_name = azurerm_resource_group.example.name
+
+  sku {
+    tier = "Dynamic"
+    size = "S1"
+  }
+  tags = {
+    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_file             = "terraform/azure/app_service.tf"
+    git_last_modified_at = "2020-06-17 12:59:55"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "6611bf45-fd5b-467e-b119-d533cd7539b8"
+  }
+}
+
+resource azurerm_app_service "app-service1" {
+  app_service_plan_id = azurerm_app_service_plan.example.id
+  location            = var.location
+  name                = "terragoat-app-service-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name = azurerm_resource_group.example.name
+  https_only          = false
+  site_config {
+    min_tls_version = "1.1"
+  }
+  tags = {
+    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_file             = "terraform/azure/app_service.tf"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "13be096d-c599-46e5-bf54-51c6e9732858"
+  }
+}
+
+resource azurerm_app_service "app-service2" {
+  app_service_plan_id = azurerm_app_service_plan.example.id
+  location            = var.location
+  name                = "terragoat-app-service-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name = azurerm_resource_group.example.name
+  https_only          = true
+
+  auth_settings {
+    enabled = false
+  }
+  tags = {
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
+    git_file             = "terraform/azure/app_service.tf"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "Adin.Ermie/nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "ec8295ab-af68-4cff-b0f1-b0cf5eaf1b75"
+  }
+}
+
diff --git a/terraform/azure/application_gateway.tf b/terraform/azure/application_gateway.tf
new file mode 100644
index 0000000..e66945b
--- /dev/null
+++ b/terraform/azure/application_gateway.tf
@@ -0,0 +1,66 @@
+resource "azurerm_application_gateway" "network" {
+  name                = "example-appgateway"
+  resource_group_name = "example-resourceGroup"
+  location            = "example --West-US"
+
+  sku {
+    name     = "Standard_Small"
+    tier     = "Standard"
+    capacity = 2
+  }
+
+  gateway_ip_configuration {
+    name      = "my-gateway-ip-configuration"
+    subnet_id = "your subnet id"
+  }
+
+  frontend_port {
+    name = "name"
+    port = "port-no"
+  }
+  ####Missing WAF block: As per azure best practices, it is important to have a web application firewall enabled at application gateway.
+
+
+  frontend_ip_configuration {
+    name                 = "name"
+    public_ip_address_id = "Ip-address"
+  }
+
+  backend_address_pool {
+    name = local.backend_address_pool_name
+  }
+
+  backend_http_settings {
+    name                  = local.http_setting_name
+    cookie_based_affinity = "Disabled"
+    path                  = "/path1/"
+    port                  = 80
+    protocol              = "Http"
+    request_timeout       = 60
+  }
+
+  http_listener {
+    name                           = local.listener_name
+    frontend_ip_configuration_name = local.frontend_ip_configuration_name
+    frontend_port_name             = local.frontend_port_name
+    protocol                       = "Http"
+  }
+
+  request_routing_rule {
+    name                       = local.request_routing_rule_name
+    rule_type                  = "Basic"
+    http_listener_name         = local.listener_name
+    backend_address_pool_name  = local.backend_address_pool_name
+    backend_http_settings_name = local.http_setting_name
+  }
+  tags = {
+    git_commit           = "b07a42ebd74b8f0ba647e20b872474b1c29b4814"
+    git_file             = "terraform/azure/application_gateway.tf"
+    git_last_modified_at = "2021-05-02 10:08:55"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "harkiratbhardwaj/nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "3f62753b-3d20-4fa7-b402-b780234a14d8"
+  }
+}
diff --git a/terraform/azure/instance.tf b/terraform/azure/instance.tf
new file mode 100644
index 0000000..225872b
--- /dev/null
+++ b/terraform/azure/instance.tf
@@ -0,0 +1,77 @@
+resource random_string "password" {
+  length      = 16
+  special     = false
+  min_lower   = 1
+  min_numeric = 1
+  min_upper   = 1
+}
+
+resource azurerm_linux_virtual_machine "linux_machine" {
+  admin_username                  = "terragoat-linux"
+  admin_password                  = random_string.password.result
+  location                        = var.location
+  name                            = "terragoat-linux"
+  network_interface_ids           = [azurerm_network_interface.ni_linux.id]
+  resource_group_name             = azurerm_resource_group.example.name
+  size                            = "Standard_F2"
+  disable_password_authentication = false
+  source_image_reference {
+    publisher = "Canonical"
+    offer     = "UbuntuServer"
+    sku       = "16.04-LTS"
+    version   = "latest"
+  }
+  os_disk {
+    caching              = "ReadWrite"
+    storage_account_type = "Standard_LRS"
+  }
+
+  tags = merge({
+    terragoat   = true
+    environment = var.environment
+    }, {
+    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_file             = "terraform/azure/instance.tf"
+    git_last_modified_at = "2020-06-17 15:48:15"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "736ef713-51b8-4178-ad69-406be81f6ef2"
+  })
+}
+
+resource azurerm_windows_virtual_machine "windows_machine" {
+  admin_password        = random_string.password.result
+  admin_username        = "tg-${var.environment}"
+  location              = var.location
+  name                  = "tg-win"
+  network_interface_ids = [azurerm_network_interface.ni_win.id]
+  resource_group_name   = azurerm_resource_group.example.name
+  size                  = "Standard_F2"
+  os_disk {
+    caching              = "ReadWrite"
+    storage_account_type = "Standard_LRS"
+  }
+
+  source_image_reference {
+    publisher = "MicrosoftWindowsServer"
+    offer     = "WindowsServer"
+    sku       = "2016-Datacenter"
+    version   = "latest"
+  }
+
+  tags = merge({
+    terragoat   = true
+    environment = var.environment
+    }, {
+    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_file             = "terraform/azure/instance.tf"
+    git_last_modified_at = "2020-06-17 15:48:15"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "41938587-bdfc-4234-b941-560f1ae7d6c0"
+  })
+}
\ No newline at end of file
diff --git a/terraform/azure/key_vault.tf b/terraform/azure/key_vault.tf
new file mode 100644
index 0000000..7f2be4a
--- /dev/null
+++ b/terraform/azure/key_vault.tf
@@ -0,0 +1,72 @@
+resource "azurerm_key_vault" "example" {
+  name                = "terragoat-key-${var.environment}${random_integer.rnd_int.result}"
+  location            = azurerm_resource_group.example.location
+  resource_group_name = azurerm_resource_group.example.name
+  tenant_id           = data.azurerm_client_config.current.tenant_id
+  sku_name            = "premium"
+  access_policy {
+    tenant_id = data.azurerm_client_config.current.tenant_id
+    object_id = data.azurerm_client_config.current.object_id
+    key_permissions = [
+      "create",
+      "get",
+    ]
+    secret_permissions = [
+      "set",
+    ]
+  }
+  tags = merge({
+    environment = var.environment
+    terragoat   = true
+    }, {
+    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_file             = "terraform/azure/key_vault.tf"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "79afeacc-248a-4015-a4fa-76a6a57f06e2"
+  })
+}
+
+resource "azurerm_key_vault_key" "generated" {
+  name         = "terragoat-generated-certificate-${var.environment}"
+  key_vault_id = azurerm_key_vault.example.id
+  key_type     = "RSA"
+  key_size     = 2048
+  key_opts = [
+    "decrypt",
+    "encrypt",
+    "sign",
+    "unwrapKey",
+    "verify",
+    "wrapKey",
+  ]
+  tags = {
+    git_commit           = "898d5beaec7ffdef6df0d7abecff407362e2a74e"
+    git_file             = "terraform/azure/key_vault.tf"
+    git_last_modified_at = "2020-06-17 12:59:55"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "afbc6e13-63d9-4e6c-8914-d58b7744b5dd"
+  }
+}
+
+resource "azurerm_key_vault_secret" "secret" {
+  key_vault_id = azurerm_key_vault.example.id
+  name         = "terragoat-secret-${var.environment}"
+  value        = random_string.password.result
+  tags = {
+    git_commit           = "f8ff847bb69370bbe03b3d2b70db586ff6c867fc"
+    git_file             = "terraform/azure/key_vault.tf"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "40517524-f05d-485b-bfbe-3fa0dbee511e"
+  }
+}
\ No newline at end of file
diff --git a/terraform/azure/logging.tf b/terraform/azure/logging.tf
new file mode 100644
index 0000000..b7854fb
--- /dev/null
+++ b/terraform/azure/logging.tf
@@ -0,0 +1,10 @@
+resource azurerm_monitor_log_profile "logging_profile" {
+  storage_account_id = azurerm_storage_account.example.id
+  categories         = ["Action"]
+  locations          = [var.location]
+  name               = "terragoat-${var.environment}"
+  retention_policy {
+    enabled = true
+    days    = 30
+  }
+}
\ No newline at end of file
diff --git a/terraform/azure/mssql.tf b/terraform/azure/mssql.tf
new file mode 100644
index 0000000..1c7f1f9
--- /dev/null
+++ b/terraform/azure/mssql.tf
@@ -0,0 +1,248 @@
+resource "azurerm_storage_account" "security_storage_account" {
+  name                      = "securitystorageaccount-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name       = azurerm_resource_group.example.name
+  location                  = azurerm_resource_group.example.location
+  account_tier              = "Standard"
+  account_replication_type  = "LRS"
+  enable_https_traffic_only = true
+  tags = {
+    git_commit           = "a1d1c1ce31a1bde6dafa188846d90eca82abe5fd"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 05:32:41"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "4b504d4d-608c-45fe-ae56-807bde6d969f"
+  }
+}
+
+resource "azurerm_mssql_server" "mssql1" {
+  name                         = "terragoat-mssql1-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "missadministrator"
+  administrator_login_password = "AdminPassword123!"
+  tags = {
+    git_commit           = "c6f8caa51942284d02465518822685897ad90141"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 18:41:19"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "54f6cb23-b30a-4f1d-8064-6f777b9b75db"
+  }
+}
+
+resource "azurerm_mssql_server" "mssql2" {
+  name                         = "mssql2-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "missadministrator"
+  administrator_login_password = "AdminPassword123!"
+  tags = {
+    git_commit           = "c6f8caa51942284d02465518822685897ad90141"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 18:41:19"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "096d2cf2-6d47-41b2-9418-cdedea85e184"
+  }
+}
+
+resource "azurerm_mssql_server" "mssql3" {
+  name                         = "mssql3-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "missadministrator"
+  administrator_login_password = "AdminPassword123!"
+  tags = {
+    git_commit           = "c6f8caa51942284d02465518822685897ad90141"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 18:41:19"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "e71d3fb5-addc-481d-ada6-b7432a768de3"
+  }
+}
+
+resource "azurerm_mssql_server" "mssql4" {
+  name                         = "mssql4-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "missadministrator"
+  administrator_login_password = "AdminPassword123!"
+  tags = {
+    git_commit           = "c6f8caa51942284d02465518822685897ad90141"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 18:41:19"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "c3b85724-4f7e-4c63-a17d-3d04239beae8"
+  }
+}
+
+resource "azurerm_mssql_server" "mssql5" {
+  name                         = "mssql5-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "missadministrator"
+  administrator_login_password = "AdminPassword123!"
+  tags = {
+    git_commit           = "c6f8caa51942284d02465518822685897ad90141"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 18:41:19"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "0240ca84-acc9-47d9-b491-9e7e359787a1"
+  }
+}
+
+resource "azurerm_mssql_server" "mssql6" {
+  name                         = "mssql6-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "missadministrator"
+  administrator_login_password = "AdminPassword123!"
+  tags = {
+    git_commit           = "c6f8caa51942284d02465518822685897ad90141"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 18:41:19"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "042d15fb-edfa-484b-b65e-3d70c50cdee7"
+  }
+}
+
+resource "azurerm_mssql_server" "mssql7" {
+  name                         = "mssql7-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "missadministrator"
+  administrator_login_password = "AdminPassword123!"
+  tags = {
+    git_commit           = "c6f8caa51942284d02465518822685897ad90141"
+    git_file             = "terraform/azure/mssql.tf"
+    git_last_modified_at = "2022-01-20 18:41:19"
+    git_last_modified_by = "28880387+tsmithv11@users.noreply.github.com"
+    git_modifiers        = "28880387+tsmithv11"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "3f1118e1-5067-452e-906f-5123cfc93711"
+  }
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "alertpolicy1" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_mssql_server.mssql1.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.security_storage_account.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.security_storage_account.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days  = 20
+  email_addresses = ["securityengineer@bridgecrew.io"]
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "alertpolicy2" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_mssql_server.mssql2.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.security_storage_account.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.security_storage_account.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days  = 20
+  email_addresses = ["securityengineer@bridgecrew.io"]
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "alertpolicy3" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_mssql_server.mssql3.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.security_storage_account.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.security_storage_account.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days  = 20
+  email_addresses = ["securityengineer@bridgecrew.io"]
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "alertpolicy4" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_mssql_server.mssql4.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.security_storage_account.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.security_storage_account.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days  = 20
+  email_addresses = ["securityengineer@bridgecrew.io"]
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "alertpolicy5" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_mssql_server.mssql5.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.security_storage_account.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.security_storage_account.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days = 20
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "alertpolicy6" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_mssql_server.mssql6.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.security_storage_account.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.security_storage_account.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days  = 20
+  email_addresses = ["securityengineer@bridgecrew.io"]
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "alertpolicy7" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_mssql_server.mssql7.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.security_storage_account.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.security_storage_account.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days  = 20
+  email_addresses = ["securityengineer@bridgecrew.io"]
+}
diff --git a/terraform/azure/networking.tf b/terraform/azure/networking.tf
new file mode 100644
index 0000000..ab01c60
--- /dev/null
+++ b/terraform/azure/networking.tf
@@ -0,0 +1,145 @@
+resource "azurerm_virtual_network" "example" {
+  name                = "terragoat-vn-${var.environment}"
+  address_space       = ["10.0.0.0/16"]
+  location            = azurerm_resource_group.example.location
+  resource_group_name = azurerm_resource_group.example.name
+  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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "eb19f165-9c21-4a7a-96e5-5bb557a38228"
+  }
+}
+
+resource "azurerm_subnet" "example" {
+  name                 = "terragoat-${var.environment}"
+  resource_group_name  = azurerm_resource_group.example.name
+  virtual_network_name = azurerm_virtual_network.example.name
+  address_prefixes     = ["10.0.0.0/24"]
+}
+
+resource "azurerm_network_interface" "ni_linux" {
+  name                = "terragoat-linux-${var.environment}"
+  location            = azurerm_resource_group.example.location
+  resource_group_name = azurerm_resource_group.example.name
+
+  ip_configuration {
+    name                          = "internal"
+    subnet_id                     = azurerm_subnet.example.id
+    private_ip_address_allocation = "Dynamic"
+  }
+  tags = {
+    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_file             = "terraform/azure/networking.tf"
+    git_last_modified_at = "2020-06-17 15:48:15"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "2647f099-dff8-4514-8cef-96159380c02a"
+  }
+}
+
+resource "azurerm_network_interface" "ni_win" {
+  name                = "terragoat-win-${var.environment}"
+  location            = azurerm_resource_group.example.location
+  resource_group_name = azurerm_resource_group.example.name
+
+  ip_configuration {
+    name                          = "internal"
+    subnet_id                     = azurerm_subnet.example.id
+    private_ip_address_allocation = "Dynamic"
+  }
+  tags = {
+    git_commit           = "de3bb777f967989c2c3332faea16cb614c55ccc9"
+    git_file             = "terraform/azure/networking.tf"
+    git_last_modified_at = "2020-06-17 15:48:15"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "2b5dbf28-04fb-4151-a637-a731bbe7ed1d"
+  }
+}
+
+resource azurerm_network_security_group "bad_sg" {
+  location            = var.location
+  name                = "terragoat-${var.environment}"
+  resource_group_name = azurerm_resource_group.example.name
+
+  security_rule {
+    access                     = "Allow"
+    direction                  = "Inbound"
+    name                       = "AllowSSH"
+    priority                   = 200
+    protocol                   = "TCP"
+    source_address_prefix      = "*"
+    source_port_range          = "*"
+    destination_port_range     = "22-22"
+    destination_address_prefix = "*"
+  }
+
+  security_rule {
+    access                     = "Allow"
+    direction                  = "Inbound"
+    name                       = "AllowRDP"
+    priority                   = 300
+    protocol                   = "TCP"
+    source_address_prefix      = "*"
+    source_port_range          = "*"
+    destination_port_range     = "3389-3389"
+    destination_address_prefix = "*"
+  }
+  tags = {
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
+    git_file             = "terraform/azure/networking.tf"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "1a591ba4-d969-4572-9704-87b5c55c0ba3"
+  }
+}
+
+resource azurerm_network_watcher "network_watcher" {
+  location            = var.location
+  name                = "terragoat-network-watcher-${var.environment}"
+  resource_group_name = azurerm_resource_group.example.name
+  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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "3da368fc-723f-43d2-8e82-08dcc91e5094"
+  }
+}
+
+resource azurerm_network_watcher_flow_log "flow_log" {
+  enabled                   = false
+  network_security_group_id = azurerm_network_security_group.bad_sg.id
+  network_watcher_name      = azurerm_network_watcher.network_watcher.name
+  resource_group_name       = azurerm_resource_group.example.name
+  storage_account_id        = azurerm_storage_account.example.id
+  retention_policy {
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "33a7212e-7f1a-49fc-af73-8e525c5546ec"
+  }
+}
\ No newline at end of file
diff --git a/terraform/azure/policies.tf b/terraform/azure/policies.tf
new file mode 100644
index 0000000..76ffd9f
--- /dev/null
+++ b/terraform/azure/policies.tf
@@ -0,0 +1,51 @@
+resource "azurerm_policy_definition" "policy-res" {
+  name         = "terragoat-policy-${var.environment}"
+  policy_type  = "Custom"
+  mode         = "Indexed"
+  display_name = "acceptance test policy definition"
+  metadata     = <<METADATA
+    {
+    "category": "Security Center"
+    }
+METADATA
+  policy_rule  = <<POLICY_RULE
+    {
+    "if": {
+      "not": {
+        "field": "location",
+        "in": "[parameters('allowedLocations')]"
+      }
+    },
+    "then": {
+      "effect": "audit"
+    }
+  }
+POLICY_RULE
+  parameters   = <<PARAMETERS
+    {
+    "allowedLocations": {
+      "type": "Array",
+      "metadata": {
+        "description": "The list of allowed locations for resources.",
+        "displayName": "Allowed locations",
+        "strongType": "location"
+      }
+    }
+  }
+PARAMETERS
+}
+
+resource "azurerm_policy_assignment" "example" {
+  name                 = "terragoat-policy-assignment-${var.environment}"
+  scope                = "/subscriptions/${data.azurerm_client_config.current.subscription_id}"
+  policy_definition_id = azurerm_policy_definition.policy-res.id
+  description          = "Policy Assignment created via an Acceptance Test"
+  display_name         = "My Example Policy Assignment"
+  parameters           = <<PARAMETERS
+{
+  "allowedLocations": {
+    "value": [ "East US" ]
+  }
+}
+PARAMETERS
+}
diff --git a/terraform/azure/provider.tf b/terraform/azure/provider.tf
new file mode 100644
index 0000000..645c045
--- /dev/null
+++ b/terraform/azure/provider.tf
@@ -0,0 +1,13 @@
+provider "azurerm" {
+  subscription_id = var.subscription_id
+  version = ">= 2.0.0"
+  features {}
+}
+
+data "azurerm_client_config" "current" {}
+
+terraform {
+  required_version = ">=0.12.0"
+  backend "azurerm" {
+  }
+}
diff --git a/terraform/azure/random.tf b/terraform/azure/random.tf
new file mode 100644
index 0000000..73ac4bb
--- /dev/null
+++ b/terraform/azure/random.tf
@@ -0,0 +1,4 @@
+resource "random_integer" "rnd_int" {
+  min     = 1
+  max     = 10000
+}
\ No newline at end of file
diff --git a/terraform/azure/resource_group.tf b/terraform/azure/resource_group.tf
new file mode 100644
index 0000000..cb7ab25
--- /dev/null
+++ b/terraform/azure/resource_group.tf
@@ -0,0 +1,14 @@
+resource "azurerm_resource_group" "example" {
+  name     = "terragoat-${var.environment}"
+  location = var.location
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/azure/resource_group.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "80b3b0ca-e0d8-4266-8a1f-12c71afd7e18"
+  }
+}
\ No newline at end of file
diff --git a/terraform/azure/roles.tf b/terraform/azure/roles.tf
new file mode 100644
index 0000000..736fc13
--- /dev/null
+++ b/terraform/azure/roles.tf
@@ -0,0 +1,16 @@
+data azurerm_subscription current_subscription {}
+
+resource "azurerm_role_definition" "example" {
+  name        = "my-custom-role"
+  scope       = data.azurerm_subscription.current_subscription.id
+  description = "This is a custom role created via Terraform"
+
+  permissions {
+    actions     = ["*"]
+    not_actions = []
+  }
+
+  assignable_scopes = [
+    data.azurerm_subscription.current_subscription.id
+  ]
+}
\ No newline at end of file
diff --git a/terraform/azure/security_center.tf b/terraform/azure/security_center.tf
new file mode 100644
index 0000000..e5927c7
--- /dev/null
+++ b/terraform/azure/security_center.tf
@@ -0,0 +1,9 @@
+resource azurerm_security_center_subscription_pricing "pricing" {
+  tier = "Free"
+}
+
+resource azurerm_security_center_contact "contact" {
+  alert_notifications = false
+  alerts_to_admins    = false
+  email               = "some@email.com"
+}
\ No newline at end of file
diff --git a/terraform/azure/sql.tf b/terraform/azure/sql.tf
new file mode 100644
index 0000000..c466020
--- /dev/null
+++ b/terraform/azure/sql.tf
@@ -0,0 +1,110 @@
+resource "azurerm_sql_firewall_rule" "example" {
+  name                = "terragoat-firewall-rule-${var.environment}"
+  resource_group_name = azurerm_resource_group.example.name
+  server_name         = azurerm_sql_server.example.name
+  start_ip_address    = "10.0.17.62"
+  end_ip_address      = "10.0.17.62"
+}
+
+resource "azurerm_sql_server" "example" {
+  name                         = "terragoat-sqlserver-${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name          = azurerm_resource_group.example.name
+  location                     = azurerm_resource_group.example.location
+  version                      = "12.0"
+  administrator_login          = "ariel"
+  administrator_login_password = "Aa12345678"
+  tags = merge({
+    environment = var.environment
+    terragoat   = "true"
+    }, {
+    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_file             = "terraform/azure/sql.tf"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "e5ec3432-e61f-4244-b59e-9ecc24ddd4cb"
+  })
+}
+
+resource "azurerm_mssql_server_security_alert_policy" "example" {
+  resource_group_name        = azurerm_resource_group.example.name
+  server_name                = azurerm_sql_server.example.name
+  state                      = "Enabled"
+  storage_endpoint           = azurerm_storage_account.example.primary_blob_endpoint
+  storage_account_access_key = azurerm_storage_account.example.primary_access_key
+  disabled_alerts = [
+    "Sql_Injection",
+    "Data_Exfiltration"
+  ]
+  retention_days = 20
+}
+
+resource "azurerm_mysql_server" "example" {
+  name                = "terragoat-mysql-${var.environment}${random_integer.rnd_int.result}"
+  location            = azurerm_resource_group.example.location
+  resource_group_name = azurerm_resource_group.example.name
+
+  administrator_login          = "terragoat-${var.environment}"
+  administrator_login_password = random_string.password.result
+
+  sku_name   = "B_Gen5_2"
+  storage_mb = 5120
+  version    = "5.7"
+
+  auto_grow_enabled                 = true
+  backup_retention_days             = 7
+  infrastructure_encryption_enabled = true
+  public_network_access_enabled     = true
+  ssl_enforcement_enabled           = false
+  tags = {
+    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_file             = "terraform/azure/sql.tf"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "1ac18c16-09a4-41c9-9a66-6f514050178e"
+  }
+}
+
+resource "azurerm_postgresql_server" "example" {
+  name                         = "terragoat-postgresql-${var.environment}${random_integer.rnd_int.result}"
+  location                     = azurerm_resource_group.example.location
+  resource_group_name          = azurerm_resource_group.example.name
+  sku_name                     = "B_Gen5_2"
+  storage_mb                   = 5120
+  backup_retention_days        = 7
+  geo_redundant_backup_enabled = false
+  auto_grow_enabled            = true
+  administrator_login          = "terragoat"
+  administrator_login_password = "Aa12345678"
+  version                      = "9.5"
+  ssl_enforcement_enabled      = false
+  tags = {
+    git_commit           = "81738b80d571fa3034633690d13ffb460e1e7dea"
+    git_file             = "terraform/azure/sql.tf"
+    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              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "9eae126d-9404-4511-9c32-2243457df459"
+  }
+}
+
+resource "azurerm_postgresql_configuration" "thrtottling_config" {
+  name                = "connection_throttling"
+  resource_group_name = azurerm_resource_group.example.name
+  server_name         = azurerm_postgresql_server.example.name
+  value               = "off"
+}
+
+resource "azurerm_postgresql_configuration" "example" {
+  name                = "log_checkpoints"
+  resource_group_name = azurerm_resource_group.example.name
+  server_name         = azurerm_postgresql_server.example.name
+  value               = "off"
+}
\ No newline at end of file
diff --git a/terraform/azure/storage.tf b/terraform/azure/storage.tf
new file mode 100644
index 0000000..8d68862
--- /dev/null
+++ b/terraform/azure/storage.tf
@@ -0,0 +1,69 @@
+resource "azurerm_managed_disk" "example" {
+  name                 = "terragoat-disk-${var.environment}"
+  location             = var.location
+  resource_group_name  = azurerm_resource_group.example.name
+  storage_account_type = "Standard_LRS"
+  create_option        = "Empty"
+  disk_size_gb         = 1
+  encryption_settings {
+    enabled = false
+  }
+  tags = {
+    git_commit           = "d68d2897add9bc2203a5ed0632a5cdd8ff8cefb0"
+    git_file             = "terraform/azure/storage.tf"
+    git_last_modified_at = "2020-06-16 14:46:24"
+    git_last_modified_by = "nimrodkor@gmail.com"
+    git_modifiers        = "nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "d17da7b3-f1c5-4723-9f77-d1b9069459c7"
+  }
+}
+
+resource "azurerm_storage_account" "example" {
+  name                     = "tgsa${var.environment}${random_integer.rnd_int.result}"
+  resource_group_name      = azurerm_resource_group.example.name
+  location                 = azurerm_resource_group.example.location
+  account_tier             = "Standard"
+  account_replication_type = "GRS"
+  queue_properties {
+    logging {
+      delete                = false
+      read                  = false
+      write                 = true
+      version               = "1.0"
+      retention_policy_days = 10
+    }
+    hour_metrics {
+      enabled               = true
+      include_apis          = true
+      version               = "1.0"
+      retention_policy_days = 10
+    }
+    minute_metrics {
+      enabled               = true
+      include_apis          = true
+      version               = "1.0"
+      retention_policy_days = 10
+    }
+  }
+  tags = {
+    git_commit           = "5c6b5d60a8aa63a5d37e60f15185d13a967f0542"
+    git_file             = "terraform/azure/storage.tf"
+    git_last_modified_at = "2021-05-02 10:06:10"
+    git_last_modified_by = "nimrodkor@users.noreply.github.com"
+    git_modifiers        = "Adin.Ermie/nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "23861ff4-c42d-495e-80ac-776c74035f43"
+  }
+}
+
+resource "azurerm_storage_account_network_rules" "test" {
+  resource_group_name  = azurerm_resource_group.example.name
+  storage_account_name = azurerm_storage_account.example.name
+
+  default_action = "Deny"
+  ip_rules       = ["127.0.0.1"]
+  bypass         = ["Metrics"]
+}
diff --git a/terraform/azure/variables.tf b/terraform/azure/variables.tf
new file mode 100644
index 0000000..0f779c5
--- /dev/null
+++ b/terraform/azure/variables.tf
@@ -0,0 +1,15 @@
+variable "subscription_id" {
+  type        = string
+  description = "The subscription ID to be scanned"
+  default     = null
+}
+
+variable "location" {
+  type    = string
+  default = "East US"
+}
+
+variable "environment" {
+  default     = "dev"
+  description = "Must be all lowercase letters or numbers"
+}
\ No newline at end of file
diff --git a/terraform/gcp/README.md b/terraform/gcp/README.md
new file mode 100644
index 0000000..7faede8
--- /dev/null
+++ b/terraform/gcp/README.md
@@ -0,0 +1 @@
+This project uses a state bucket - see the main project README.
\ No newline at end of file
diff --git a/terraform/gcp/big_data.tf b/terraform/gcp/big_data.tf
new file mode 100644
index 0000000..6ac3b07
--- /dev/null
+++ b/terraform/gcp/big_data.tf
@@ -0,0 +1,37 @@
+resource "google_sql_database_instance" "master_instance" {
+  name             = "terragoat-${var.environment}-master"
+  database_version = "POSTGRES_11"
+  region           = var.region
+
+  settings {
+    tier = "db-f1-micro"
+    ip_configuration {
+      ipv4_enabled = true
+      authorized_networks {
+        name  = "WWW"
+        value = "0.0.0.0/0"
+      }
+    }
+    backup_configuration {
+      enabled = false
+    }
+  }
+}
+
+resource "google_bigquery_dataset" "dataset" {
+  dataset_id = "terragoat_${var.environment}_dataset"
+  access {
+    special_group = "allAuthenticatedUsers"
+    role          = "READER"
+  }
+  labels = {
+    git_commit           = "2bdc0871a5f4505be58244029cc6485d45d7bb8e"
+    git_file             = "terraform__gcp__big_data_tf"
+    git_last_modified_at = "2022-01-19-17-02-27"
+    git_last_modified_by = "jameswoolfenden"
+    git_modifiers        = "jameswoolfenden__nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "2560d883-bc3a-4cb6-b9fc-fb666edf626e"
+  }
+}
\ No newline at end of file
diff --git a/terraform/gcp/gcs.tf b/terraform/gcp/gcs.tf
new file mode 100644
index 0000000..cd6dbac
--- /dev/null
+++ b/terraform/gcp/gcs.tf
@@ -0,0 +1,21 @@
+resource "google_storage_bucket" "terragoat_website" {
+  name          = "terragot-${var.environment}"
+  location      = var.location
+  force_destroy = true
+  labels = {
+    git_commit           = "2bdc0871a5f4505be58244029cc6485d45d7bb8e"
+    git_file             = "terraform__gcp__gcs_tf"
+    git_last_modified_at = "2022-01-19-17-02-27"
+    git_last_modified_by = "jameswoolfenden"
+    git_modifiers        = "jameswoolfenden__nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "bd00cd2e-f53f-4daf-8d4d-74c47846c1cc"
+  }
+}
+
+resource "google_storage_bucket_iam_binding" "allow_public_read" {
+  bucket  = google_storage_bucket.terragoat_website.id
+  members = ["allUsers"]
+  role    = "roles/storage.objectViewer"
+}
\ No newline at end of file
diff --git a/terraform/gcp/gke.tf b/terraform/gcp/gke.tf
new file mode 100644
index 0000000..0bb7151
--- /dev/null
+++ b/terraform/gcp/gke.tf
@@ -0,0 +1,31 @@
+data "google_compute_zones" "available_zones" {
+  project = var.project
+  region  = var.region
+}
+
+resource "google_container_cluster" "workload_cluster" {
+  name               = "terragoat-${var.environment}-cluster"
+  logging_service    = "none"
+  location           = var.region
+  initial_node_count = 1
+
+  enable_legacy_abac       = true
+  monitoring_service       = "none"
+  remove_default_node_pool = true
+  network                  = google_compute_network.vpc.name
+  subnetwork               = google_compute_subnetwork.public-subnetwork.name
+  master_authorized_networks_config {
+    cidr_blocks {
+      cidr_block = "0.0.0.0/0"
+    }
+  }
+}
+
+resource "google_container_node_pool" "custom_node_pool" {
+  cluster  = google_container_cluster.workload_cluster.name
+  location = var.region
+
+  node_config {
+    image_type = "Ubuntu"
+  }
+}
diff --git a/terraform/gcp/instances.tf b/terraform/gcp/instances.tf
new file mode 100644
index 0000000..a1b035d
--- /dev/null
+++ b/terraform/gcp/instances.tf
@@ -0,0 +1,48 @@
+data "google_compute_zones" "zones" {}
+
+resource "google_compute_instance" "server" {
+  machine_type = "n1-standard-1"
+  name         = "terragoat-${var.environment}-machine"
+  zone         = data.google_compute_zones.zones.names[0]
+  boot_disk {
+    initialize_params {
+      image = "debian-cloud/debian-9"
+    }
+    auto_delete = true
+  }
+  network_interface {
+    subnetwork = google_compute_subnetwork.public-subnetwork.name
+    access_config {}
+  }
+  can_ip_forward = true
+
+  metadata = {
+    block-project-ssh-keys = false
+    enable-oslogin         = false
+    serial-port-enable     = true
+  }
+  labels = {
+    git_commit           = "2bdc0871a5f4505be58244029cc6485d45d7bb8e"
+    git_file             = "terraform__gcp__instances_tf"
+    git_last_modified_at = "2022-01-19-17-02-27"
+    git_last_modified_by = "jameswoolfenden"
+    git_modifiers        = "jameswoolfenden__nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "cd562b76-fbce-4e60-8c75-c9f43d7ffc16"
+  }
+}
+
+resource "google_compute_disk" "unencrypted_disk" {
+  name = "terragoat-${var.environment}-disk"
+  labels = {
+    git_commit           = "2bdc0871a5f4505be58244029cc6485d45d7bb8e"
+    git_file             = "terraform__gcp__instances_tf"
+    git_last_modified_at = "2022-01-19-17-02-27"
+    git_last_modified_by = "jameswoolfenden"
+    git_modifiers        = "jameswoolfenden__nimrodkor"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "bf87b7d7-a9d8-4f03-a0d4-8a4cbb647d03"
+  }
+}
\ No newline at end of file
diff --git a/terraform/gcp/networks.tf b/terraform/gcp/networks.tf
new file mode 100644
index 0000000..826b91d
--- /dev/null
+++ b/terraform/gcp/networks.tf
@@ -0,0 +1,27 @@
+resource "google_compute_network" "vpc" {
+  name                    = "terragoat-${var.environment}-network"
+  description             = "Virtual vulnerable-by-design network"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_subnetwork" "public-subnetwork" {
+  name          = "terragoat-${var.environment}-public-subnetwork"
+  ip_cidr_range = "10.0.0.0/24"
+  region        = var.region
+  network       = google_compute_network.vpc.id
+
+  secondary_ip_range {
+    range_name    = "tf-test-secondary-range-update1"
+    ip_cidr_range = "192.168.10.0/24"
+  }
+}
+
+resource "google_compute_firewall" "allow_all" {
+  name          = "terragoat-${var.environment}-firewall"
+  network       = google_compute_network.vpc.id
+  source_ranges = ["0.0.0.0/0"]
+  allow {
+    protocol = "tcp"
+    ports    = ["0-65535"]
+  }
+}
diff --git a/terraform/gcp/provider.tf b/terraform/gcp/provider.tf
new file mode 100644
index 0000000..1bf6512
--- /dev/null
+++ b/terraform/gcp/provider.tf
@@ -0,0 +1,13 @@
+provider "google" {
+  credentials = file(var.credentials_path)
+  project = var.project
+  region  = var.region
+}
+
+
+terraform {
+  backend "gcs" {
+    credentials = var.credentials_path
+    prefix      = "terragoat/${var.environment}"
+  }
+}
\ No newline at end of file
diff --git a/terraform/gcp/variables.tf b/terraform/gcp/variables.tf
new file mode 100644
index 0000000..9cacacb
--- /dev/null
+++ b/terraform/gcp/variables.tf
@@ -0,0 +1,24 @@
+variable "credentials_path" {
+  type        = string
+  description = "Path to credentials file"
+}
+
+variable "project" {
+  type        = string
+  description = "The GCP project to be deployed to"
+}
+
+variable "region" {
+  default = "us-central1"
+  type    = string
+}
+
+variable "environment" {
+  default     = "dev"
+  description = "The environment name"
+}
+
+variable "location" {
+  default = "us-central1c"
+  type    = string
+}
\ No newline at end of file
diff --git a/terraform/oracle/bucket.tf b/terraform/oracle/bucket.tf
new file mode 100644
index 0000000..bbc89dd
--- /dev/null
+++ b/terraform/oracle/bucket.tf
@@ -0,0 +1,26 @@
+resource "oci_objectstorage_bucket" "secretsquirrel" {
+  # bucket can't emit object events
+  # Storage hasn't versioning enabled
+  # Storage isn't encrypted with Customer Managed Key
+  # Object Storage is Public"
+  compartment_id        = oci_identity_compartment.tf-compartment.id
+  name                  = "myreallysecretstore"
+  namespace             = data.oci_objectstorage_namespace.example.namespace
+  object_events_enabled = false
+  access_type           = "ObjectRead"
+  metadata              = { "data" = "Blockofdata" }
+  storage_tier          = "Standard"
+  freeform_tags = {
+    git_commit           = "7a7b957091945f77ecef712a92ac719c8d9a6498"
+    git_file             = "terraform/oracle/bucket.tf"
+    git_last_modified_at = "2022-04-06 10:43:57"
+    git_last_modified_by = "james.woolfenden@gmail.com"
+    git_modifiers        = "james.woolfenden"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "a854aa89-5141-4518-a5dc-0ffe3075f209"
+  }
+}
+
+
+
diff --git a/terraform/oracle/compartment.tf b/terraform/oracle/compartment.tf
new file mode 100644
index 0000000..2259c44
--- /dev/null
+++ b/terraform/oracle/compartment.tf
@@ -0,0 +1,16 @@
+resource "oci_identity_compartment" "tf-compartment" {
+  compartment_id = var.tenancy_id
+  description    = "Compartment for Terraform resources."
+  name           = "third-compartment"
+  enable_delete  = true
+  freeform_tags = {
+    git_commit           = "5406d83ae1a7c43b5f1f44a0d044f4622f4a815d"
+    git_file             = "terraform/oracle/compartment.tf"
+    git_last_modified_at = "2022-04-06 15:27:36"
+    git_last_modified_by = "james.woolfenden@gmail.com"
+    git_modifiers        = "james.woolfenden"
+    git_org              = "bridgecrewio"
+    git_repo             = "terragoat"
+    yor_trace            = "20f6ad13-d679-4c7a-8d1b-befdd7f16b97"
+  }
+}
\ No newline at end of file
diff --git a/terraform/oracle/data.tf b/terraform/oracle/data.tf
new file mode 100644
index 0000000..9d5de21
--- /dev/null
+++ b/terraform/oracle/data.tf
@@ -0,0 +1,3 @@
+data "oci_objectstorage_namespace" "example" {
+  compartment_id = oci_identity_compartment.tf-compartment.id
+}
diff --git a/terraform/oracle/provider.tf b/terraform/oracle/provider.tf
new file mode 100644
index 0000000..e2f59a2
--- /dev/null
+++ b/terraform/oracle/provider.tf
@@ -0,0 +1,8 @@
+provider "oci" {
+  #these to be provided by env vars
+  # private_key_path
+  # fingerprint
+  # tenancy_ocid 
+  # user_ocid   
+  region = "uk-london-1"
+}
\ No newline at end of file
diff --git a/terraform/oracle/variables.tf b/terraform/oracle/variables.tf
new file mode 100644
index 0000000..5e3c7f2
--- /dev/null
+++ b/terraform/oracle/variables.tf
@@ -0,0 +1,4 @@
+variable "tenancy_id" {
+  description = "value supplied by env var"
+  default     = ""
+}
\ No newline at end of file