Skip to content

Commit

Permalink
Updating code to pulumi-java v1.0.0, updating pulumi.version to match…
Browse files Browse the repository at this point in the history
… go.mods, and fixing markdownlint for Changelog
  • Loading branch information
rshade committed Jan 16, 2025
1 parent f16a1d3 commit a21019d
Show file tree
Hide file tree
Showing 478 changed files with 4,427 additions and 4,373 deletions.
2 changes: 1 addition & 1 deletion .pulumi.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.145.0
3.146.0
1,433 changes: 736 additions & 697 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ SCHEMA_FILE := provider/cmd/pulumi-resource-kubernetes/schema.json
GOPATH := $(shell go env GOPATH)

JAVA_GEN := pulumi-java-gen
JAVA_GEN_VERSION := v0.13.0
JAVA_GEN_VERSION := v1.0.0

WORKING_DIR := $(shell pwd)

Expand Down
18 changes: 10 additions & 8 deletions sdk/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id("signing")
id("java-library")
id("maven-publish")
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
}

group = "com.pulumi"
Expand Down Expand Up @@ -45,7 +45,7 @@ dependencies {
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.google.code.gson:gson:2.8.9")
implementation("com.google.guava:guava:32.1.2-jre")
implementation("com.pulumi:pulumi:0.13.0")
implementation("com.pulumi:pulumi:1.0.0")
implementation("net.bytebuddy:byte-buddy:1.14.15")
}

