Skip to content

Commit

Permalink
Remove awsx.Ecr.ImageArgs.extraOptions
Browse files Browse the repository at this point in the history 
This would be a breaking change, but this argument is already not
working anymore since it was removed from the underlying Docker provider,
see pulumi/pulumi-docker#424.

Part of #1148
  • Loading branch information
@thomas11
thomas11 committed Nov 9, 2023
1 parent 5852b89 commit 413fd86
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 116 deletions.
3 changes: 0 additions & 3 deletions awsx/schema-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ export interface ImageArgs {
readonly cacheFrom?: pulumi.Input<pulumi.Input<string>[]>;
readonly context?: pulumi.Input<string>;
readonly dockerfile?: pulumi.Input<string>;
readonly extraOptions?: pulumi.Input<pulumi.Input<string>[]>;
readonly platform?: pulumi.Input<string>;
readonly repositoryUrl: pulumi.Input<string>;
readonly target?: pulumi.Input<string>;
Expand Down Expand Up @@ -616,7 +615,6 @@ export interface DockerBuildInputs {
readonly cacheFrom?: pulumi.Input<pulumi.Input<string>[]>;
readonly context?: pulumi.Input<string>;
readonly dockerfile?: pulumi.Input<string>;
readonly extraOptions?: pulumi.Input<pulumi.Input<string>[]>;
readonly platform?: pulumi.Input<string>;
readonly target?: pulumi.Input<string>;
}
Expand All @@ -626,7 +624,6 @@ export interface DockerBuildOutputs {
readonly cacheFrom?: pulumi.Output<string[]>;
readonly context?: pulumi.Output<string>;
readonly dockerfile?: pulumi.Output<string>;
readonly extraOptions?: pulumi.Output<string[]>;
readonly platform?: pulumi.Output<string>;
readonly target?: pulumi.Output<string>;
}
Expand Down
14 changes: 0 additions & 14 deletions awsx/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -725,13 +725,6 @@
"type": "string",
"description": "dockerfile may be used to override the default Dockerfile name and/or location. By default, it is assumed to be a file named Dockerfile in the root of the build context."
},
"extraOptions": {
"type": "array",
"items": {
"type": "string"
},
"description": "An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`."
},
"platform": {
"type": "string",
"description": "The architecture of the platform you want to build this image for, e.g. `linux/arm64`."
Expand Down Expand Up @@ -2061,13 +2054,6 @@
"type": "string",
"description": "dockerfile may be used to override the default Dockerfile name and/or location. By default, it is assumed to be a file named Dockerfile in the root of the build context."
},
"extraOptions": {
"type": "array",
"items": {
"type": "string"
},
"description": "An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`."
},
"platform": {
"type": "string",
"description": "The architecture of the platform you want to build this image for, e.g. `linux/arm64`."
Expand Down
9 changes: 0 additions & 9 deletions schemagen/pkg/gen/ecr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,6 @@ func dockerBuildProperties(dockerSpec schema.PackageSpec) map[string]schema.Prop
Type: "string",
},
},
"extraOptions": {
Description: "An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`.",
TypeSpec: schema.TypeSpec{
Type: "array",
Items: &schema.TypeSpec{
Type: "string",
},
},
},
"platform": {
Description: "The architecture of the platform you want to build this image for, e.g. `linux/arm64`.",
TypeSpec: schema.TypeSpec{
Expand Down
12 changes: 0 additions & 12 deletions sdk/dotnet/Ecr/Image.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,6 @@ public InputList<string> CacheFrom
[Input("dockerfile")]
public Input<string>? Dockerfile { get; set; }

[Input("extraOptions")]
private InputList<string>? _extraOptions;

/// <summary>
/// An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`.
/// </summary>
public InputList<string> ExtraOptions
{
get => _extraOptions ?? (_extraOptions = new InputList<string>());
set => _extraOptions = value;
}

/// <summary>
/// The architecture of the platform you want to build this image for, e.g. `linux/arm64`.
/// </summary>
Expand Down
4 changes: 0 additions & 4 deletions sdk/go/awsx/ecr/image.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions sdk/go/awsx/ecr/pulumiTypes.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 0 additions & 47 deletions sdk/java/src/main/java/com/pulumi/awsx/ecr/ImageArgs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,6 @@ public Optional<Output<String>> dockerfile() {
return Optional.ofNullable(this.dockerfile);
}

/**
* An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `[&#39;--network&#39;, &#39;host&#39;]`.
*
*/
@Import(name="extraOptions")
private @Nullable Output<List<String>> extraOptions;

/**
* @return An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `[&#39;--network&#39;, &#39;host&#39;]`.
*
*/
public Optional<Output<List<String>>> extraOptions() {
return Optional.ofNullable(this.extraOptions);
}

/**
* The architecture of the platform you want to build this image for, e.g. `linux/arm64`.
*
Expand Down Expand Up @@ -161,7 +146,6 @@ private ImageArgs(ImageArgs $) {
this.cacheFrom = $.cacheFrom;
this.context = $.context;
this.dockerfile = $.dockerfile;
this.extraOptions = $.extraOptions;
this.platform = $.platform;
this.repositoryUrl = $.repositoryUrl;
this.target = $.target;
Expand Down Expand Up @@ -290,37 +274,6 @@ public Builder dockerfile(String dockerfile) {
return dockerfile(Output.of(dockerfile));
}

/**
* @param extraOptions An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `[&#39;--network&#39;, &#39;host&#39;]`.
*
* @return builder
*
*/
public Builder extraOptions(@Nullable Output<List<String>> extraOptions) {
$.extraOptions = extraOptions;
return this;
}

/**
* @param extraOptions An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `[&#39;--network&#39;, &#39;host&#39;]`.
*
* @return builder
*
*/
public Builder extraOptions(List<String> extraOptions) {
return extraOptions(Output.of(extraOptions));
}

/**
* @param extraOptions An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `[&#39;--network&#39;, &#39;host&#39;]`.
*
* @return builder
*
*/
public Builder extraOptions(String... extraOptions) {
return extraOptions(List.of(extraOptions));
}

/**
* @param platform The architecture of the platform you want to build this image for, e.g. `linux/arm64`.
*
Expand Down
5 changes: 0 additions & 5 deletions sdk/nodejs/ecr/image.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ export class Image extends pulumi.ComponentResource {
resourceInputs["cacheFrom"] = args ? args.cacheFrom : undefined;
resourceInputs["context"] = args ? args.context : undefined;
resourceInputs["dockerfile"] = args ? args.dockerfile : undefined;
resourceInputs["extraOptions"] = args ? args.extraOptions : undefined;
resourceInputs["platform"] = args ? args.platform : undefined;
resourceInputs["repositoryUrl"] = args ? args.repositoryUrl : undefined;
resourceInputs["target"] = args ? args.target : undefined;
Expand Down Expand Up @@ -86,10 +85,6 @@ export interface ImageArgs {
* dockerfile may be used to override the default Dockerfile name and/or location. By default, it is assumed to be a file named Dockerfile in the root of the build context.
*/
dockerfile?: pulumi.Input<string>;
/**
* An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`.
*/
extraOptions?: pulumi.Input<pulumi.Input<string>[]>;
/**
* The architecture of the platform you want to build this image for, e.g. `linux/arm64`.
*/
Expand Down
20 changes: 0 additions & 20 deletions sdk/python/pulumi_awsx/ecr/image.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ def __init__(__self__, *,
cache_from: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
context: Optional[pulumi.Input[str]] = None,
dockerfile: Optional[pulumi.Input[str]] = None,
extra_options: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
platform: Optional[pulumi.Input[str]] = None,
target: Optional[pulumi.Input[str]] = None):
"""
Expand All @@ -32,7 +31,6 @@ def __init__(__self__, *,
:param pulumi.Input[Sequence[pulumi.Input[str]]] cache_from: Images to consider as cache sources
:param pulumi.Input[str] context: Path to a directory to use for the Docker build context, usually the directory in which the Dockerfile resides (although dockerfile may be used to choose a custom location independent of this choice). If not specified, the context defaults to the current working directory; if a relative path is used, it is relative to the current working directory that Pulumi is evaluating.
:param pulumi.Input[str] dockerfile: dockerfile may be used to override the default Dockerfile name and/or location. By default, it is assumed to be a file named Dockerfile in the root of the build context.
:param pulumi.Input[Sequence[pulumi.Input[str]]] extra_options: An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`.
:param pulumi.Input[str] platform: The architecture of the platform you want to build this image for, e.g. `linux/arm64`.
:param pulumi.Input[str] target: The target of the dockerfile to build
"""
Expand All @@ -47,8 +45,6 @@ def __init__(__self__, *,
pulumi.set(__self__, "context", context)
if dockerfile is not None:
pulumi.set(__self__, "dockerfile", dockerfile)
if extra_options is not None:
pulumi.set(__self__, "extra_options", extra_options)
if platform is not None:
pulumi.set(__self__, "platform", platform)
if target is not None:
Expand Down Expand Up @@ -126,18 +122,6 @@ def dockerfile(self) -> Optional[pulumi.Input[str]]:
def dockerfile(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "dockerfile", value)

@property
@pulumi.getter(name="extraOptions")
def extra_options(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
"""
An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`.
"""
return pulumi.get(self, "extra_options")

@extra_options.setter
def extra_options(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
pulumi.set(self, "extra_options", value)

@property
@pulumi.getter
def platform(self) -> Optional[pulumi.Input[str]]:
Expand Down Expand Up @@ -173,7 +157,6 @@ def __init__(__self__,
cache_from: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
context: Optional[pulumi.Input[str]] = None,
dockerfile: Optional[pulumi.Input[str]] = None,
extra_options: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
platform: Optional[pulumi.Input[str]] = None,
repository_url: Optional[pulumi.Input[str]] = None,
target: Optional[pulumi.Input[str]] = None,
Expand All @@ -188,7 +171,6 @@ def __init__(__self__,
:param pulumi.Input[Sequence[pulumi.Input[str]]] cache_from: Images to consider as cache sources
:param pulumi.Input[str] context: Path to a directory to use for the Docker build context, usually the directory in which the Dockerfile resides (although dockerfile may be used to choose a custom location independent of this choice). If not specified, the context defaults to the current working directory; if a relative path is used, it is relative to the current working directory that Pulumi is evaluating.
:param pulumi.Input[str] dockerfile: dockerfile may be used to override the default Dockerfile name and/or location. By default, it is assumed to be a file named Dockerfile in the root of the build context.
:param pulumi.Input[Sequence[pulumi.Input[str]]] extra_options: An optional catch-all list of arguments to provide extra CLI options to the docker build command. For example `['--network', 'host']`.
:param pulumi.Input[str] platform: The architecture of the platform you want to build this image for, e.g. `linux/arm64`.
:param pulumi.Input[str] repository_url: Url of the repository
:param pulumi.Input[str] target: The target of the dockerfile to build
Expand Down Expand Up @@ -222,7 +204,6 @@ def _internal_init(__self__,
cache_from: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
context: Optional[pulumi.Input[str]] = None,
dockerfile: Optional[pulumi.Input[str]] = None,
extra_options: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
platform: Optional[pulumi.Input[str]] = None,
repository_url: Optional[pulumi.Input[str]] = None,
target: Optional[pulumi.Input[str]] = None,
Expand All @@ -242,7 +223,6 @@ def _internal_init(__self__,
__props__.__dict__["cache_from"] = cache_from
__props__.__dict__["context"] = context
__props__.__dict__["dockerfile"] = dockerfile
__props__.__dict__["extra_options"] = extra_options
__props__.__dict__["platform"] = platform
if repository_url is None and not opts.urn:
raise TypeError("Missing required property 'repository_url'")
Expand Down

0 comments on commit 413fd86

Please sign in to comment.