[Java] Fix: version.txt not found (#213)

* fix: new path for java classes * fix: 🐛 add the complete groupID to generate the version.txt at the right place * fix: groupId --------- Co-authored-by: philippart-s <[email protected]>
ovh · Sep 5, 2024 · fef0f2c · fef0f2c
1 parent 03cb848
commit fef0f2c
Show file tree

Hide file tree

Showing 924 changed files with 1,890 additions and 1,891 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ JAVA_GEN_VERSION := v0.15.0
 TFGEN           := pulumi-tfgen-${PACK}
 PROVIDER        := pulumi-resource-${PACK}
 VERSION         := $(shell pulumictl get version)
-JAVA_GROUP_ID    := com.ovhcloud.pulumi
+JAVA_GROUP_ID   := com.ovhcloud.pulumi.ovh
 JAVA_ARTIFACT_ID := ${ORG}
 
 PLATFORM := linux-amd64
@@ -108,7 +108,6 @@ build_go:: install_plugins tfgen # build the go sdk
 build_java:: PACKAGE_VERSION := $(shell pulumictl get version --language generic)
 build_java:: bin/pulumi-java-gen
 	$(WORKING_DIR)/bin/$(JAVA_GEN) generate --schema provider/cmd/$(PROVIDER)/schema.json --out sdk/java  --build gradle-nexus
-	rm -f ./provider/cmd/$(PROVIDER)/schema-java.json
 
 	echo "update java version in build.gradle" && cd ./sdk/java/ && ${SED} -e 's/of(11)/of(21)/g' build.gradle
 	echo "update inceptionYear in build.gradle" && cd ./sdk/java/ && ${SED} -e 's/inceptionYear = .*/inceptionYear = "2024"/g' build.gradle
@@ -121,7 +120,6 @@ build_java:: bin/pulumi-java-gen
 
 	echo "update rootProject in settings.gradle" && cd ./sdk/java && ${SED} -e 's/rootProject.name = .*/rootProject.name = "$(JAVA_GROUP_ID)"/g' settings.gradle
 
-
 	cd sdk/java/ && \
 		echo "module fake_java_module // Exclude this directory from Go tools\n\ngo 1.17" > go.mod && \
 		gradle --console=plain build

diff --git a/provider/cmd/pulumi-resource-ovh/schema.json b/provider/cmd/pulumi-resource-ovh/schema.json
@@ -30,7 +30,7 @@
             "generateExtraInputTypes": true
         },
         "java": {
-            "basePackage": "com.ovh",
+            "basePackage": "com.ovhcloud.pulumi",
             "buildFiles": "",
             "gradleNexusPublishPluginVersion": "",
             "gradleTest": ""

diff --git a/provider/resources.go b/provider/resources.go
@@ -933,7 +933,8 @@ func Provider() tfbridge.ProviderInfo {
 			},
 		},
 		Java: &tfbridge.JavaInfo{
-			BasePackage: "com.ovh",
+			//BasePackage: "com.ovh",
+			BasePackage: "com.ovhcloud",
 		},
 	}
 

diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 }
 
