sam_oneal/pulumi-docker-build
1
0
Fork 0
Code Actions Packages Releases Wiki Activity

Fix weekly-pulumi-update (#232)

Browse Source 
Fixes: #212

This PR follows the `weekly-pulumi-update` CI workflow steps to update
our `pulumi/pulumi` dependency, with manual intervention to resolve
tooling update conflicts. Before generating the SDKs, it's necessary to
update the language tools and otel packages to ensure compatibility with
the latest changes.

Additional command executed for the manual updates:

```sh
TOOLS=(
    "github.com/pulumi/pulumi/sdk/go/pulumi-language-go/v3"
    "github.com/pulumi/pulumi/sdk/nodejs/cmd/pulumi-language-nodejs/v3"
    "github.com/pulumi/pulumi/sdk/python/cmd/pulumi-language-python/v3"
    "go.opentelemetry.io/otel/exporters/otlp/otlptrace"
)

for TOOL in "${TOOLS[@]}"; do
    go get -u $TOOL
    go mod tidy
done
```
This commit is contained in:
Ramon Quitales
2024-08-26 09:57:49 -07:00
committed by GitHub
parent 5d7ff1eeca
commit 06cf6ec5f8
19 changed files with 464 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
sdk/java/src/main/java/com/pulumi/dockerbuild/Image.java generated
View File

@@ -458,22 +458,22 @@ import javax.annotation.Nullable;
* import java.nio.file.Files;
* import java.nio.file.Paths;
*
* public class App {
* public static void main(String[] args) {
* public class App }{{@code
* public static void main(String[] args) }{{@code
* Pulumi.run(App::stack);
* }
* }}{@code
*
* public static void stack(Context ctx) {
* public static void stack(Context ctx) }{{@code
* var image = new Image("image", ImageArgs.builder()
* .context(BuildContextArgs.builder()
* .location("app")
* .named(Map.of("golang:latest", Map.of("location", "docker-image://golang{@literal @}sha256:b8e62cf593cdaff36efd90aa3a37de268e6781a2e68c6610940c48f7cdf36984")))
* .named(Map.of("golang:latest", Map.of("location", "docker-image://golang}{@literal @}{@code sha256:b8e62cf593cdaff36efd90aa3a37de268e6781a2e68c6610940c48f7cdf36984")))
* .build())
* .push(false)
* .build());
*
* }
* }
* }}{@code
* }}{@code
* }
* </pre>
* ### Remote context
@@ -812,7 +812,7 @@ public class Image extends com.pulumi.resources.CustomResource {
*
* Empty if the image was not exported.
*
* Registry images can be referenced precisely as `&lt;tag&gt;{@literal @}&lt;digest&gt;`. The
* Registry images can be referenced precisely as `&lt;tag&gt;{@literal @}<digest&gt;`. The
* `ref` output provides one such reference as a convenience.
*
*/
@@ -825,7 +825,7 @@ public class Image extends com.pulumi.resources.CustomResource {
*
* Empty if the image was not exported.
*
* Registry images can be referenced precisely as `&lt;tag&gt;{@literal @}&lt;digest&gt;`. The
* Registry images can be referenced precisely as `&lt;tag&gt;{@literal @}<digest&gt;`. The
* `ref` output provides one such reference as a convenience.
*
*/
@@ -1235,7 +1235,7 @@ public class Image extends com.pulumi.resources.CustomResource {
*
* @param name The _unique_ name of the resulting resource.
*/
public Image(String name) {
public Image(java.lang.String name) {
this(name, ImageArgs.Empty);
}
/**
@@ -1243,7 +1243,7 @@ public class Image extends com.pulumi.resources.CustomResource {
* @param name The _unique_ name of the resulting resource.
* @param args The arguments to use to populate this resource's properties.
*/
public Image(String name, ImageArgs args) {
public Image(java.lang.String name, ImageArgs args) {
this(name, args, null);
}
/**
@@ -1252,12 +1252,12 @@ public class Image extends com.pulumi.resources.CustomResource {
* @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 Image(String name, ImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Image", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
public Image(java.lang.String name, ImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Image", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
}
private Image(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Image", name, null, makeResourceOptions(options, id));
private Image(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Image", name, null, makeResourceOptions(options, id), false);
}
private static ImageArgs makeArgs(ImageArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
@@ -1267,7 +1267,7 @@ public class Image extends com.pulumi.resources.CustomResource {
return args == null ? ImageArgs.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();
@@ -1282,7 +1282,7 @@ public class Image extends com.pulumi.resources.CustomResource {
* @param id The _unique_ provider ID of the resource to lookup.
* @param options Optional settings to control the behavior of the CustomResource.
*/
public static Image get(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
public static Image get(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
return new Image(name, id, options);
}
}

16
sdk/java/src/main/java/com/pulumi/dockerbuild/Index.java generated
View File

@@ -209,7 +209,7 @@ public class Index extends com.pulumi.resources.CustomResource {
*
* @param name The _unique_ name of the resulting resource.
*/
public Index(String name) {
public Index(java.lang.String name) {
this(name, IndexArgs.Empty);
}
/**
@@ -217,7 +217,7 @@ public class Index extends com.pulumi.resources.CustomResource {
* @param name The _unique_ name of the resulting resource.
* @param args The arguments to use to populate this resource's properties.
*/
public Index(String name, IndexArgs args) {
public Index(java.lang.String name, IndexArgs args) {
this(name, args, null);
}
/**
@@ -226,12 +226,12 @@ public class Index extends com.pulumi.resources.CustomResource {
* @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 Index(String name, IndexArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Index", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
public Index(java.lang.String name, IndexArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Index", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
}
private Index(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Index", name, null, makeResourceOptions(options, id));
private Index(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build:index:Index", name, null, makeResourceOptions(options, id), false);
}
private static IndexArgs makeArgs(IndexArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
@@ -241,7 +241,7 @@ public class Index extends com.pulumi.resources.CustomResource {
return args == null ? IndexArgs.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();
@@ -256,7 +256,7 @@ public class Index extends com.pulumi.resources.CustomResource {
* @param id The _unique_ provider ID of the resource to lookup.
* @param options Optional settings to control the behavior of the CustomResource.
*/
public static Index get(String name, Output<String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
public static Index get(java.lang.String name, Output<java.lang.String> id, @Nullable com.pulumi.resources.CustomResourceOptions options) {
return new Index(name, id, options);
}
}

10
sdk/java/src/main/java/com/pulumi/dockerbuild/Provider.java generated
View File

@@ -34,7 +34,7 @@ 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);
}
/**
@@ -42,7 +42,7 @@ public class Provider extends com.pulumi.resources.ProviderResource {
* @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);
}
/**
@@ -51,8 +51,8 @@ public class Provider extends com.pulumi.resources.ProviderResource {
* @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("docker-build", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()));
public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
super("docker-build", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false);
}
private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) {
@@ -62,7 +62,7 @@ public class Provider extends com.pulumi.resources.ProviderResource {
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();

14
sdk/java/src/main/java/com/pulumi/dockerbuild/Utilities.java generated
View File

@@ -17,7 +17,7 @@ import com.pulumi.deployment.InvokeOptions;
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()) {
@@ -27,7 +27,7 @@ public class Utilities {
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()) {
@@ -37,7 +37,7 @@ public class Utilities {
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()) {
@@ -47,7 +47,7 @@ public class Utilities {
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()) {
@@ -68,8 +68,8 @@ public class Utilities {
);
}
private static final String version;
public static String getVersion() {
private static final java.lang.String version;
public static java.lang.String getVersion() {
return version;
}
@@ -78,7 +78,7 @@ public class Utilities {
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))

2
sdk/java/src/main/java/com/pulumi/dockerbuild/enums/CacheMode.java generated
View File

@@ -33,7 +33,7 @@ import java.util.StringJoiner;
}
@Override
public String toString() {
public java.lang.String toString() {
return new StringJoiner(", ", "CacheMode[", "]")
.add("value='" + this.value + "'")
.toString();

2
sdk/java/src/main/java/com/pulumi/dockerbuild/enums/CompressionType.java generated
View File

@@ -38,7 +38,7 @@ import java.util.StringJoiner;
}
@Override
public String toString() {
public java.lang.String toString() {
return new StringJoiner(", ", "CompressionType[", "]")
.add("value='" + this.value + "'")
.toString();

2
sdk/java/src/main/java/com/pulumi/dockerbuild/enums/NetworkMode.java generated
View File

@@ -38,7 +38,7 @@ import java.util.StringJoiner;
}
@Override
public String toString() {
public java.lang.String toString() {
return new StringJoiner(", ", "NetworkMode[", "]")
.add("value='" + this.value + "'")
.toString();

2
sdk/java/src/main/java/com/pulumi/dockerbuild/enums/Platform.java generated
View File

@@ -51,7 +51,7 @@ import java.util.StringJoiner;
}
@Override
public String toString() {
public java.lang.String toString() {
return new StringJoiner(", ", "Platform[", "]")
.add("value='" + this.value + "'")
.toString();

16
sdk/java/src/main/java/com/pulumi/dockerbuild/inputs/ExportImageArgs.java generated
View File

@@ -67,14 +67,14 @@ public final class ExportImageArgs extends com.pulumi.resources.ResourceArgs {
}
/**
* Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
@Import(name="danglingNamePrefix")
private @Nullable Output<String> danglingNamePrefix;
/**
* @return Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @return Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
public Optional<Output<String>> danglingNamePrefix() {
@@ -112,14 +112,14 @@ public final class ExportImageArgs extends com.pulumi.resources.ResourceArgs {
}
/**
* Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
@Import(name="nameCanonical")
private @Nullable Output<Boolean> nameCanonical;
/**
* @return Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @return Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
public Optional<Output<Boolean>> nameCanonical() {
@@ -330,7 +330,7 @@ public final class ExportImageArgs extends com.pulumi.resources.ResourceArgs {
}
/**
* @param danglingNamePrefix Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @param danglingNamePrefix Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
* @return builder
*
@@ -341,7 +341,7 @@ public final class ExportImageArgs extends com.pulumi.resources.ResourceArgs {
}
/**
* @param danglingNamePrefix Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @param danglingNamePrefix Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
* @return builder
*
@@ -393,7 +393,7 @@ public final class ExportImageArgs extends com.pulumi.resources.ResourceArgs {
}
/**
* @param nameCanonical Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @param nameCanonical Add additional canonical name (`name{@literal @}<digest&gt;`).
*
* @return builder
*
@@ -404,7 +404,7 @@ public final class ExportImageArgs extends com.pulumi.resources.ResourceArgs {
}
/**
* @param nameCanonical Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @param nameCanonical Add additional canonical name (`name{@literal @}<digest&gt;`).
*
* @return builder
*

16
sdk/java/src/main/java/com/pulumi/dockerbuild/inputs/ExportRegistryArgs.java generated
View File

@@ -67,14 +67,14 @@ public final class ExportRegistryArgs extends com.pulumi.resources.ResourceArgs
}
/**
* Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
@Import(name="danglingNamePrefix")
private @Nullable Output<String> danglingNamePrefix;
/**
* @return Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @return Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
public Optional<Output<String>> danglingNamePrefix() {
@@ -112,14 +112,14 @@ public final class ExportRegistryArgs extends com.pulumi.resources.ResourceArgs
}
/**
* Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
@Import(name="nameCanonical")
private @Nullable Output<Boolean> nameCanonical;
/**
* @return Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @return Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
public Optional<Output<Boolean>> nameCanonical() {
@@ -330,7 +330,7 @@ public final class ExportRegistryArgs extends com.pulumi.resources.ResourceArgs
}
/**
* @param danglingNamePrefix Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @param danglingNamePrefix Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
* @return builder
*
@@ -341,7 +341,7 @@ public final class ExportRegistryArgs extends com.pulumi.resources.ResourceArgs
}
/**
* @param danglingNamePrefix Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @param danglingNamePrefix Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
* @return builder
*
@@ -393,7 +393,7 @@ public final class ExportRegistryArgs extends com.pulumi.resources.ResourceArgs
}
/**
* @param nameCanonical Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @param nameCanonical Add additional canonical name (`name{@literal @}<digest&gt;`).
*
* @return builder
*
@@ -404,7 +404,7 @@ public final class ExportRegistryArgs extends com.pulumi.resources.ResourceArgs
}
/**
* @param nameCanonical Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @param nameCanonical Add additional canonical name (`name{@literal @}<digest&gt;`).
*
* @return builder
*

8
sdk/java/src/main/java/com/pulumi/dockerbuild/outputs/ExportImage.java generated
View File

@@ -32,7 +32,7 @@ public final class ExportImage {
*/
private @Nullable Integer compressionLevel;
/**
* @return Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @return Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
private @Nullable String danglingNamePrefix;
@@ -47,7 +47,7 @@ public final class ExportImage {
*/
private @Nullable Boolean insecure;
/**
* @return Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @return Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
private @Nullable Boolean nameCanonical;
@@ -112,7 +112,7 @@ public final class ExportImage {
return Optional.ofNullable(this.compressionLevel);
}
/**
* @return Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @return Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
public Optional<String> danglingNamePrefix() {
@@ -133,7 +133,7 @@ public final class ExportImage {
return Optional.ofNullable(this.insecure);
}
/**
* @return Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @return Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
public Optional<Boolean> nameCanonical() {

8
sdk/java/src/main/java/com/pulumi/dockerbuild/outputs/ExportRegistry.java generated
View File

@@ -32,7 +32,7 @@ public final class ExportRegistry {
*/
private @Nullable Integer compressionLevel;
/**
* @return Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @return Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
private @Nullable String danglingNamePrefix;
@@ -47,7 +47,7 @@ public final class ExportRegistry {
*/
private @Nullable Boolean insecure;
/**
* @return Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @return Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
private @Nullable Boolean nameCanonical;
@@ -112,7 +112,7 @@ public final class ExportRegistry {
return Optional.ofNullable(this.compressionLevel);
}
/**
* @return Name image with `prefix{@literal @}&lt;digest&gt;`, used for anonymous images.
* @return Name image with `prefix{@literal @}<digest&gt;`, used for anonymous images.
*
*/
public Optional<String> danglingNamePrefix() {
@@ -133,7 +133,7 @@ public final class ExportRegistry {
return Optional.ofNullable(this.insecure);
}
/**
* @return Add additional canonical name (`name{@literal @}&lt;digest&gt;`).
* @return Add additional canonical name (`name{@literal @}<digest&gt;`).
*
*/
public Optional<Boolean> nameCanonical() {