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.

Sign up for GitHub

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

Fix urn name clash for ReservedIp resource in DigitalOcean provider #515

Closed
wants to merge 2 commits into from
Closed

Fix urn name clash for ReservedIp resource in DigitalOcean provider #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69e6bc0
Fix urn name clash in DigitalOcean provider
lbialy Oct 26, 2023
2b22cc2
regenerate schema and sdks
iwahbe Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion provider/cmd/pulumi-resource-digitalocean/bridge-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2694,7 +2694,8 @@
},
"digitalocean:index/reservedIp:ReservedIp": {
"dropletId": "droplet_id",
"ipAddress": "ip_address"
"ipAddress": "ip_address",
"reservedIpUrn": "urn"
},
"digitalocean:index/reservedIpAssignment:ReservedIpAssignment": {
"dropletId": "droplet_id",
Expand Down
6 changes: 3 additions & 3 deletions provider/cmd/pulumi-resource-digitalocean/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10561,15 +10561,15 @@
"type": "string",
"description": "The region that the reserved IP is reserved to.\n"
},
"urn": {
"reservedIpUrn": {
"type": "string",
"description": "The uniform resource name of the reserved ip\n"
}
},
"required": [
"ipAddress",
"region",
"urn"
"reservedIpUrn"
],
"inputProperties": {
"dropletId": {
Expand Down Expand Up @@ -10605,7 +10605,7 @@
"description": "The region that the reserved IP is reserved to.\n",
"willReplaceOnChanges": true
},
"urn": {
"reservedIpUrn": {
"type": "string",
"description": "The uniform resource name of the reserved ip\n"
}
Expand Down
9 changes: 8 additions & 1 deletion provider/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,14 @@ func Provider() tfbridge.ProviderInfo {
"digitalocean_custom_image": {Tok: makeResource(digitalOceanMod, "CustomImage")},
"digitalocean_monitor_alert": {Tok: makeResource(digitalOceanMod, "MonitorAlert")},
"digitalocean_spaces_bucket_policy": {Tok: makeResource(digitalOceanMod, "SpacesBucketPolicy")},
"digitalocean_reserved_ip": {Tok: makeResource(digitalOceanMod, "ReservedIp")},
"digitalocean_reserved_ip": {
Tok: makeResource(digitalOceanMod, "ReservedIp"),
Fields: map[string]*tfbridge.SchemaInfo{
"urn": {
Name: "reservedIpUrn",
},
},
},
"digitalocean_reserved_ip_assignment": {Tok: makeResource(digitalOceanMod, "ReservedIpAssignment")},
},
ExtraTypes: map[string]schema.ComplexTypeSpec{
Expand Down
8 changes: 4 additions & 4 deletions sdk/dotnet/ReservedIp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public partial class ReservedIp : global::Pulumi.CustomResource
/// <summary>
/// The uniform resource name of the reserved ip
/// </summary>
[Output("urn")]
public Output<string> Urn { get; private set; } = null!;
[Output("reservedIpUrn")]
public Output<string> ReservedIpUrn { get; private set; } = null!;


/// <summary>
Expand Down Expand Up @@ -170,8 +170,8 @@ public sealed class ReservedIpState : global::Pulumi.ResourceArgs
/// <summary>
/// The uniform resource name of the reserved ip
/// </summary>
[Input("urn")]
public Input<string>? Urn { get; set; }
[Input("reservedIpUrn")]
public Input<string>? ReservedIpUrn { get; set; }

public ReservedIpState()
{
Expand Down
10 changes: 5 additions & 5 deletions sdk/go/digitalocean/reservedIp.go
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions sdk/java/src/main/java/com/pulumi/digitalocean/ReservedIp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ public Output<String> region() {
* The uniform resource name of the reserved ip
*
*/
@Export(name="urn", type=String.class, parameters={})
private Output<String> urn;
@Export(name="reservedIpUrn", type=String.class, parameters={})
private Output<String> reservedIpUrn;

/**
* @return The uniform resource name of the reserved ip
*
*/
public Output<String> urn() {
return this.urn;
public Output<String> reservedIpUrn() {
return this.reservedIpUrn;
}

/**
Expand Down
22 changes: 11 additions & 11 deletions sdk/java/src/main/java/com/pulumi/digitalocean/inputs/ReservedIpState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ public Optional<Output<String>> region() {
* The uniform resource name of the reserved ip
*
*/
@Import(name="urn")
private @Nullable Output<String> urn;
@Import(name="reservedIpUrn")
private @Nullable Output<String> reservedIpUrn;

/**
* @return The uniform resource name of the reserved ip
*
*/
public Optional<Output<String>> urn() {
return Optional.ofNullable(this.urn);
public Optional<Output<String>> reservedIpUrn() {
return Optional.ofNullable(this.reservedIpUrn);
}

private ReservedIpState() {}
Expand All @@ -82,7 +82,7 @@ private ReservedIpState(ReservedIpState $) {
this.dropletId = $.dropletId;
this.ipAddress = $.ipAddress;
this.region = $.region;
this.urn = $.urn;
this.reservedIpUrn = $.reservedIpUrn;
}

public static Builder builder() {
Expand Down Expand Up @@ -167,24 +167,24 @@ public Builder region(String region) {
}

/**
* @param urn The uniform resource name of the reserved ip
* @param reservedIpUrn The uniform resource name of the reserved ip
*
* @return builder
*
*/
public Builder urn(@Nullable Output<String> urn) {
$.urn = urn;
public Builder reservedIpUrn(@Nullable Output<String> reservedIpUrn) {
$.reservedIpUrn = reservedIpUrn;
return this;
}

/**
* @param urn The uniform resource name of the reserved ip
* @param reservedIpUrn The uniform resource name of the reserved ip
*
* @return builder
*
*/
public Builder urn(String urn) {
return urn(Output.of(urn));
public Builder reservedIpUrn(String reservedIpUrn) {
return reservedIpUrn(Output.of(reservedIpUrn));
}

public ReservedIpState build() {
Expand Down
8 changes: 4 additions & 4 deletions sdk/nodejs/reservedIp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export class ReservedIp extends pulumi.CustomResource {
/**
* The uniform resource name of the reserved ip
*/
public /*out*/ readonly urn!: pulumi.Output<string>;
public /*out*/ readonly reservedIpUrn!: pulumi.Output<string>;

/**
* Create a ReservedIp resource with the given unique name, arguments, and options.
Expand All @@ -97,7 +97,7 @@ export class ReservedIp extends pulumi.CustomResource {
resourceInputs["dropletId"] = state ? state.dropletId : undefined;
resourceInputs["ipAddress"] = state ? state.ipAddress : undefined;
resourceInputs["region"] = state ? state.region : undefined;
resourceInputs["urn"] = state ? state.urn : undefined;
resourceInputs["reservedIpUrn"] = state ? state.reservedIpUrn : undefined;
} else {
const args = argsOrState as ReservedIpArgs | undefined;
if ((!args || args.region === undefined) && !opts.urn) {
Expand All @@ -106,7 +106,7 @@ export class ReservedIp extends pulumi.CustomResource {
resourceInputs["dropletId"] = args ? args.dropletId : undefined;
resourceInputs["ipAddress"] = args ? args.ipAddress : undefined;
resourceInputs["region"] = args ? args.region : undefined;
resourceInputs["urn"] = undefined /*out*/;
resourceInputs["reservedIpUrn"] = undefined /*out*/;
}
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
super(ReservedIp.__pulumiType, name, resourceInputs, opts);
Expand All @@ -132,7 +132,7 @@ export interface ReservedIpState {
/**
* The uniform resource name of the reserved ip
*/
urn?: pulumi.Input<string>;
reservedIpUrn?: pulumi.Input<string>;
}

/**
Expand Down
40 changes: 21 additions & 19 deletions sdk/python/pulumi_digitalocean/reserved_ip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,43 +93,45 @@ def __init__(__self__, *,
droplet_id: Optional[pulumi.Input[int]] = None,
ip_address: Optional[pulumi.Input[str]] = None,
region: Optional[pulumi.Input[str]] = None,
urn: Optional[pulumi.Input[str]] = None):
reserved_ip_urn: Optional[pulumi.Input[str]] = None):
"""
Input properties used for looking up and filtering ReservedIp resources.
:param pulumi.Input[int] droplet_id: The ID of Droplet that the reserved IP will be assigned to.
:param pulumi.Input[str] ip_address: The IP Address of the resource
:param pulumi.Input[str] region: The region that the reserved IP is reserved to.
:param pulumi.Input[str] urn: The uniform resource name of the reserved ip
:param pulumi.Input[str] reserved_ip_urn: The uniform resource name of the reserved ip
"""
_ReservedIpState._configure(
lambda key, value: pulumi.set(__self__, key, value),
droplet_id=droplet_id,
ip_address=ip_address,
region=region,
urn=urn,
reserved_ip_urn=reserved_ip_urn,
)
@staticmethod
def _configure(
_setter: Callable[[Any, Any], None],
droplet_id: Optional[pulumi.Input[int]] = None,
ip_address: Optional[pulumi.Input[str]] = None,
region: Optional[pulumi.Input[str]] = None,
urn: Optional[pulumi.Input[str]] = None,
reserved_ip_urn: Optional[pulumi.Input[str]] = None,
opts: Optional[pulumi.ResourceOptions] = None,
**kwargs):
if droplet_id is None and 'dropletId' in kwargs:
droplet_id = kwargs['dropletId']
if ip_address is None and 'ipAddress' in kwargs:
ip_address = kwargs['ipAddress']
if reserved_ip_urn is None and 'reservedIpUrn' in kwargs:
reserved_ip_urn = kwargs['reservedIpUrn']

if droplet_id is not None:
_setter("droplet_id", droplet_id)
if ip_address is not None:
_setter("ip_address", ip_address)
if region is not None:
_setter("region", region)
if urn is not None:
_setter("urn", urn)
if reserved_ip_urn is not None:
_setter("reserved_ip_urn", reserved_ip_urn)

@property
@pulumi.getter(name="dropletId")
Expand Down Expand Up @@ -168,16 +170,16 @@ def region(self, value: Optional[pulumi.Input[str]]):
pulumi.set(self, "region", value)

@property
@pulumi.getter
def urn(self) -> Optional[pulumi.Input[str]]:
@pulumi.getter(name="reservedIpUrn")
def reserved_ip_urn(self) -> Optional[pulumi.Input[str]]:
"""
The uniform resource name of the reserved ip
"""
return pulumi.get(self, "urn")
return pulumi.get(self, "reserved_ip_urn")

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


class ReservedIp(pulumi.CustomResource):
Expand Down Expand Up @@ -297,7 +299,7 @@ def _internal_init(__self__,
if region is None and not opts.urn:
raise TypeError("Missing required property 'region'")
__props__.__dict__["region"] = region
__props__.__dict__["urn"] = None
__props__.__dict__["reserved_ip_urn"] = None
super(ReservedIp, __self__).__init__(
'digitalocean:index/reservedIp:ReservedIp',
resource_name,
Expand All @@ -311,7 +313,7 @@ def get(resource_name: str,
droplet_id: Optional[pulumi.Input[int]] = None,
ip_address: Optional[pulumi.Input[str]] = None,
region: Optional[pulumi.Input[str]] = None,
urn: Optional[pulumi.Input[str]] = None) -> 'ReservedIp':
reserved_ip_urn: Optional[pulumi.Input[str]] = None) -> 'ReservedIp':
"""
Get an existing ReservedIp resource's state with the given name, id, and optional extra
properties used to qualify the lookup.
Expand All @@ -322,7 +324,7 @@ def get(resource_name: str,
:param pulumi.Input[int] droplet_id: The ID of Droplet that the reserved IP will be assigned to.
:param pulumi.Input[str] ip_address: The IP Address of the resource
:param pulumi.Input[str] region: The region that the reserved IP is reserved to.
:param pulumi.Input[str] urn: The uniform resource name of the reserved ip
:param pulumi.Input[str] reserved_ip_urn: The uniform resource name of the reserved ip
"""
opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))

Expand All @@ -331,7 +333,7 @@ def get(resource_name: str,
__props__.__dict__["droplet_id"] = droplet_id
__props__.__dict__["ip_address"] = ip_address
__props__.__dict__["region"] = region
__props__.__dict__["urn"] = urn
__props__.__dict__["reserved_ip_urn"] = reserved_ip_urn
return ReservedIp(resource_name, opts=opts, __props__=__props__)

@property
Expand Down Expand Up @@ -359,10 +361,10 @@ def region(self) -> pulumi.Output[str]:
return pulumi.get(self, "region")

@property
@pulumi.getter
def urn(self) -> pulumi.Output[str]:
@pulumi.getter(name="reservedIpUrn")
def reserved_ip_urn(self) -> pulumi.Output[str]:
"""
The uniform resource name of the reserved ip
"""
return pulumi.get(self, "urn")
return pulumi.get(self, "reserved_ip_urn")