From 1a11791b1a3aca26dfaab14bc036869407c807d4 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Fri, 26 Jan 2024 12:59:16 -0800 Subject: [PATCH] update sdk --- .../cmd/pulumi-resource-docker/schema.json | 8 +++---- sdk/dotnet/Buildx/Image.cs | 12 ++++------ sdk/go/docker/buildx/image.go | 24 +++++++------------ .../java/com/pulumi/docker/buildx/Image.java | 12 ++++------ .../com/pulumi/docker/buildx/ImageArgs.java | 24 +++++++------------ sdk/nodejs/buildx/image.ts | 12 ++++------ sdk/python/pulumi_docker/buildx/image.py | 24 +++++++------------ 7 files changed, 40 insertions(+), 76 deletions(-) diff --git a/provider/cmd/pulumi-resource-docker/schema.json b/provider/cmd/pulumi-resource-docker/schema.json index ba5265fd..284b6050 100644 --- a/provider/cmd/pulumi-resource-docker/schema.json +++ b/provider/cmd/pulumi-resource-docker/schema.json @@ -2121,7 +2121,7 @@ }, "context": { "type": "string", - "description": "\nContexts to use while building the image. If omitted, an empty context\nis used. If more than one value is specified, they should be of the\nform \"name=value\"." + "description": "\nPath to use for build context. If omitted, an empty context is used." }, "contextHash": { "type": "string" @@ -2135,7 +2135,7 @@ }, "file": { "type": "string", - "description": "\nName of the Dockerfile to use (default: \"$PATH/Dockerfile\").", + "description": "\nName of the Dockerfile to use (defaults to \"${context}/Dockerfile\").", "default": "Dockerfile" }, "manifests": { @@ -2198,7 +2198,7 @@ }, "context": { "type": "string", - "description": "\nContexts to use while building the image. If omitted, an empty context\nis used. If more than one value is specified, they should be of the\nform \"name=value\"." + "description": "\nPath to use for build context. If omitted, an empty context is used." }, "exports": { "type": "array", @@ -2209,7 +2209,7 @@ }, "file": { "type": "string", - "description": "\nName of the Dockerfile to use (default: \"$PATH/Dockerfile\").", + "description": "\nName of the Dockerfile to use (defaults to \"${context}/Dockerfile\").", "default": "Dockerfile" }, "platforms": { diff --git a/sdk/dotnet/Buildx/Image.cs b/sdk/dotnet/Buildx/Image.cs index caee6d7c..2da21fb0 100644 --- a/sdk/dotnet/Buildx/Image.cs +++ b/sdk/dotnet/Buildx/Image.cs @@ -41,9 +41,7 @@ public partial class Image : global::Pulumi.CustomResource /// /// - /// Contexts to use while building the image. If omitted, an empty context - /// is used. If more than one value is specified, they should be of the - /// form "name=value". + /// Path to use for build context. If omitted, an empty context is used. /// [Output("context")] public Output Context { get; private set; } = null!; @@ -61,7 +59,7 @@ public partial class Image : global::Pulumi.CustomResource /// /// - /// Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + /// Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). /// [Output("file")] public Output File { get; private set; } = null!; @@ -187,9 +185,7 @@ public InputList CacheTo /// /// - /// Contexts to use while building the image. If omitted, an empty context - /// is used. If more than one value is specified, they should be of the - /// form "name=value". + /// Path to use for build context. If omitted, an empty context is used. /// [Input("context")] public Input? Context { get; set; } @@ -210,7 +206,7 @@ public InputList Exports /// /// - /// Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + /// Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). /// [Input("file")] public Input? File { get; set; } diff --git a/sdk/go/docker/buildx/image.go b/sdk/go/docker/buildx/image.go index 60c9af6d..1d95c214 100644 --- a/sdk/go/docker/buildx/image.go +++ b/sdk/go/docker/buildx/image.go @@ -25,15 +25,13 @@ type Image struct { CacheFrom pulumi.StringArrayOutput `pulumi:"cacheFrom"` // Cache export destinations (e.g., "user/app:cache", "type=local,dest=path/to/dir") CacheTo pulumi.StringArrayOutput `pulumi:"cacheTo"` - // Contexts to use while building the image. If omitted, an empty context - // is used. If more than one value is specified, they should be of the - // form "name=value". + // Path to use for build context. If omitted, an empty context is used. Context pulumi.StringPtrOutput `pulumi:"context"` ContextHash pulumi.StringPtrOutput `pulumi:"contextHash"` // Name and optionally a tag (format: "name:tag"). If outputting to a // registry, the name should include the fully qualified registry address. Exports pulumi.StringArrayOutput `pulumi:"exports"` - // Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + // Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). File pulumi.StringPtrOutput `pulumi:"file"` Manifests ManifestArrayOutput `pulumi:"manifests"` // Set target platforms for the build. Defaults to the host's platform @@ -102,14 +100,12 @@ type imageArgs struct { CacheFrom []string `pulumi:"cacheFrom"` // Cache export destinations (e.g., "user/app:cache", "type=local,dest=path/to/dir") CacheTo []string `pulumi:"cacheTo"` - // Contexts to use while building the image. If omitted, an empty context - // is used. If more than one value is specified, they should be of the - // form "name=value". + // Path to use for build context. If omitted, an empty context is used. Context *string `pulumi:"context"` // Name and optionally a tag (format: "name:tag"). If outputting to a // registry, the name should include the fully qualified registry address. Exports []string `pulumi:"exports"` - // Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + // Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). File *string `pulumi:"file"` // Set target platforms for the build. Defaults to the host's platform Platforms []string `pulumi:"platforms"` @@ -133,14 +129,12 @@ type ImageArgs struct { CacheFrom pulumi.StringArrayInput // Cache export destinations (e.g., "user/app:cache", "type=local,dest=path/to/dir") CacheTo pulumi.StringArrayInput - // Contexts to use while building the image. If omitted, an empty context - // is used. If more than one value is specified, they should be of the - // form "name=value". + // Path to use for build context. If omitted, an empty context is used. Context pulumi.StringPtrInput // Name and optionally a tag (format: "name:tag"). If outputting to a // registry, the name should include the fully qualified registry address. Exports pulumi.StringArrayInput - // Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + // Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). File pulumi.StringPtrInput // Set target platforms for the build. Defaults to the host's platform Platforms pulumi.StringArrayInput @@ -258,9 +252,7 @@ func (o ImageOutput) CacheTo() pulumi.StringArrayOutput { return o.ApplyT(func(v *Image) pulumi.StringArrayOutput { return v.CacheTo }).(pulumi.StringArrayOutput) } -// Contexts to use while building the image. If omitted, an empty context -// is used. If more than one value is specified, they should be of the -// form "name=value". +// Path to use for build context. If omitted, an empty context is used. func (o ImageOutput) Context() pulumi.StringPtrOutput { return o.ApplyT(func(v *Image) pulumi.StringPtrOutput { return v.Context }).(pulumi.StringPtrOutput) } @@ -275,7 +267,7 @@ func (o ImageOutput) Exports() pulumi.StringArrayOutput { return o.ApplyT(func(v *Image) pulumi.StringArrayOutput { return v.Exports }).(pulumi.StringArrayOutput) } -// Name of the Dockerfile to use (default: "$PATH/Dockerfile"). +// Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). func (o ImageOutput) File() pulumi.StringPtrOutput { return o.ApplyT(func(v *Image) pulumi.StringPtrOutput { return v.File }).(pulumi.StringPtrOutput) } diff --git a/sdk/java/src/main/java/com/pulumi/docker/buildx/Image.java b/sdk/java/src/main/java/com/pulumi/docker/buildx/Image.java index a135af35..ebcae278 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/buildx/Image.java +++ b/sdk/java/src/main/java/com/pulumi/docker/buildx/Image.java @@ -76,9 +76,7 @@ public Output>> cacheTo() { return Codegen.optional(this.cacheTo); } /** - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. * */ @Export(name="context", refs={String.class}, tree="[0]") @@ -86,9 +84,7 @@ public Output>> cacheTo() { /** * @return - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. * */ public Output> context() { @@ -118,7 +114,7 @@ public Output>> exports() { return Codegen.optional(this.exports); } /** - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). * */ @Export(name="file", refs={String.class}, tree="[0]") @@ -126,7 +122,7 @@ public Output>> exports() { /** * @return - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). * */ public Output> file() { diff --git a/sdk/java/src/main/java/com/pulumi/docker/buildx/ImageArgs.java b/sdk/java/src/main/java/com/pulumi/docker/buildx/ImageArgs.java index 6b42df40..8789702c 100644 --- a/sdk/java/src/main/java/com/pulumi/docker/buildx/ImageArgs.java +++ b/sdk/java/src/main/java/com/pulumi/docker/buildx/ImageArgs.java @@ -76,9 +76,7 @@ public Optional>> cacheTo() { } /** - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. * */ @Import(name="context") @@ -86,9 +84,7 @@ public Optional>> cacheTo() { /** * @return - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. * */ public Optional> context() { @@ -114,7 +110,7 @@ public Optional>> exports() { } /** - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). * */ @Import(name="file") @@ -122,7 +118,7 @@ public Optional>> exports() { /** * @return - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). * */ public Optional> file() { @@ -327,9 +323,7 @@ public Builder cacheTo(String... cacheTo) { /** * @param context - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. * * @return builder * @@ -341,9 +335,7 @@ public Builder context(@Nullable Output context) { /** * @param context - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. * * @return builder * @@ -391,7 +383,7 @@ public Builder exports(String... exports) { /** * @param file - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). * * @return builder * @@ -403,7 +395,7 @@ public Builder file(@Nullable Output file) { /** * @param file - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). * * @return builder * diff --git a/sdk/nodejs/buildx/image.ts b/sdk/nodejs/buildx/image.ts index 3a13f741..d98826cc 100644 --- a/sdk/nodejs/buildx/image.ts +++ b/sdk/nodejs/buildx/image.ts @@ -57,9 +57,7 @@ export class Image extends pulumi.CustomResource { public readonly cacheTo!: pulumi.Output; /** * - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. */ public readonly context!: pulumi.Output; public /*out*/ readonly contextHash!: pulumi.Output; @@ -71,7 +69,7 @@ export class Image extends pulumi.CustomResource { public readonly exports!: pulumi.Output; /** * - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). */ public readonly file!: pulumi.Output; public /*out*/ readonly manifests!: pulumi.Output; @@ -166,9 +164,7 @@ export interface ImageArgs { cacheTo?: pulumi.Input[]>; /** * - * Contexts to use while building the image. If omitted, an empty context - * is used. If more than one value is specified, they should be of the - * form "name=value". + * Path to use for build context. If omitted, an empty context is used. */ context?: pulumi.Input; /** @@ -179,7 +175,7 @@ export interface ImageArgs { exports?: pulumi.Input[]>; /** * - * Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + * Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). */ file?: pulumi.Input; /** diff --git a/sdk/python/pulumi_docker/buildx/image.py b/sdk/python/pulumi_docker/buildx/image.py index 9082554c..576368dc 100644 --- a/sdk/python/pulumi_docker/buildx/image.py +++ b/sdk/python/pulumi_docker/buildx/image.py @@ -41,14 +41,12 @@ def __init__(__self__, *, :param pulumi.Input[Sequence[pulumi.Input[str]]] cache_to: Cache export destinations (e.g., "user/app:cache", "type=local,dest=path/to/dir") :param pulumi.Input[str] context: - Contexts to use while building the image. If omitted, an empty context - is used. If more than one value is specified, they should be of the - form "name=value". + Path to use for build context. If omitted, an empty context is used. :param pulumi.Input[Sequence[pulumi.Input[str]]] exports: Name and optionally a tag (format: "name:tag"). If outputting to a registry, the name should include the fully qualified registry address. :param pulumi.Input[str] file: - Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). :param pulumi.Input[Sequence[pulumi.Input[str]]] platforms: Set target platforms for the build. Defaults to the host's platform :param pulumi.Input[bool] pull: @@ -139,9 +137,7 @@ def cache_to(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]): def context(self) -> Optional[pulumi.Input[str]]: """ - Contexts to use while building the image. If omitted, an empty context - is used. If more than one value is specified, they should be of the - form "name=value". + Path to use for build context. If omitted, an empty context is used. """ return pulumi.get(self, "context") @@ -168,7 +164,7 @@ def exports(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]): def file(self) -> Optional[pulumi.Input[str]]: """ - Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). """ return pulumi.get(self, "file") @@ -247,14 +243,12 @@ def __init__(__self__, :param pulumi.Input[Sequence[pulumi.Input[str]]] cache_to: Cache export destinations (e.g., "user/app:cache", "type=local,dest=path/to/dir") :param pulumi.Input[str] context: - Contexts to use while building the image. If omitted, an empty context - is used. If more than one value is specified, they should be of the - form "name=value". + Path to use for build context. If omitted, an empty context is used. :param pulumi.Input[Sequence[pulumi.Input[str]]] exports: Name and optionally a tag (format: "name:tag"). If outputting to a registry, the name should include the fully qualified registry address. :param pulumi.Input[str] file: - Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). :param pulumi.Input[Sequence[pulumi.Input[str]]] platforms: Set target platforms for the build. Defaults to the host's platform :param pulumi.Input[bool] pull: @@ -395,9 +389,7 @@ def cache_to(self) -> pulumi.Output[Optional[Sequence[str]]]: def context(self) -> pulumi.Output[Optional[str]]: """ - Contexts to use while building the image. If omitted, an empty context - is used. If more than one value is specified, they should be of the - form "name=value". + Path to use for build context. If omitted, an empty context is used. """ return pulumi.get(self, "context") @@ -421,7 +413,7 @@ def exports(self) -> pulumi.Output[Optional[Sequence[str]]]: def file(self) -> pulumi.Output[Optional[str]]: """ - Name of the Dockerfile to use (default: "$PATH/Dockerfile"). + Name of the Dockerfile to use (defaults to "${context}/Dockerfile"). """ return pulumi.get(self, "file")