Add Java packages overrides to schema

Fixes pulumi/pulumi-java#381
pulumi · Jul 11, 2022 · 24d7d00 · 24d7d00
1 parent 4f26021
commit 24d7d00
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Implement Server-Side Apply mode (https://github.com/pulumi/pulumi-kubernetes/pull/2029)
 - Add awaiter for service-account-token secret (https://github.com/pulumi/pulumi-kubernetes/pull/2048)
+- All Java packages changed to be more intuitive, unfortunately this is a breaking change for Java version (https://github.com/pulumi/pulumi-kubernetes/pull/2055)
 
 ## 3.19.4 (June 21, 2022)
 

diff --git a/provider/cmd/pulumi-resource-kubernetes/schema.json b/provider/cmd/pulumi-resource-kubernetes/schema.json
@@ -201,6 +201,65 @@
                 "github.com/pulumi/pulumi-kubernetes/sdk/v3/go/kubernetes/storage/v1beta1": "storagev1beta1"
             }
         },
+        "java": {
+            "packages": {
+                "admissionregistration.k8s.io/v1": "admissionregistration.v1",
+                "admissionregistration.k8s.io/v1beta1": "admissionregistration.v1beta1",
+                "apiextensions.k8s.io/v1": "apiextensions.v1",
+                "apiextensions.k8s.io/v1beta1": "apiextensions.v1beta1",
+                "apiregistration.k8s.io/v1": "apiregistration.v1",
+                "apiregistration.k8s.io/v1beta1": "apiregistration.v1beta1",
+                "apps/v1": "apps.v1",
+                "apps/v1beta1": "apps.v1beta1",
+                "apps/v1beta2": "apps.v1beta2",
+                "auditregistration.k8s.io/v1alpha1": "auditregistration.v1alpha1",
+                "authentication.k8s.io/v1": "authentication.v1",
+                "authentication.k8s.io/v1beta1": "authentication.v1beta1",
+                "authorization.k8s.io/v1": "authorization.v1",
+                "authorization.k8s.io/v1beta1": "authorization.v1beta1",
+                "autoscaling/v1": "autoscaling.v1",
+                "autoscaling/v2": "autoscaling.v2",
+                "autoscaling/v2beta1": "autoscaling.v2beta1",
+                "autoscaling/v2beta2": "autoscaling.v2beta2",
+                "batch/v1": "batch.v1",
+                "batch/v1beta1": "batch.v1beta1",
+                "batch/v2alpha1": "batch.v2alpha1",
+                "certificates.k8s.io/v1": "certificates.v1",
+                "certificates.k8s.io/v1beta1": "certificates.v1beta1",
+                "coordination.k8s.io/v1": "coordination.v1",
+                "coordination.k8s.io/v1beta1": "coordination.v1beta1",
+                "core/v1": "core.v1",
+                "discovery.k8s.io/v1": "discovery.v1",
+                "discovery.k8s.io/v1beta1": "discovery.v1beta1",
+                "events.k8s.io/v1": "events.v1",
+                "events.k8s.io/v1beta1": "events.v1beta1",
+                "extensions/v1beta1": "extensions.v1beta1",
+                "flowcontrol.apiserver.k8s.io/v1alpha1": "flowcontrol.v1alpha1",
+                "flowcontrol.apiserver.k8s.io/v1beta1": "flowcontrol.v1beta1",
+                "flowcontrol.apiserver.k8s.io/v1beta2": "flowcontrol.v1beta2",
+                "helm.sh/v2": "helm.v2",
+                "helm.sh/v3": "helm.v3",
+                "meta/v1": "meta.v1",
+                "networking.k8s.io/v1": "networking.v1",
+                "networking.k8s.io/v1beta1": "networking.v1beta1",
+                "node.k8s.io/v1": "node.v1",
+                "node.k8s.io/v1alpha1": "node.v1alpha1",
+                "node.k8s.io/v1beta1": "node.v1beta1",
+                "pkg/version": "pkg.version",
+                "policy/v1": "policy.v1",
+                "policy/v1beta1": "policy.v1beta1",
+                "rbac.authorization.k8s.io/v1": "rbac.v1",
+                "rbac.authorization.k8s.io/v1alpha1": "rbac.v1alpha1",
+                "rbac.authorization.k8s.io/v1beta1": "rbac.v1beta1",
+                "scheduling.k8s.io/v1": "scheduling.v1",
+                "scheduling.k8s.io/v1alpha1": "scheduling.v1alpha1",
+                "scheduling.k8s.io/v1beta1": "scheduling.v1beta1",
+                "settings.k8s.io/v1alpha1": "settings.v1alpha1",
+                "storage.k8s.io/v1": "storage.v1",
+                "storage.k8s.io/v1alpha1": "storage.v1alpha1",
+                "storage.k8s.io/v1beta1": "storage.v1beta1"
+            }
+        },
         "nodejs": {
             "compatibility": "kubernetes20",
             "dependencies": {

diff --git a/provider/pkg/gen/schema.go b/provider/pkg/gen/schema.go
@@ -227,6 +227,10 @@ func PulumiSchema(swagger map[string]interface{}) pschema.PackageSpec {
 		"yaml":          "Yaml",
 		"":              "Provider",
 	}
+	javaPackages := map[string]string{
+		"helm.sh/v2": "helm.v2",
+		"helm.sh/v3": "helm.v3",
+	}
 	modToPkg := map[string]string{
 		"apiextensions.k8s.io": "apiextensions",
 		"helm.sh":              "helm",
@@ -249,6 +253,7 @@ func PulumiSchema(swagger map[string]interface{}) pschema.PackageSpec {
 				tok := fmt.Sprintf(`kubernetes:%s:%s`, kind.apiVersion, kind.kind)
 
 				csharpNamespaces[kind.apiVersion] = fmt.Sprintf("%s.%s", pascalCase(group.Group()), pascalCase(version.Version()))
+				javaPackages[kind.apiVersion] = fmt.Sprintf("%s.%s", group.Group(), version.Version())
 				modToPkg[kind.apiVersion] = kind.schemaPkgName
 				pkgImportAliases[fmt.Sprintf("%s/%s", goImportPath, kind.schemaPkgName)] = strings.Replace(
 					kind.schemaPkgName, "/", "", -1)
@@ -368,6 +373,10 @@ func PulumiSchema(swagger map[string]interface{}) pschema.PackageSpec {
 		"dictionaryConstructors": true,
 	})
 
+	pkg.Language["java"] = rawMessage(map[string]interface{}{
+		"packages": javaPackages,
+	})
+
 	pkg.Language["go"] = rawMessage(map[string]interface{}{
 		"importBasePath":                 goImportPath,
 		"moduleToPackage":                modToPkg,