Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to pulumi-java v0.12.0 #3025

Merged
merged 3 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Unreleased

- Update to pulumi-java v0.12.0 #3025 (https://github.com/pulumi/pulumi-kubernetes/pull/3025)

## 4.12.0 (May 21, 2024)

### Added
Expand Down
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.8.0
JAVA_GEN_VERSION := v0.12.0

WORKING_DIR := $(shell pwd)

Expand Down
10 changes: 8 additions & 2 deletions sdk/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ java {

compileJava {
options.fork = true
options.forkOptions.jvmArgs.addAll(["-Xmx4g"])
options.forkOptions.jvmArgs.addAll(["-Xmx16g"])
options.encoding = "UTF-8"
}

repositories {
Expand All @@ -43,7 +44,7 @@ repositories {
dependencies {
implementation("com.google.code.findbugs:jsr305:3.0.2")
implementation("com.google.code.gson:gson:2.8.9")
implementation("com.pulumi:pulumi:0.8.0")
implementation("com.pulumi:pulumi:0.12.0")
}

task sourcesJar(type: Jar) {
Expand All @@ -54,6 +55,7 @@ task sourcesJar(type: Jar) {
task javadocJar(type: Jar) {
from javadoc
archiveClassifier.set('javadoc')
zip64 = true
}

def genPulumiResources = tasks.register('genPulumiResources') {
Expand Down Expand Up @@ -126,6 +128,10 @@ javadoc {
options.jFlags("-Xmx8g", "-Xms512m")
}

jar {
zip64 = true
}

if (publishRepoUsername) {
nexusPublishing {
repositories {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public static Optional<Double> getEnvDouble(String... names) {
return Optional.empty();
}

// TODO: this probably should be done via a mutator on the InvokeOptions
public static InvokeOptions withVersion(@Nullable InvokeOptions options) {
if (options != null && options.getVersion().isPresent()) {
return options;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.core.internal.Codegen;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.MutatingWebhookConfigurationArgs;
import com.pulumi.kubernetes.meta.v1.inputs.ListMetaArgs;
import java.lang.String;
Expand Down Expand Up @@ -202,7 +203,9 @@ public Builder metadata(ListMetaArgs metadata) {

public MutatingWebhookConfigurationListArgs build() {
$.apiVersion = Codegen.stringProp("apiVersion").output().arg($.apiVersion).getNullable();
$.items = Objects.requireNonNull($.items, "expected parameter 'items' to be non-null");
if ($.items == null) {
throw new MissingRequiredPropertyException("MutatingWebhookConfigurationListArgs", "items");
}
$.kind = Codegen.stringProp("kind").output().arg($.kind).getNullable();
return $;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.core.internal.Codegen;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.ValidatingWebhookConfigurationArgs;
import com.pulumi.kubernetes.meta.v1.inputs.ListMetaArgs;
import java.lang.String;
Expand Down Expand Up @@ -202,7 +203,9 @@ public Builder metadata(ListMetaArgs metadata) {

public ValidatingWebhookConfigurationListArgs build() {
$.apiVersion = Codegen.stringProp("apiVersion").output().arg($.apiVersion).getNullable();
$.items = Objects.requireNonNull($.items, "expected parameter 'items' to be non-null");
if ($.items == null) {
throw new MissingRequiredPropertyException("ValidatingWebhookConfigurationListArgs", "items");
}
$.kind = Codegen.stringProp("kind").output().arg($.kind).getNullable();
return $;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import java.lang.String;
import java.util.Objects;

Expand Down Expand Up @@ -155,8 +156,12 @@ public Builder valueExpression(String valueExpression) {
}

public AuditAnnotationArgs build() {
$.key = Objects.requireNonNull($.key, "expected parameter 'key' to be non-null");
$.valueExpression = Objects.requireNonNull($.valueExpression, "expected parameter 'valueExpression' to be non-null");
if ($.key == null) {
throw new MissingRequiredPropertyException("AuditAnnotationArgs", "key");
}
if ($.valueExpression == null) {
throw new MissingRequiredPropertyException("AuditAnnotationArgs", "valueExpression");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import java.lang.String;
import java.util.Objects;

Expand Down Expand Up @@ -115,8 +116,12 @@ public Builder warning(String warning) {
}

public ExpressionWarningArgs build() {
$.fieldRef = Objects.requireNonNull($.fieldRef, "expected parameter 'fieldRef' to be non-null");
$.warning = Objects.requireNonNull($.warning, "expected parameter 'warning' to be non-null");
if ($.fieldRef == null) {
throw new MissingRequiredPropertyException("ExpressionWarningArgs", "fieldRef");
}
if ($.warning == null) {
throw new MissingRequiredPropertyException("ExpressionWarningArgs", "warning");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import java.lang.String;
import java.util.Objects;

Expand Down Expand Up @@ -155,8 +156,12 @@ public Builder name(String name) {
}

public MatchConditionArgs build() {
$.expression = Objects.requireNonNull($.expression, "expected parameter 'expression' to be non-null");
$.name = Objects.requireNonNull($.name, "expected parameter 'name' to be non-null");
if ($.expression == null) {
throw new MissingRequiredPropertyException("MatchConditionArgs", "expression");
}
if ($.name == null) {
throw new MissingRequiredPropertyException("MatchConditionArgs", "name");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.MatchConditionArgs;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.RuleWithOperationsArgs;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.WebhookClientConfigArgs;
Expand Down Expand Up @@ -726,10 +727,18 @@ public Builder timeoutSeconds(Integer timeoutSeconds) {
}

public MutatingWebhookArgs build() {
$.admissionReviewVersions = Objects.requireNonNull($.admissionReviewVersions, "expected parameter 'admissionReviewVersions' to be non-null");
$.clientConfig = Objects.requireNonNull($.clientConfig, "expected parameter 'clientConfig' to be non-null");
$.name = Objects.requireNonNull($.name, "expected parameter 'name' to be non-null");
$.sideEffects = Objects.requireNonNull($.sideEffects, "expected parameter 'sideEffects' to be non-null");
if ($.admissionReviewVersions == null) {
throw new MissingRequiredPropertyException("MutatingWebhookArgs", "admissionReviewVersions");
}
if ($.clientConfig == null) {
throw new MissingRequiredPropertyException("MutatingWebhookArgs", "clientConfig");
}
if ($.name == null) {
throw new MissingRequiredPropertyException("MutatingWebhookArgs", "name");
}
if ($.sideEffects == null) {
throw new MissingRequiredPropertyException("MutatingWebhookArgs", "sideEffects");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import java.lang.Integer;
import java.lang.String;
import java.util.Objects;
Expand Down Expand Up @@ -192,8 +193,12 @@ public Builder port(Integer port) {
}

public ServiceReferenceArgs build() {
$.name = Objects.requireNonNull($.name, "expected parameter 'name' to be non-null");
$.namespace = Objects.requireNonNull($.namespace, "expected parameter 'namespace' to be non-null");
if ($.name == null) {
throw new MissingRequiredPropertyException("ServiceReferenceArgs", "name");
}
if ($.namespace == null) {
throw new MissingRequiredPropertyException("ServiceReferenceArgs", "namespace");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.MatchConditionArgs;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.RuleWithOperationsArgs;
import com.pulumi.kubernetes.admissionregistration.v1.inputs.WebhookClientConfigArgs;
Expand Down Expand Up @@ -665,10 +666,18 @@ public Builder timeoutSeconds(Integer timeoutSeconds) {
}

public ValidatingWebhookArgs build() {
$.admissionReviewVersions = Objects.requireNonNull($.admissionReviewVersions, "expected parameter 'admissionReviewVersions' to be non-null");
$.clientConfig = Objects.requireNonNull($.clientConfig, "expected parameter 'clientConfig' to be non-null");
$.name = Objects.requireNonNull($.name, "expected parameter 'name' to be non-null");
$.sideEffects = Objects.requireNonNull($.sideEffects, "expected parameter 'sideEffects' to be non-null");
if ($.admissionReviewVersions == null) {
throw new MissingRequiredPropertyException("ValidatingWebhookArgs", "admissionReviewVersions");
}
if ($.clientConfig == null) {
throw new MissingRequiredPropertyException("ValidatingWebhookArgs", "clientConfig");
}
if ($.name == null) {
throw new MissingRequiredPropertyException("ValidatingWebhookArgs", "name");
}
if ($.sideEffects == null) {
throw new MissingRequiredPropertyException("ValidatingWebhookArgs", "sideEffects");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import java.lang.String;
import java.util.Objects;
import java.util.Optional;
Expand Down Expand Up @@ -291,7 +292,9 @@ public Builder reason(String reason) {
}

public ValidationArgs build() {
$.expression = Objects.requireNonNull($.expression, "expected parameter 'expression' to be non-null");
if ($.expression == null) {
throw new MissingRequiredPropertyException("ValidationArgs", "expression");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.pulumi.core.Output;
import com.pulumi.core.annotations.Import;
import com.pulumi.exceptions.MissingRequiredPropertyException;
import java.lang.String;
import java.util.Objects;

Expand Down Expand Up @@ -115,8 +116,12 @@ public Builder name(String name) {
}

public VariableArgs build() {
$.expression = Objects.requireNonNull($.expression, "expected parameter 'expression' to be non-null");
$.name = Objects.requireNonNull($.name, "expected parameter 'name' to be non-null");
if ($.expression == null) {
throw new MissingRequiredPropertyException("VariableArgs", "expression");
}
if ($.name == null) {
throw new MissingRequiredPropertyException("VariableArgs", "name");
}
return $;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public Optional<Output<ServiceReferenceArgs>> service() {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
*/
@Import(name="url")
Expand All @@ -82,7 +82,7 @@ public Optional<Output<ServiceReferenceArgs>> service() {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
*/
public Optional<Output<String>> url() {
Expand Down Expand Up @@ -172,7 +172,7 @@ public Builder service(ServiceReferenceArgs service) {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
* @return builder
*
Expand All @@ -193,7 +193,7 @@ public Builder url(@Nullable Output<String> url) {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
* @return builder
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public Optional<Output<ServiceReferencePatchArgs>> service() {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
*/
@Import(name="url")
Expand All @@ -82,7 +82,7 @@ public Optional<Output<ServiceReferencePatchArgs>> service() {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
*/
public Optional<Output<String>> url() {
Expand Down Expand Up @@ -172,7 +172,7 @@ public Builder service(ServiceReferencePatchArgs service) {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
* @return builder
*
Expand All @@ -193,7 +193,7 @@ public Builder url(@Nullable Output<String> url) {
*
* A path is optional, and if present may be any string permissible in a URL. You may use the path to pass an arbitrary string to the webhook, for example, a cluster identifier.
*
* Attempting to use a user or basic auth e.g. &#34;user:password@&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
* Attempting to use a user or basic auth e.g. &#34;user:password{@literal @}&#34; is not allowed. Fragments (&#34;#...&#34;) and query parameters (&#34;?...&#34;) are not allowed, either.
*
* @return builder
*
Expand Down
Loading
Loading