-group = "com.ovhcloud.pulumi"
+group = "com.ovhcloud.pulumi.ovh"
 
 def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
     (project.version == "unspecified"
@@ -82,7 +82,7 @@ jar.configure {
 publishing {
     publications {
         mainPublication(MavenPublication) {
-            groupId = "com.ovhcloud.pulumi"
+            groupId = "com.ovhcloud.pulumi.ovh"
             artifactId = "ovh"
             version = resolvedVersion
             from components.java

diff --git a/sdk/java/settings.gradle b/sdk/java/settings.gradle
@@ -10,5 +10,5 @@ pluginManagement {
   }
 }
 
-rootProject.name = "com.ovhcloud.pulumi"
+rootProject.name = "com.ovhcloud.pulumi.ovh"
 include("lib")
diff --git a/...ava/com/ovh/ovh/Cloud/CloudFunctions.java → ...loud/pulumi/ovh/Cloud/CloudFunctions.java b/...ava/com/ovh/ovh/Cloud/CloudFunctions.java → ...loud/pulumi/ovh/Cloud/CloudFunctions.java
@@ -1,13 +1,13 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud;
+package com.ovhcloud.pulumi.ovh.Cloud;
 
-import com.ovh.ovh.Cloud.inputs.GetProjectArgs;
-import com.ovh.ovh.Cloud.inputs.GetProjectPlainArgs;
-import com.ovh.ovh.Cloud.outputs.GetProjectResult;
-import com.ovh.ovh.Cloud.outputs.GetProjectsResult;
-import com.ovh.ovh.Utilities;
+import com.ovhcloud.pulumi.ovh.Cloud.inputs.GetProjectArgs;
+import com.ovhcloud.pulumi.ovh.Cloud.inputs.GetProjectPlainArgs;
+import com.ovhcloud.pulumi.ovh.Cloud.outputs.GetProjectResult;
+import com.ovhcloud.pulumi.ovh.Cloud.outputs.GetProjectsResult;
+import com.ovhcloud.pulumi.ovh.Utilities;
 import com.pulumi.core.Output;
 import com.pulumi.core.TypeShape;
 import com.pulumi.deployment.Deployment;

diff --git a/.../ovh/ovh/Cloud/inputs/GetProjectArgs.java → ...lumi/ovh/Cloud/inputs/GetProjectArgs.java b/.../ovh/ovh/Cloud/inputs/GetProjectArgs.java → ...lumi/ovh/Cloud/inputs/GetProjectArgs.java
@@ -1,7 +1,7 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud.inputs;
+package com.ovhcloud.pulumi.ovh.Cloud.inputs;
 
 import com.pulumi.core.Output;
 import com.pulumi.core.annotations.Import;

diff --git a/...ovh/Cloud/inputs/GetProjectPlainArgs.java → ...ovh/Cloud/inputs/GetProjectPlainArgs.java b/...ovh/Cloud/inputs/GetProjectPlainArgs.java → ...ovh/Cloud/inputs/GetProjectPlainArgs.java
@@ -1,7 +1,7 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud.inputs;
+package com.ovhcloud.pulumi.ovh.Cloud.inputs;
 
 import com.pulumi.core.annotations.Import;
 import com.pulumi.exceptions.MissingRequiredPropertyException;

diff --git a/.../ovh/ovh/Cloud/outputs/GetProjectIam.java → ...lumi/ovh/Cloud/outputs/GetProjectIam.java b/.../ovh/ovh/Cloud/outputs/GetProjectIam.java → ...lumi/ovh/Cloud/outputs/GetProjectIam.java
@@ -1,7 +1,7 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud.outputs;
+package com.ovhcloud.pulumi.ovh.Cloud.outputs;
 
 import com.pulumi.core.annotations.CustomType;
 import com.pulumi.exceptions.MissingRequiredPropertyException;

diff --git a/...h/ovh/Cloud/outputs/GetProjectResult.java → ...i/ovh/Cloud/outputs/GetProjectResult.java b/...h/ovh/Cloud/outputs/GetProjectResult.java → ...i/ovh/Cloud/outputs/GetProjectResult.java
@@ -1,9 +1,9 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud.outputs;
+package com.ovhcloud.pulumi.ovh.Cloud.outputs;
 
-import com.ovh.ovh.Cloud.outputs.GetProjectIam;
+import com.ovhcloud.pulumi.ovh.Cloud.outputs.GetProjectIam;
 import com.pulumi.core.annotations.CustomType;
 import com.pulumi.exceptions.MissingRequiredPropertyException;
 import java.lang.Boolean;

diff --git a/...ovh/Cloud/outputs/GetProjectsProject.java → ...ovh/Cloud/outputs/GetProjectsProject.java b/...ovh/Cloud/outputs/GetProjectsProject.java → ...ovh/Cloud/outputs/GetProjectsProject.java
@@ -1,9 +1,9 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud.outputs;
+package com.ovhcloud.pulumi.ovh.Cloud.outputs;
 
-import com.ovh.ovh.Cloud.outputs.GetProjectsProjectIam;
+import com.ovhcloud.pulumi.ovh.Cloud.outputs.GetProjectsProjectIam;
 import com.pulumi.core.annotations.CustomType;
 import com.pulumi.exceptions.MissingRequiredPropertyException;
 import java.lang.Boolean;

diff --git a/.../Cloud/outputs/GetProjectsProjectIam.java → .../Cloud/outputs/GetProjectsProjectIam.java b/.../Cloud/outputs/GetProjectsProjectIam.java → .../Cloud/outputs/GetProjectsProjectIam.java
@@ -1,7 +1,7 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud.outputs;
+package com.ovhcloud.pulumi.ovh.Cloud.outputs;
 
 import com.pulumi.core.annotations.CustomType;
 import com.pulumi.exceptions.MissingRequiredPropertyException;

diff --git a/.../ovh/Cloud/outputs/GetProjectsResult.java → .../ovh/Cloud/outputs/GetProjectsResult.java b/.../ovh/Cloud/outputs/GetProjectsResult.java → .../ovh/Cloud/outputs/GetProjectsResult.java
@@ -1,9 +1,9 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.Cloud.outputs;
+package com.ovhcloud.pulumi.ovh.Cloud.outputs;
 
-import com.ovh.ovh.Cloud.outputs.GetProjectsProject;
+import com.ovhcloud.pulumi.ovh.Cloud.outputs.GetProjectsProject;
 import com.pulumi.core.annotations.CustomType;
 import com.pulumi.exceptions.MissingRequiredPropertyException;
 import java.lang.String;

diff --git a/...va/com/ovh/ovh/CloudProject/Alerting.java → ...oud/pulumi/ovh/CloudProject/Alerting.java b/...va/com/ovh/ovh/CloudProject/Alerting.java → ...oud/pulumi/ovh/CloudProject/Alerting.java
@@ -1,12 +1,12 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.CloudProject;
+package com.ovhcloud.pulumi.ovh.CloudProject;
 
-import com.ovh.ovh.CloudProject.AlertingArgs;
-import com.ovh.ovh.CloudProject.inputs.AlertingState;
-import com.ovh.ovh.CloudProject.outputs.AlertingFormattedMonthlyThreshold;
-import com.ovh.ovh.Utilities;
+import com.ovhcloud.pulumi.ovh.CloudProject.AlertingArgs;
+import com.ovhcloud.pulumi.ovh.CloudProject.inputs.AlertingState;
+import com.ovhcloud.pulumi.ovh.CloudProject.outputs.AlertingFormattedMonthlyThreshold;
+import com.ovhcloud.pulumi.ovh.Utilities;
 import com.pulumi.core.Output;
 import com.pulumi.core.annotations.Export;
 import com.pulumi.core.annotations.ResourceType;

diff --git a/...om/ovh/ovh/CloudProject/AlertingArgs.java → ...pulumi/ovh/CloudProject/AlertingArgs.java b/...om/ovh/ovh/CloudProject/AlertingArgs.java → ...pulumi/ovh/CloudProject/AlertingArgs.java
@@ -1,7 +1,7 @@
 // *** WARNING: this file was generated by pulumi-java-gen. ***
 // *** Do not edit by hand unless you're certain you know what you are doing! ***
 
-package com.ovh.ovh.CloudProject;
+package com.ovhcloud.pulumi.ovh.CloudProject;
 
 import com.pulumi.core.Output;
 import com.pulumi.core.annotations.Import;