[2416797] Updated documentation and removed all occurrences of branch from the code base

Author: amrityamrout

README.md

@@ -96,10 +96,10 @@ components of RESC.
 
 ### VCS Scanner Worker flow diagram
 The flow diagram below shows the different stages that a VCS Scanner Worker goes through and the choices it is confronted with to
-come to the desired result. It first picks up a branch from the queue where it is decided, in conjunction with user input, what type of scan to run. 
-If it is a base scan, a full scan of all commits will be carried out to look for secrets. Possible findings are stored inside the database along with the last scanned commit hash of the branch. An incremental scan, where the branch was scanned earlier, only looks at the commits that were made after the last scanned commit hash. The process of finding secrets and storing them in the database is similar as previously described. 
+come to the desired result. It first picks up a repository from the queue where it is decided, in conjunction with user input, what type of scan to run. 
+If it is a base scan, a full scan of all commits will be carried out to look for secrets. Possible findings are stored inside the database along with the last scanned commit hash of the repository. An incremental scan, where the repository was scanned earlier, only looks at the commits that were made after the last scanned commit hash. The process of finding secrets and storing them in the database is similar as previously described. 
 
-![product-screenshot!](images/RESC_Scan_Flow_Diagram.png)
+![product-screenshot!](images/RESC_Scan_Flow_Diagram.svg)
 
 ### RESC high-level overview
 The diagram below gives a high-level overview of the Repository Scanner tool. All the different components of the

components/resc-backend/tests/newman_tests/RESC_web_service.postman_collection.json

@@ -10313,7 +10313,6 @@
 											"    pm.expect(responseJson[\"data\"][0][\"email\"]).to.eql(\"test-author@mail.com\");",
 											"    pm.expect(responseJson[\"data\"][0][\"event_sent_on\"]).to.eql(null);",
 											"    pm.expect(responseJson[\"data\"][0][\"rule_name\"]).to.eql(\"Rule-1\");",
-											"    pm.expect(responseJson[\"data\"][0][\"branch_id\"]).to.eql(pm.environment.get(\"branch_id\"));",
 											"    pm.expect(responseJson[\"data\"][0][\"id_\"]).to.be.greaterThan(0);",
 											"    pm.expect(responseJson[\"data\"][0][\"scan_ids\"]).to.eql(null);",
 											"});",

components/resc-frontend/src/components/Filters/RuleAnalysisFilter.vue

@@ -146,7 +146,6 @@ export default {
       selectedStatus: null,
       selectedProject: null,
       selectedRepository: null,
-      selectedBranch: null,
       selectedRule: null,
       selectedRuleTags: null,
       selectedRulePackVersions: [],
@@ -242,7 +241,6 @@ export default {
       filterObj.status = this.selectedStatus;
       filterObj.project = this.selectedProject;
       filterObj.repository = this.selectedRepository;
-      filterObj.branch = this.selectedBranch;
       filterObj.rule = this.selectedRule;
       filterObj.rulePackVersions = rulePackVersions;
       filterObj.ruleTags = this.selectedRuleTags;
@@ -315,7 +313,6 @@ export default {
         filterObj.status = this.selectedStatus;
         filterObj.project = this.selectedProject;
         filterObj.repository = this.selectedRepository;
-        filterObj.branch = this.selectedBranch;
         filterObj.rule = selectedRules;
         filterObj.ruleTags = this.selectedRuleTags;
         filterObj.rulePackVersions = selectedVersions;

components/resc-frontend/src/components/Filters/ScanFindingsFilter.vue

@@ -88,7 +88,6 @@ export default {
   data() {
     return {
       previousScans: [],
-      branchList: [],
       scanList: [],
       scanDateList: [],
       ruleList: [],

components/resc-frontend/src/services/branch-service.js

@@ -42,9 +42,6 @@ const FindingsService = {
     if (filter.repository) {
       query_string += `&repository_name=${filter.repository}`;
     }
-    if (filter.branch) {
-      query_string += `&branch_name=${filter.branch}`;
-    }
     if (filter.startDate) {
       query_string += `&start_date_time=${filter.startDate}T00:00:00`;
     }

components/resc-frontend/src/services/findings-service.js

@@ -19,7 +19,6 @@
       "repository_url": "https://bitbucket.com:7999/scm/ABC/test.git",
       "timestamp": "2022-03-09T16:37:22.820000",
       "vcs_provider": "BITBUCKET",
-      "branch_name": "feature1",
       "last_scanned_commit": "138846cfcfc3caea3568d4af6dbabbadb3373039",
       "scan_id": 5,
       "id_": 1

components/resc-frontend/tests/resources/mock_detailed_findings.json

@@ -19,7 +19,6 @@
       "repository_url": "https://bitbucket.com:7999/scm/ABC/test.git",
       "timestamp": "2022-03-09T16:37:22.820000",
       "vcs_provider": "BITBUCKET",
-      "branch_name": "feature1",
       "last_scanned_commit": "138846cfcfc3caea3568d4af6dbabbadb3373039",
       "scan_id": 5,
       "id_": 1

components/resc-frontend/tests/resources/mock_detailed_findings_with_rule_pack_version.json

@@ -51,7 +51,6 @@ describe('function getDetailedFindings', () => {
       filterObj.findingStatus = `${Config.value('notAnalyzedStatusVal')}`;
       filterObj.project = 'ABC';
       filterObj.repository = 'test';
-      filterObj.branch = 'feature1';
       filterObj.rule = 'Hardcoded-Username';
 
       const response = await FindingsService.getDetailedFindings(filterObj);
@@ -79,7 +78,6 @@ describe('function getDetailedFindings', () => {
         filterObj.findingStatus = `${Config.value('notAnalyzedStatusVal')}`;
         filterObj.project = 'ABC';
         filterObj.repository = 'test';
-        filterObj.branch = 'feature1';
         filterObj.rule = 'Hardcoded-Username';
         filterObj.rulePackVersions = '0.0.0';
 

components/resc-frontend/tests/unit/services/branch-service.spec.js

@@ -38,8 +38,7 @@ def test_export_repository_all_branches():
 
     vcs_instance_name = "test server"
 
-    with mock.patch.dict(os.environ, {"SCAN_ONLY_MASTER_BRANCH": "false"}):
-        result = BitbucketConnector.export_repository(repository_information, latest_commit, vcs_instance_name)
+    result = BitbucketConnector.export_repository(repository_information, latest_commit, vcs_instance_name)
 
     assert type(result) is Repository
     assert result.repository_name == "repo1"

components/resc-frontend/tests/unit/services/findings-service.spec.js

@@ -53,8 +53,7 @@ def test_export_repository_all_branches():
     latest_commit = "abc123"
 
     vcs_instance_name = "test server"
-    with mock.patch.dict(os.environ, {"SCAN_ONLY_MASTER_BRANCH": "false"}):
-        result = GithubPublicConnector.export_repository(repository_information, latest_commit, vcs_instance_name)
+    result = GithubPublicConnector.export_repository(repository_information, latest_commit, vcs_instance_name)
 
     assert type(result) is Repository
     assert result.project_key == "project1"

components/resc-vcs-scraper/tests/vcs_scraper/vcs_connectors/test_bitbucket_connector.py

@@ -0,0 +1 @@
+<mxfile host="" modified="2023-07-04T14:50:04.618Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_16_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/11.1.4 Chrome/76.0.3809.88 Electron/6.0.0 Safari/537.36" etag="i6l_zoEsIjOpg4lnpFkJ" version="11.1.4" type="device"><diagram name="Page-1" id="-QA6rKH03Z_Wp-m-v66E">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</diagram></mxfile>