Expand All @@ -67,11 +67,13 @@ def genPulumiResources = tasks.register('genPulumiResources') {
def outDir = file("$resourcesDir/$subDir")
outDir.mkdirs()
new File(outDir, "version.txt").text = resolvedVersion
def info = new Object()
info.metaClass.resource = true
info.metaClass.name = "kubernetes"
info.metaClass.version = resolvedVersion
def infoJson = new groovy.json.JsonBuilder(info).toPrettyString()
def builder = new groovy.json.JsonBuilder()
builder {
resource true
name "kubernetes"
version resolvedVersion
}
def infoJson = builder.toPrettyString()
new File(outDir, "plugin.json").text = infoJson
}
}
Expand Down Expand Up @@ -152,4 +154,4 @@ if (signingKey) {
useInMemoryPgpKeys(signingKey, signingPassword)
sign publishing.publications.mainPublication
}
}
}
10 changes: 5 additions & 5 deletions sdk/java/src/main/java/com/pulumi/kubernetes/Provider.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ public class Provider extends com.pulumi.resources.ProviderResource {
*
* @param name The _unique_ name of the resulting resource.
*/
public Provider(String name) {
public Provider(java.lang.String name) {
this(name, ProviderArgs.Empty);
}
/**
*
* @param name The _unique_ name of the resulting resource.
* @param args The arguments to use to populate this resource's properties.
*/
public Provider(String name, @Nullable ProviderArgs args) {
public Provider(java.lang.String name, @Nullable ProviderArgs args) {
this(name, args, null);
}
/**
Expand All @@ -37,8 +37,8 @@ public Provider(String name, @Nullable ProviderArgs args) {
* @param args The arguments to use to populate this resource's properties.
* @param options A bag of options that control this resource's behavior.
*/
public Provider(String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
}

private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
Expand All @@ -48,7 +48,7 @@ private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.
return args == null ? ProviderArgs.Empty : args;
}

private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<java.lang.String> id) {
var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
.version(Utilities.getVersion())
.build();
Expand Down
45 changes: 29 additions & 16 deletions sdk/java/src/main/java/com/pulumi/kubernetes/Utilities.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
import javax.annotation.Nullable;
import com.pulumi.core.internal.Environment;
import com.pulumi.deployment.InvokeOptions;
import com.pulumi.deployment.InvokeOutputOptions;

public class Utilities {

public static Optional<String> getEnv(String... names) {
public static Optional<java.lang.String> getEnv(java.lang.String... names) {
for (var n : names) {
var value = Environment.getEnvironmentVariable(n);
if (value.isValue()) {
Expand All @@ -27,7 +28,7 @@ public static Optional<String> getEnv(String... names) {
return Optional.empty();
}

public static Optional<Boolean> getEnvBoolean(String... names) {
public static Optional<java.lang.Boolean> getEnvBoolean(java.lang.String... names) {
for (var n : names) {
var value = Environment.getBooleanEnvironmentVariable(n);
if (value.isValue()) {
Expand All @@ -37,7 +38,7 @@ public static Optional<Boolean> getEnvBoolean(String... names) {
return Optional.empty();
}

public static Optional<Integer> getEnvInteger(String... names) {
public static Optional<java.lang.Integer> getEnvInteger(java.lang.String... names) {
for (var n : names) {
var value = Environment.getIntegerEnvironmentVariable(n);
if (value.isValue()) {
Expand All @@ -47,7 +48,7 @@ public static Optional<Integer> getEnvInteger(String... names) {
return Optional.empty();
}

public static Optional<Double> getEnvDouble(String... names) {
public static Optional<java.lang.Double> getEnvDouble(java.lang.String... names) {
for (var n : names) {
var value = Environment.getDoubleEnvironmentVariable(n);
if (value.isValue()) {
Expand All @@ -57,19 +58,31 @@ public static Optional<Double> getEnvDouble(String... names) {
return Optional.empty();
}

public static InvokeOptions withVersion(@Nullable InvokeOptions options) {
if (options != null && options.getVersion().isPresent()) {
return options;
}
return new InvokeOptions(
options == null ? null : options.getParent().orElse(null),
options == null ? null : options.getProvider().orElse(null),
getVersion()
);
public static InvokeOptions withVersion(@Nullable InvokeOptions options) {
if (options != null && options.getVersion().isPresent()) {
return options;
}
return new InvokeOptions(
options == null ? null : options.getParent().orElse(null),
options == null ? null : options.getProvider().orElse(null),
getVersion()
);
}

public static InvokeOutputOptions withVersion(@Nullable InvokeOutputOptions options) {
if (options != null && options.getVersion().isPresent()) {
return options;
}
return new InvokeOutputOptions(
options == null ? null : options.getParent().orElse(null),
options == null ? null : options.getProvider().orElse(null),
getVersion(),
options == null ? null : options.getDependsOn()
);
}

private static final String version;
public static String getVersion() {
private static final java.lang.String version;
public static java.lang.String getVersion() {
return version;
}

Expand All @@ -78,7 +91,7 @@ public static String getVersion() {
var versionFile = Utilities.class.getClassLoader().getResourceAsStream(resourceName);
if (versionFile == null) {
throw new IllegalStateException(
String.format("expected resource '%s' on Classpath, not found", resourceName)
java.lang.String.format("expected resource '%s' on Classpath, not found", resourceName)
);
}
version = new BufferedReader(new InputStreamReader(versionFile))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@ public Output<List<MutatingWebhook>> webhooks() {
*
* @param name The _unique_ name of the resulting resource.
*/
public MutatingWebhookConfiguration(String name) {
public MutatingWebhookConfiguration(java.lang.String name) {
this(name, MutatingWebhookConfigurationArgs.Empty);
}
/**
*
* @param name The _unique_ name of the resulting resource.
* @param args The arguments to use to populate this resource's properties.
*/
public MutatingWebhookConfiguration(String name, @Nullable MutatingWebhookConfigurationArgs args) {
public MutatingWebhookConfiguration(java.lang.String name, @Nullable MutatingWebhookConfigurationArgs args) {
this(name, args, null);
}
/**
Expand All @@ -100,12 +100,12 @@ public MutatingWebhookConfiguration(String name, @Nullable MutatingWebhookConfig
* @param args The arguments to use to populate this resource's properties.
* @param options A bag of options that control this resource's behavior.
*/
public MutatingWebhookConfiguration(String name, @Nullable MutatingWebhookConfigurationArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
public MutatingWebhookConfiguration(java.lang.String name, @Nullable MutatingWebhookConfigurationArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
}

private MutatingWebhookConfiguration(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration", name, null, makeResourceOptions(options, id));
private MutatingWebhookConfiguration(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfiguration", name, null, makeResourceOptions(options, id), false);
}

private static MutatingWebhookConfigurationArgs makeArgs(@Nullable MutatingWebhookConfigurationArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
Expand All @@ -119,7 +119,7 @@ private static MutatingWebhookConfigurationArgs makeArgs(@Nullable MutatingWebho
.build();
}

private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<java.lang.String> id) {
var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
.version(Utilities.getVersion())
.aliases(List.of(
Expand All @@ -137,7 +137,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N
* @param id The _unique_ provider ID of the resource to lookup.
* @param options Optional settings to control the behavior of the CustomResource.
*/
public static MutatingWebhookConfiguration get(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
public static MutatingWebhookConfiguration get(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
return new MutatingWebhookConfiguration(name, id, options);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ public Output<ListMeta> metadata() {
*
* @param name The _unique_ name of the resulting resource.
*/
public MutatingWebhookConfigurationList(String name) {
public MutatingWebhookConfigurationList(java.lang.String name) {
this(name, MutatingWebhookConfigurationListArgs.Empty);
}
/**
*
* @param name The _unique_ name of the resulting resource.
* @param args The arguments to use to populate this resource's properties.
*/
public MutatingWebhookConfigurationList(String name, MutatingWebhookConfigurationListArgs args) {
public MutatingWebhookConfigurationList(java.lang.String name, MutatingWebhookConfigurationListArgs args) {
this(name, args, null);
}
/**
Expand All @@ -99,12 +99,12 @@ public MutatingWebhookConfigurationList(String name, MutatingWebhookConfiguratio
* @param args The arguments to use to populate this resource's properties.
* @param options A bag of options that control this resource's behavior.
*/
public MutatingWebhookConfigurationList(String name, MutatingWebhookConfigurationListArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationList", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
public MutatingWebhookConfigurationList(java.lang.String name, MutatingWebhookConfigurationListArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationList", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
}

private MutatingWebhookConfigurationList(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationList", name, null, makeResourceOptions(options, id));
private MutatingWebhookConfigurationList(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationList", name, null, makeResourceOptions(options, id), false);
}

private static MutatingWebhookConfigurationListArgs makeArgs(MutatingWebhookConfigurationListArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
Expand All @@ -118,7 +118,7 @@ private static MutatingWebhookConfigurationListArgs makeArgs(MutatingWebhookConf
.build();
}

private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<java.lang.String> id) {
var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
.version(Utilities.getVersion())
.build();
Expand All @@ -133,7 +133,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N
* @param id The _unique_ provider ID of the resource to lookup.
* @param options Optional settings to control the behavior of the CustomResource.
*/
public static MutatingWebhookConfigurationList get(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
public static MutatingWebhookConfigurationList get(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
return new MutatingWebhookConfigurationList(name, id, options);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,15 @@ public Output<Optional<List<MutatingWebhookPatch>>> webhooks() {
*
* @param name The _unique_ name of the resulting resource.
*/
public MutatingWebhookConfigurationPatch(String name) {
public MutatingWebhookConfigurationPatch(java.lang.String name) {
this(name, MutatingWebhookConfigurationPatchArgs.Empty);
}
/**
*
* @param name The _unique_ name of the resulting resource.
* @param args The arguments to use to populate this resource's properties.
*/
public MutatingWebhookConfigurationPatch(String name, @Nullable MutatingWebhookConfigurationPatchArgs args) {
public MutatingWebhookConfigurationPatch(java.lang.String name, @Nullable MutatingWebhookConfigurationPatchArgs args) {
this(name, args, null);
}
/**
Expand All @@ -107,12 +107,12 @@ public MutatingWebhookConfigurationPatch(String name, @Nullable MutatingWebhookC
* @param args The arguments to use to populate this resource's properties.
* @param options A bag of options that control this resource's behavior.
*/
public MutatingWebhookConfigurationPatch(String name, @Nullable MutatingWebhookConfigurationPatchArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationPatch", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
public MutatingWebhookConfigurationPatch(java.lang.String name, @Nullable MutatingWebhookConfigurationPatchArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationPatch", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
}

private MutatingWebhookConfigurationPatch(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationPatch", name, null, makeResourceOptions(options, id));
private MutatingWebhookConfigurationPatch(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("kubernetes:admissionregistration.k8s.io/v1:MutatingWebhookConfigurationPatch", name, null, makeResourceOptions(options, id), false);
}

private static MutatingWebhookConfigurationPatchArgs makeArgs(@Nullable MutatingWebhookConfigurationPatchArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
Expand All @@ -126,7 +126,7 @@ private static MutatingWebhookConfigurationPatchArgs makeArgs(@Nullable Mutating
.build();
}

private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<String> id) {
private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output<java.lang.String> id) {
var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder()
.version(Utilities.getVersion())
.aliases(List.of(
Expand All @@ -144,7 +144,7 @@ private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@N
* @param id The _unique_ provider ID of the resource to lookup.
* @param options Optional settings to control the behavior of the CustomResource.
*/
public static MutatingWebhookConfigurationPatch get(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
public static MutatingWebhookConfigurationPatch get(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
return new MutatingWebhookConfigurationPatch(name, id, options);
}
}
Loading

0 comments on commit a21019d

Please sign in to comment.