From 66cfdfeddd7414022fb1e8cd108351c30a563150 Mon Sep 17 00:00:00 2001
From: Claire Labry <claire@hashicorp.com>
Date: Fri, 4 Feb 2022 14:05:28 -0500
Subject: [PATCH] reverting changes for the container + binary blocks

---
 .github/workflows/build.yml |  3 ++-
 .release/ci.hcl             |  6 +-----
 .release/security-scan.hcl  | 10 ++--------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a6069e105..9fab5e004 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,8 @@ on:
     # Sequence of patterns matched against refs/heads
     branches:
       # Push events on the main branch
-      - main
+      # - main
+      - 'fix-security-scan'
 
 env:
   PKG_NAME: consul
diff --git a/.release/ci.hcl b/.release/ci.hcl
index bf4a2144f..fbd912ba4 100644
--- a/.release/ci.hcl
+++ b/.release/ci.hcl
@@ -10,11 +10,7 @@ project "consul" {
     organization = "hashicorp"
     repository = "consul"
     release_branches = [
-      "main",
-      "release/1.8.x",
-      "release/1.9.x",
-      "release/1.10.x",
-      "release/1.11.x"
+      "fix-security-scan"
     ]
   }
 }
diff --git a/.release/security-scan.hcl b/.release/security-scan.hcl
index 6a2a57b8b..a3d2c7cbc 100644
--- a/.release/security-scan.hcl
+++ b/.release/security-scan.hcl
@@ -1,19 +1,13 @@
 container {
+	secrets		 = true
 	dependencies = true
 	alpine_secdb = true
-	
-	secrets {
-		all = true
-	}
 }
 
 binary {
+	secrets		 = true
 	go_modules   = true
 	osv          = true
 	oss_index    = true
 	nvd          = true
-
-	secrets {
-		all = true
-	}
 }