From 2e5cc38179c500e4a1ba2166112a0b24da9b227d Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Wed, 18 Oct 2023 16:26:34 +0100 Subject: [PATCH 1/7] added fullstack-gradle-plugin project to CICD Signed-off-by: Jeromy Cannon --- .github/workflows/zxc-compile-code.yaml | 34 ++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/.github/workflows/zxc-compile-code.yaml b/.github/workflows/zxc-compile-code.yaml index ae722648c..26bdb5ec2 100644 --- a/.github/workflows/zxc-compile-code.yaml +++ b/.github/workflows/zxc-compile-code.yaml @@ -170,7 +170,14 @@ jobs: gradle-version: ${{ inputs.gradle-version }} arguments: assemble --scan build-root-directory: fullstack-examples - gradle-executable: gradlew + + - name: Gradle Plugin Compile + id: gradle-build-gradle-plugin + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0 + with: + gradle-version: ${{ inputs.gradle-version }} + arguments: assemble --scan + build-root-directory: fullstack-gradle-plugin - name: Spotless Check uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0 @@ -186,7 +193,14 @@ jobs: gradle-version: ${{ inputs.gradle-version }} arguments: spotlessCheck --scan build-root-directory: fullstack-examples - gradle-executable: gradlew + + - name: Gradle Plugin Spotless Check + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0 + if: ${{ inputs.enable-spotless-check && steps.gradle-build-gradle-plugin.conclusion == 'success' && !cancelled() }} + with: + gradle-version: ${{ inputs.gradle-version }} + arguments: spotlessCheck --scan + build-root-directory: fullstack-gradle-plugin - name: Unit Tests id: gradle-test @@ -204,11 +218,19 @@ jobs: gradle-version: ${{ inputs.gradle-version }} arguments: check --scan build-root-directory: fullstack-examples - gradle-executable: gradlew + + - name: Gradle Plugin Unit Tests + id: gradle-test-gradle-plugin + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0 + if: ${{ inputs.enable-unit-tests && steps.gradle-build-gradle-plugin.conclusion == 'success' && !cancelled() && !failure() }} + with: + gradle-version: ${{ inputs.gradle-version }} + arguments: check --scan + build-root-directory: fullstack-gradle-plugin - name: Publish Unit Test Report uses: actionite/publish-unit-test-result-action@1e01e49081c6c4073913aa4b7980fa83e709f322 # v2.3.0 - if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && !cancelled() && !failure() }} + if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && steps.gradle-build-examples.conclusion == 'success' && steps.gradle-build-gradle-plugin.conclusion == 'success' && !cancelled() && !failure() }} with: check_name: 'Unit Test Results' check_run_disabled: false @@ -219,7 +241,7 @@ jobs: # here to prevent failures if future modules are not wired properly. - name: Jacoco Coverage Report uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0 - if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }} + if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && steps.gradle-build-examples.conclusion == 'success' && steps.gradle-build-gradle-plugin.conclusion == 'success' && !cancelled() }} with: gradle-version: ${{ inputs.gradle-version }} arguments: jacocoTestReport --scan @@ -233,7 +255,7 @@ jobs: - name: Publish Test Reports uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 - if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && !cancelled() }} + if: ${{ inputs.enable-unit-tests && steps.gradle-build.conclusion == 'success' && steps.gradle-build-examples.conclusion == 'success' && steps.gradle-build-gradle-plugin.conclusion == 'success' && !cancelled() }} with: name: Test Reports path: "**/build/reports/tests/**" From 2e2656bb2fde4085243ca68d5c825c90a7dd947d Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Wed, 18 Oct 2023 17:33:40 +0100 Subject: [PATCH 2/7] adding some code to test the coverage in Sonar Signed-off-by: Jeromy Cannon --- .../examples/validators/InvalidStateSignatureValidator.java | 5 +++++ .../com/hedera/fullstack/gradle/plugin/FullstackPlugin.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java b/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java index dbed50867..358764c6f 100644 --- a/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java +++ b/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java @@ -30,4 +30,9 @@ public class InvalidStateSignatureValidator implements Validator { public Future validate(ValidationContext context) { return null; } + + public void deleteMe() { + // this is a dummy method to test the plugin + System.out.println("Hello World!"); + } } diff --git a/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java b/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java index 0cf9bcc73..09428541d 100644 --- a/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java +++ b/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java @@ -24,4 +24,9 @@ public class FullstackPlugin implements Plugin { public void apply(Project project) { // currently no implementation is needed } + + public void deleteMe() { + // this is a dummy method to test the plugin + System.out.println("Hello World!"); + } } From c7066a73fd99f4d8905495a7099515aa325ac8ae Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Wed, 18 Oct 2023 18:13:58 +0100 Subject: [PATCH 3/7] snyk --all-projects Signed-off-by: Jeromy Cannon --- .github/workflows/zxc-code-analysis.yaml | 2 +- .github/workflows/zxf-snyk-monitor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zxc-code-analysis.yaml b/.github/workflows/zxc-code-analysis.yaml index dbbb72e0b..be0ecdc27 100644 --- a/.github/workflows/zxc-code-analysis.yaml +++ b/.github/workflows/zxc-code-analysis.yaml @@ -162,7 +162,7 @@ jobs: env: SNYK_TOKEN: ${{ secrets.snyk-token }} if: ${{ inputs.enable-snyk-scan && !cancelled() && !failure() }} - run: snyk test --all-sub-projects --severity-threshold=high --json-file-output=snyk-test.json + run: snyk test --all-sub-projects --all-projects --severity-threshold=high --json-file-output=snyk-test.json - name: Snyk Code id: snyk-code diff --git a/.github/workflows/zxf-snyk-monitor.yaml b/.github/workflows/zxf-snyk-monitor.yaml index 34cc0b9c5..496cd078f 100644 --- a/.github/workflows/zxf-snyk-monitor.yaml +++ b/.github/workflows/zxf-snyk-monitor.yaml @@ -70,4 +70,4 @@ jobs: - name: Run Snyk Monitor env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - run: snyk monitor --all-sub-projects + run: snyk monitor --all-sub-projects --all-projects From d6f7c9d2962f4a64f0d19c33f4f7ad0dd270a5a8 Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Wed, 18 Oct 2023 18:16:06 +0100 Subject: [PATCH 4/7] disabled a test to test sonar and coverage Signed-off-by: Jeromy Cannon --- .../hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java b/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java index f5112c6c9..6f6e9e5fb 100644 --- a/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java +++ b/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java @@ -78,6 +78,7 @@ void testHelmInstallChartTaskForHederaNetworkChart() throws IOException { } @Test + @Disabled("delete me") @DisplayName("Simple Helm Install Chart Task") void testHelmInstallChartTaskSimple() { final String namespace = "simple-test"; From bfd1b6ba33ea6f807f620bbee7a8efeb1a1ce13d Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Wed, 18 Oct 2023 18:40:53 +0100 Subject: [PATCH 5/7] snyk removed --all-sub-projects (conflicts with --all-projects) Signed-off-by: Jeromy Cannon --- .github/workflows/zxc-code-analysis.yaml | 2 +- .github/workflows/zxf-snyk-monitor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/zxc-code-analysis.yaml b/.github/workflows/zxc-code-analysis.yaml index be0ecdc27..f8acfcb97 100644 --- a/.github/workflows/zxc-code-analysis.yaml +++ b/.github/workflows/zxc-code-analysis.yaml @@ -162,7 +162,7 @@ jobs: env: SNYK_TOKEN: ${{ secrets.snyk-token }} if: ${{ inputs.enable-snyk-scan && !cancelled() && !failure() }} - run: snyk test --all-sub-projects --all-projects --severity-threshold=high --json-file-output=snyk-test.json + run: snyk test --all-projects --severity-threshold=high --json-file-output=snyk-test.json - name: Snyk Code id: snyk-code diff --git a/.github/workflows/zxf-snyk-monitor.yaml b/.github/workflows/zxf-snyk-monitor.yaml index 496cd078f..3450c0ff2 100644 --- a/.github/workflows/zxf-snyk-monitor.yaml +++ b/.github/workflows/zxf-snyk-monitor.yaml @@ -70,4 +70,4 @@ jobs: - name: Run Snyk Monitor env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - run: snyk monitor --all-sub-projects --all-projects + run: snyk monitor --all-projects From 77eb89f5cbeb854db987d93928c9f0bc4841d539 Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Wed, 18 Oct 2023 19:34:43 +0100 Subject: [PATCH 6/7] Revert "adding some code to test the coverage in Sonar" This reverts commit 376b3a5fb67b7358c17ad46671b3a219dc5c9fcb. Signed-off-by: Jeromy Cannon --- .../examples/validators/InvalidStateSignatureValidator.java | 5 ----- .../com/hedera/fullstack/gradle/plugin/FullstackPlugin.java | 5 ----- 2 files changed, 10 deletions(-) diff --git a/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java b/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java index 358764c6f..dbed50867 100644 --- a/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java +++ b/fullstack-examples/src/main/java/com/hedera/fullstack/examples/validators/InvalidStateSignatureValidator.java @@ -30,9 +30,4 @@ public class InvalidStateSignatureValidator implements Validator { public Future validate(ValidationContext context) { return null; } - - public void deleteMe() { - // this is a dummy method to test the plugin - System.out.println("Hello World!"); - } } diff --git a/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java b/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java index 09428541d..0cf9bcc73 100644 --- a/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java +++ b/fullstack-gradle-plugin/src/main/java/com/hedera/fullstack/gradle/plugin/FullstackPlugin.java @@ -24,9 +24,4 @@ public class FullstackPlugin implements Plugin { public void apply(Project project) { // currently no implementation is needed } - - public void deleteMe() { - // this is a dummy method to test the plugin - System.out.println("Hello World!"); - } } From dc89e0d26b8bb2a2891a020f84aff2372c6b5d0f Mon Sep 17 00:00:00 2001 From: Jeromy Cannon Date: Wed, 18 Oct 2023 19:34:49 +0100 Subject: [PATCH 7/7] Revert "disabled a test to test sonar and coverage" This reverts commit 7730db23cdae7149f5880d5459c7fd5ebc532560. Signed-off-by: Jeromy Cannon --- .../hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java b/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java index 6f6e9e5fb..f5112c6c9 100644 --- a/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java +++ b/fullstack-gradle-plugin/src/test/java/com/hedera/fullstack/gradle/plugin/HelmInstallChartTaskTest.java @@ -78,7 +78,6 @@ void testHelmInstallChartTaskForHederaNetworkChart() throws IOException { } @Test - @Disabled("delete me") @DisplayName("Simple Helm Install Chart Task") void testHelmInstallChartTaskSimple() { final String namespace = "simple-test";