From 0cc67489f4a0aafdcf95db3ecc08a6da9f24e25e Mon Sep 17 00:00:00 2001 From: Robbie Bise Date: Tue, 19 Mar 2024 13:46:25 -0500 Subject: [PATCH 1/6] fix some things break some others --- comp-cli/src/person.py | 4 +-- comp-dotnet/project/MyClass.cs | 2 ++ comp-dotnet/project/Program.cs | 2 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../netcoreapp2.2/dotnet-sample.assets.cache | Bin 40726 -> 40726 bytes .../coverage_metrics/CoverageMetrics.java | 25 ++++++++++++------ 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/comp-cli/src/person.py b/comp-cli/src/person.py index 78f9283..cea717e 100644 --- a/comp-cli/src/person.py +++ b/comp-cli/src/person.py @@ -17,14 +17,12 @@ def __init__(self, first=None, last=None): self.gender = None self.religion = None self.compensation = 0 + return self def store_religion(self, religion): self.religion = religion def compute_pay(self): - # TODO: something - # TODO: something - # TODO: something if self.gender == Person.MALE: self.compensation = SOME_VALUE elif self.gender == Person.FEMALE: diff --git a/comp-dotnet/project/MyClass.cs b/comp-dotnet/project/MyClass.cs index da99e45..9a46bb2 100644 --- a/comp-dotnet/project/MyClass.cs +++ b/comp-dotnet/project/MyClass.cs @@ -6,6 +6,8 @@ public class MyClass { public string ReturnMessage() { + int await = 42; + int async = 42; return "Happy coding!"; } } diff --git a/comp-dotnet/project/Program.cs b/comp-dotnet/project/Program.cs index 8bbe9ca..5301779 100644 --- a/comp-dotnet/project/Program.cs +++ b/comp-dotnet/project/Program.cs @@ -2,7 +2,7 @@ namespace HelloWorld { - class Program + static class Program { static void Main(string[] args) { diff --git a/comp-dotnet/project/obj/Debug/netcoreapp2.2/dotnet-sample.GeneratedMSBuildEditorConfig.editorconfig b/comp-dotnet/project/obj/Debug/netcoreapp2.2/dotnet-sample.GeneratedMSBuildEditorConfig.editorconfig index 7a9dc80..74ddaf9 100644 --- a/comp-dotnet/project/obj/Debug/netcoreapp2.2/dotnet-sample.GeneratedMSBuildEditorConfig.editorconfig +++ b/comp-dotnet/project/obj/Debug/netcoreapp2.2/dotnet-sample.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,3 @@ is_global = true build_property.RootNamespace = dotnet_sample -build_property.ProjectDir = /Users/theil.bise/repos/monorepo/Monorepo-Example/comp-dotnet/project/ +build_property.ProjectDir = /Users/theil.bise/repos/monorepo/GitHub-Monorepo-Example/comp-dotnet/project/ diff --git a/comp-dotnet/project/obj/Debug/netcoreapp2.2/dotnet-sample.assets.cache b/comp-dotnet/project/obj/Debug/netcoreapp2.2/dotnet-sample.assets.cache index 8e4d66d3832bd0a29f86487bbc18bb09236b8673..ec3f27910b170f3f6c4f65c25887e51f4197157a 100644 GIT binary patch delta 51 zcmV-30L=fEz5RM?nk#002H0%oRM?nk#005GWoet=Rc?|~~?CeVo<`gb!bQ$)_+5iYkAVT{` Jn~Sk1?w;Xm6i@&F diff --git a/comp-maven/src/main/java/coverage_metrics/CoverageMetrics.java b/comp-maven/src/main/java/coverage_metrics/CoverageMetrics.java index 965228c..edfd370 100644 --- a/comp-maven/src/main/java/coverage_metrics/CoverageMetrics.java +++ b/comp-maven/src/main/java/coverage_metrics/CoverageMetrics.java @@ -1,6 +1,7 @@ package coverage_metrics; import java.security.SecureRandom; +import java.util.List; /* * @@ -89,14 +90,22 @@ public static boolean all0sAnd1s(String val){ } return all; } -private int generateRandom() throws java.io.UnsupportedEncodingException{ - SecureRandom sr = new SecureRandom(); - sr.setSeed(123456L); - int v = sr.nextInt(32); - - sr = new SecureRandom("abcdefghijklmnop".getBytes("us-ascii")); - v = sr.nextInt(32); - return v; + } +class Entity implements Cloneable { // Noncompliant, using `Cloneable` + + public int value; + public List children; // deep copy wanted + + @Override + public Entity clone() { + try { + Entity copy = (Entity) super.clone(); // invariant not enforced, because no constructor is caled + copy.children = children.stream().map(Entity::clone).toList(); + return copy; + } catch (CloneNotSupportedException e) { // this will not happen due to behavioral contract + throw new AssertionError(); + } + } } From 86450a084cad686eea44577165ae6d837e13ba35 Mon Sep 17 00:00:00 2001 From: Robbie Bise Date: Tue, 19 Mar 2024 14:04:33 -0500 Subject: [PATCH 2/6] add PR to code --- .github/workflows/cli-scan.yaml | 7 +++++++ .github/workflows/dotnet-scan.yaml | 7 +++++++ .github/workflows/maven-scan.yaml | 7 +++++++ README.md | 20 ++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/.github/workflows/cli-scan.yaml b/.github/workflows/cli-scan.yaml index 54682f4..6d5cd61 100644 --- a/.github/workflows/cli-scan.yaml +++ b/.github/workflows/cli-scan.yaml @@ -10,6 +10,13 @@ on: - '.github/workflows/cli-scan.yaml' - '.gitignore' - 'comp-cli/**/*' + pull_request: + types: [opened, synchronize, reopened] + paths: + - '.github/workflows/cli-scan.yaml' + - '.gitignore' + - 'comp-cli/**/*' + workflow_dispatch: diff --git a/.github/workflows/dotnet-scan.yaml b/.github/workflows/dotnet-scan.yaml index 9fb1b19..aefb4e6 100644 --- a/.github/workflows/dotnet-scan.yaml +++ b/.github/workflows/dotnet-scan.yaml @@ -11,6 +11,13 @@ on: - '.gitignore' - 'comp-dotnet/*.sln' - 'comp-dotnet/project/*.cs*' + pull_request: + types: [opened, synchronize, reopened] + paths: + - '.github/workflows/dotnet-scan.yaml' + - '.gitignore' + - 'comp-dotnet/*.sln' + - 'comp-dotnet/project/*.cs*' workflow_dispatch: jobs: diff --git a/.github/workflows/maven-scan.yaml b/.github/workflows/maven-scan.yaml index 43efd03..27e9e2e 100644 --- a/.github/workflows/maven-scan.yaml +++ b/.github/workflows/maven-scan.yaml @@ -11,6 +11,13 @@ on: - '.gitignore' - 'comp-maven/src/**/*' - 'comp-maven/pom.xml' + pull_request: + types: [opened, synchronize, reopened] + paths: + - '.github/workflows/maven-scan.yaml' + - '.gitignore' + - 'comp-maven/src/**/*' + - 'comp-maven/pom.xml' workflow_dispatch: jobs: scan-maven: diff --git a/README.md b/README.md index 2c0645d..d7f4fd4 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,12 @@ on: - '.github/workflows/cli-scan.yaml' - '.gitignore' - 'comp-cli/**/*' + pull_request: + types: [opened, synchronize, reopened] + paths: + - '.github/workflows/cli-scan.yaml' + - '.gitignore' + - 'comp-cli/**/*' ``` The SonarQube scan is run with `comp-cli` as the base directory. @@ -49,6 +55,13 @@ on: - '.gitignore' - 'comp-dotnet/*.sln' - 'comp-dotnet/project/*.cs*' + pull_request: + types: [opened, synchronize, reopened] + paths: + - '.github/workflows/dotnet-scan.yaml' + - '.gitignore' + - 'comp-dotnet/*.sln' + - 'comp-dotnet/project/*.cs*' ``` The .NET build and SonarQube scan are run in the `comp-dotnet` directory. ```yaml @@ -75,6 +88,13 @@ on: - '.gitignore' - 'comp-maven/src/**/*' - 'comp-maven/pom.xml' + pull_request: + types: [opened, synchronize, reopened] + paths: + - '.github/workflows/maven-scan.yaml' + - '.gitignore' + - 'comp-maven/src/**/*' + - 'comp-maven/pom.xml' ``` The Maven build and SonarQube scan are run in the `comp-maven` directory. ```yaml From a162b56e86e000334a377004e32f7596c3da1053 Mon Sep 17 00:00:00 2001 From: robbiebise <118204121+robbiebise@users.noreply.github.com> Date: Thu, 30 May 2024 10:46:16 -0500 Subject: [PATCH 3/6] Update cli-scan.yaml --- .github/workflows/cli-scan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cli-scan.yaml b/.github/workflows/cli-scan.yaml index 6d5cd61..d8ac2f6 100644 --- a/.github/workflows/cli-scan.yaml +++ b/.github/workflows/cli-scan.yaml @@ -29,7 +29,7 @@ jobs: name: SonarQube Scan for CLI runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - uses: sonarsource/sonarqube-scan-action@master From 638f4b9d1e699f5a069fa71dc0dbe753cd598fc5 Mon Sep 17 00:00:00 2001 From: robbiebise <118204121+robbiebise@users.noreply.github.com> Date: Mon, 2 Jun 2025 09:11:55 -0500 Subject: [PATCH 4/6] Update maven-scan.yaml --- .github/workflows/maven-scan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-scan.yaml b/.github/workflows/maven-scan.yaml index 27e9e2e..8934ca8 100644 --- a/.github/workflows/maven-scan.yaml +++ b/.github/workflows/maven-scan.yaml @@ -35,7 +35,7 @@ jobs: with: java-version: 17 - name: Cache SonarQube packages - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar From 0aefbb8fea397f10d5e684039d53999f04586f1b Mon Sep 17 00:00:00 2001 From: robbiebise <118204121+robbiebise@users.noreply.github.com> Date: Mon, 2 Jun 2025 09:16:55 -0500 Subject: [PATCH 5/6] Update maven-scan.yaml --- .github/workflows/maven-scan.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-scan.yaml b/.github/workflows/maven-scan.yaml index 8934ca8..55e5f52 100644 --- a/.github/workflows/maven-scan.yaml +++ b/.github/workflows/maven-scan.yaml @@ -41,7 +41,7 @@ jobs: key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From 7fbac8e317d292b767788420f53391472139d0c6 Mon Sep 17 00:00:00 2001 From: robbiebise <118204121+robbiebise@users.noreply.github.com> Date: Mon, 2 Jun 2025 09:18:36 -0500 Subject: [PATCH 6/6] Update dotnet-scan.yaml --- .github/workflows/dotnet-scan.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-scan.yaml b/.github/workflows/dotnet-scan.yaml index aefb4e6..fc2bb06 100644 --- a/.github/workflows/dotnet-scan.yaml +++ b/.github/workflows/dotnet-scan.yaml @@ -34,14 +34,14 @@ jobs: with: java-version: 17 - name: Cache SonarQube packages - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~\.sonar\cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache SonarQube scanner id: cache-sonar-scanner - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: .\.sonar\scanner key: ${{ runner.os }}-sonar-scanner @@ -58,4 +58,4 @@ jobs: cd .\comp-dotnet ..\.sonar\scanner\dotnet-sonarscanner begin /k:"demo:mono-dotnet" /n:"Monorepo .Net Core" /d:sonar.plugins.downloadOnlyRequired=true /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="${{ secrets.SONAR_HOST_URL }}" dotnet build dotnetcore-sample.sln - ..\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}" \ No newline at end of file + ..\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"