From d687371cf0ff509bf1e9fa0a0da7526995825119 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Wed, 1 Nov 2023 12:26:54 +0000 Subject: [PATCH 1/5] removed file Signed-off-by: Mark Bolwell --- .config/.gitleaks-report.json | 142 ---------------------------------- 1 file changed, 142 deletions(-) delete mode 100644 .config/.gitleaks-report.json diff --git a/.config/.gitleaks-report.json b/.config/.gitleaks-report.json deleted file mode 100644 index bea9d1d8..00000000 --- a/.config/.gitleaks-report.json +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "Description": "Generic API Key", - "StartLine": 125, - "EndLine": 125, - "StartColumn": 18, - "EndColumn": 68, - "Match": "secret\": \"64411efd0f0561fe4852c6e414071345c9c6432a\"", - "Secret": "64411efd0f0561fe4852c6e414071345c9c6432a", - "File": ".config/.secrets.baseline", - "SymlinkFile": "", - "Commit": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131", - "Entropy": 3.646039, - "Author": "Mark Bolwell", - "Email": "mark.bollyuk@gmail.com", - "Date": "2023-09-14T14:20:12Z", - "Message": "gcsm \"added and setup secrets\"\n\nSigned-off-by: Mark Bolwell \u003cmark.bollyuk@gmail.com\u003e", - "Tags": [], - "RuleID": "generic-api-key", - "Fingerprint": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131:.config/.secrets.baseline:generic-api-key:125" - }, - { - "Description": "Generic API Key", - "StartLine": 135, - "EndLine": 135, - "StartColumn": 18, - "EndColumn": 68, - "Match": "secret\": \"673504d3db128a01a93d32de2b104a05dc2e6859\"", - "Secret": "673504d3db128a01a93d32de2b104a05dc2e6859", - "File": ".config/.secrets.baseline", - "SymlinkFile": "", - "Commit": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131", - "Entropy": 3.7750704, - "Author": "Mark Bolwell", - "Email": "mark.bollyuk@gmail.com", - "Date": "2023-09-14T14:20:12Z", - "Message": "gcsm \"added and setup secrets\"\n\nSigned-off-by: Mark Bolwell \u003cmark.bollyuk@gmail.com\u003e", - "Tags": [], - "RuleID": "generic-api-key", - "Fingerprint": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131:.config/.secrets.baseline:generic-api-key:135" - }, - { - "Description": "Generic API Key", - "StartLine": 145, - "EndLine": 145, - "StartColumn": 18, - "EndColumn": 68, - "Match": "secret\": \"2784977b09b611a32db88f631d88a5806605967e\"", - "Secret": "2784977b09b611a32db88f631d88a5806605967e", - "File": ".config/.secrets.baseline", - "SymlinkFile": "", - "Commit": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131", - "Entropy": 3.718454, - "Author": "Mark Bolwell", - "Email": "mark.bollyuk@gmail.com", - "Date": "2023-09-14T14:20:12Z", - "Message": "gcsm \"added and setup secrets\"\n\nSigned-off-by: Mark Bolwell \u003cmark.bollyuk@gmail.com\u003e", - "Tags": [], - "RuleID": "generic-api-key", - "Fingerprint": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131:.config/.secrets.baseline:generic-api-key:145" - }, - { - "Description": "Generic API Key", - "StartLine": 153, - "EndLine": 153, - "StartColumn": 18, - "EndColumn": 68, - "Match": "secret\": \"64411efd0f0561fe4852c6e414071345c9c6432a\"", - "Secret": "64411efd0f0561fe4852c6e414071345c9c6432a", - "File": ".config/.secrets.baseline", - "SymlinkFile": "", - "Commit": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131", - "Entropy": 3.646039, - "Author": "Mark Bolwell", - "Email": "mark.bollyuk@gmail.com", - "Date": "2023-09-14T14:20:12Z", - "Message": "gcsm \"added and setup secrets\"\n\nSigned-off-by: Mark Bolwell \u003cmark.bollyuk@gmail.com\u003e", - "Tags": [], - "RuleID": "generic-api-key", - "Fingerprint": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131:.config/.secrets.baseline:generic-api-key:153" - }, - { - "Description": "Generic API Key", - "StartLine": 163, - "EndLine": 163, - "StartColumn": 18, - "EndColumn": 68, - "Match": "secret\": \"2aaf9f2a51d8fe89e48cb9cc7d04a991ceb7f360\"", - "Secret": "2aaf9f2a51d8fe89e48cb9cc7d04a991ceb7f360", - "File": ".config/.secrets.baseline", - "SymlinkFile": "", - "Commit": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131", - "Entropy": 3.8439426, - "Author": "Mark Bolwell", - "Email": "mark.bollyuk@gmail.com", - "Date": "2023-09-14T14:20:12Z", - "Message": "gcsm \"added and setup secrets\"\n\nSigned-off-by: Mark Bolwell \u003cmark.bollyuk@gmail.com\u003e", - "Tags": [], - "RuleID": "generic-api-key", - "Fingerprint": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131:.config/.secrets.baseline:generic-api-key:163" - }, - { - "Description": "Generic API Key", - "StartLine": 172, - "EndLine": 172, - "StartColumn": 18, - "EndColumn": 68, - "Match": "secret\": \"fd917ab33fb6bd01e799f4b72da0586589cd909a\"", - "Secret": "fd917ab33fb6bd01e799f4b72da0586589cd909a", - "File": ".config/.secrets.baseline", - "SymlinkFile": "", - "Commit": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131", - "Entropy": 3.808695, - "Author": "Mark Bolwell", - "Email": "mark.bollyuk@gmail.com", - "Date": "2023-09-14T14:20:12Z", - "Message": "gcsm \"added and setup secrets\"\n\nSigned-off-by: Mark Bolwell \u003cmark.bollyuk@gmail.com\u003e", - "Tags": [], - "RuleID": "generic-api-key", - "Fingerprint": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131:.config/.secrets.baseline:generic-api-key:172" - }, - { - "Description": "Generic API Key", - "StartLine": 182, - "EndLine": 182, - "StartColumn": 18, - "EndColumn": 68, - "Match": "secret\": \"a94a8fe5ccb19ba61c4c0873d391e987982fbbd3\"", - "Secret": "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3", - "File": ".config/.secrets.baseline", - "SymlinkFile": "", - "Commit": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131", - "Entropy": 3.8250706, - "Author": "Mark Bolwell", - "Email": "mark.bollyuk@gmail.com", - "Date": "2023-09-14T14:20:12Z", - "Message": "gcsm \"added and setup secrets\"\n\nSigned-off-by: Mark Bolwell \u003cmark.bollyuk@gmail.com\u003e", - "Tags": [], - "RuleID": "generic-api-key", - "Fingerprint": "a5bff3aeebed42fc2ae23d04d64cf9ed560bf131:.config/.secrets.baseline:generic-api-key:182" - } -] From 9dd216c104c7942e2aa5c7c75c86c4b8848863df Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Wed, 1 Nov 2023 12:27:08 +0000 Subject: [PATCH 2/5] updated Signed-off-by: Mark Bolwell --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 40a21e27..97c79434 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,6 @@ repos: hooks: - id: gitleaks args: ['--baseline-path', '.config/.gitleaks-report.json'] - exclude: .config/.secrets.baseline - repo: https://github.com/ansible-community/ansible-lint rev: v6.17.2 From 388f85061c0b8ffe04d9a10173666e0542c1b02b Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Wed, 1 Nov 2023 12:27:44 +0000 Subject: [PATCH 3/5] updated Signed-off-by: Mark Bolwell --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 97c79434..00d0e09d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,7 +7,7 @@ ci: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.5.0 hooks: # Safety - id: detect-aws-credentials @@ -34,16 +34,16 @@ repos: hooks: - id: detect-secrets args: [ '--baseline', '.config/.secrets.baseline' ] - exclude: .config/.gitleaks-report.json + - repo: https://github.com/gitleaks/gitleaks - rev: v8.17.0 + rev: v8.18.0 hooks: - id: gitleaks args: ['--baseline-path', '.config/.gitleaks-report.json'] - repo: https://github.com/ansible-community/ansible-lint - rev: v6.17.2 + rev: v6.21.1 hooks: - id: ansible-lint name: Ansible-lint From 22f7dabfedc1afb76f45deba55129427de70f169 Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Wed, 1 Nov 2023 12:28:47 +0000 Subject: [PATCH 4/5] lint update Signed-off-by: Mark Bolwell --- .pre-commit-config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 00d0e09d..f2f732af 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,7 +35,6 @@ repos: - id: detect-secrets args: [ '--baseline', '.config/.secrets.baseline' ] - - repo: https://github.com/gitleaks/gitleaks rev: v8.18.0 hooks: From 51b2df3a671cc1d33eb6d891a1b480283857942f Mon Sep 17 00:00:00 2001 From: Mark Bolwell Date: Wed, 1 Nov 2023 12:30:39 +0000 Subject: [PATCH 5/5] fix typo Signed-off-by: Mark Bolwell --- .github/workflows/devel_pipeline_validation.yml | 2 +- .github/workflows/main_pipeline_validation.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/devel_pipeline_validation.yml b/.github/workflows/devel_pipeline_validation.yml index 9fbe7aa8..39af625a 100644 --- a/.github/workflows/devel_pipeline_validation.yml +++ b/.github/workflows/devel_pipeline_validation.yml @@ -113,7 +113,7 @@ - name: Sleep for 60 seconds run: sleep ${{ vars.BUILD_SLEEPTIME }} - # Run the Ansibleplaybook + # Run the Ansible playbook - name: Run_Ansible_Playbook uses: arillso/action.playbook@master with: diff --git a/.github/workflows/main_pipeline_validation.yml b/.github/workflows/main_pipeline_validation.yml index 67ee9d90..8ded7018 100644 --- a/.github/workflows/main_pipeline_validation.yml +++ b/.github/workflows/main_pipeline_validation.yml @@ -102,7 +102,7 @@ - name: Sleep for 60 seconds run: sleep ${{ vars.BUILD_SLEEPTIME }} - # Run the Ansibleplaybook + # Run the Ansible playbook - name: Run_Ansible_Playbook uses: arillso/action.playbook@master with: