fix (extensions/istio) : Remove clashing packages in istio-model-v1be…

…ta1 (#5000)

+ Packages from v1alpha apiGroups were getting generated in both
  istio-model-v1alpha3 and istio-model-v1beta1 modules due to
  mappingSchema generating everything in go package path `istio.io/api`

+ Modify mappingSchema to specify full package path of required packages
  only. Also make istio-model-v1beta1 depend on istio-model-v1alpha3 for
  dependent packages instead of generating them on their own

Signed-off-by: Rohan Kumar <[email protected]>

CHANGELOG.md

@@ -9,6 +9,7 @@
 * Fix #4985: triggering the immediate cleanup of the okhttp idle task
 * Fix #4988: Ensuring that previous requests are closed before retry
 * Fix #4993: Quantity class should have @JsonIgnore on the additionalProperties parameter
+* Fix #5000: Remove clashing `v1alpha` apigroup packages in `istio-model-v1beta1`
 * fix #5002: Jetty response completion accounts for header processing
 * Fix #5009: addressing issue with serialization of wrapped polymorphic types
 * Fix #5020: updating the resourceVersion on a delete with finalizers

extensions/istio/generator-v1alpha3/cmd/generate/generate.go

@@ -76,8 +76,10 @@ func main() {
 	//  - replace <key> with <value> aka "package prefix"
 	//  - replace '/' with '.' for a valid java package name
 	mappingSchema := map[string]string{
-		"istio.io/api":                   "io.fabric8.istio.api",
 		"github.com/gogo/protobuf/types": "io.fabric8.istio.api.internal.protobuf.types",
+		"istio.io/api/analysis/v1alpha1": "io.fabric8.istio.api.analysis.v1alpha1",
+		"istio.io/api/meta/v1alpha1": "io.fabric8.istio.api.meta.v1alpha1",
+		"istio.io/api/networking/v1alpha3": "io.fabric8.istio.api.networking.v1alpha3",
 	}
 
 	// overwriting some times

extensions/istio/generator-v1beta1/cmd/generate/generate.go

@@ -69,6 +69,8 @@ func main() {
 	providedPackages := map[string]string{
 		"k8s.io/apimachinery/pkg/apis/meta/v1": "io.fabric8.kubernetes.api.model",
 		"k8s.io/api/core/v1":                   "io.fabric8.kubernetes.api.model",
+		"istio.io/api/analysis/v1alpha1":       "io.fabric8.istio.api.analysis.v1alpha1",
+		"istio.io/api/meta/v1alpha1":           "io.fabric8.istio.api.meta.v1alpha1",
 	}
 
 	// mapping of go packages of this module to the resulting java package
@@ -83,7 +85,9 @@ func main() {
 	//  - replace <key> with <value> aka "package prefix"
 	//  - replace '/' with '.' for a valid java package name
 	mappingSchema := map[string]string{
-		"istio.io/api": "io.fabric8.istio.api",
+	  "istio.io/api/networking/v1beta1": "io.fabric8.istio.api.networking.v1beta1",
+		"istio.io/api/type/v1beta1": "io.fabric8.istio.api.type.v1beta1",
+		"istio.io/api/security/v1beta1": "io.fabric8.istio.api.security.v1beta1",
 	}
 
 	// overwriting some times

extensions/istio/model-v1beta1/pom.xml

@@ -33,7 +33,6 @@
   <properties>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
-      !io.fabric8.istio.*,
       *
     </osgi.import>
     <osgi.export>
@@ -42,6 +41,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>istio-model-v1alpha3</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.sundr</groupId>
       <artifactId>builder-annotations</artifactId>