@@ -89,31 +89,8 @@ tasks.register("assertGeneratedCRDMatchesHelmChart") {
8989 " ${ stagedCRDFileBase} sparkclusters.spark.apache.org-v1.yaml"
9090 ]. execute(). text. trim()
9191 if (generatedAppCRD != stagedAppCRD || generatedClusterCRD != stagedClusterCRD) {
92- def errorMessage = new StringBuilder (" Generated CRD yaml does not match the staged " +
93- " version in Helm Chart, please keep the chart updated.\n\n " )
94-
95- if (generatedAppCRD != stagedAppCRD) {
96- errorMessage. append(" === SparkApplication CRD Differences ===\n " )
97- def appDiff = [" bash" , " -c" ,
98- " diff -u <(echo '${ generatedAppCRD.replace("'", "'\\''")} ' " +
99- " | yq -P 'sort_keys(..)') <(echo '${ stagedAppCRD.replace("'", "'\\''")} ' " +
100- " | yq -P 'sort_keys(..)')" ]
101- .execute(). text
102- errorMessage. append(appDiff ?: " Unable to generate diff\n " )
103- errorMessage. append(" \n " )
104- }
105-
106- if (generatedClusterCRD != stagedClusterCRD) {
107- errorMessage. append(" === SparkCluster CRD Differences ===\n " )
108- def clusterDiff = [" bash" , " -c" ,
109- " diff -u <(echo '${ generatedClusterCRD.replace("'", "'\\''")} ' " +
110- " | yq -P 'sort_keys(..)') <(echo '${ stagedClusterCRD.replace("'", "'\\''")} ' " +
111- " | yq -P 'sort_keys(..)')" ]
112- .execute(). text
113- errorMessage. append(clusterDiff ?: " Unable to generate diff\n " )
114- }
115-
116- throw new GradleException (errorMessage. toString())
92+ throw new GradleException (" Generated CRD yaml does not match the staged version in " +
93+ " Helm Chart, please keep the chart updated." )
11794 }
11895 }
11996}
0 commit comments