Skip to content

Commit

Permalink
Remove deprecation of RDS Instance name (#2221)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielrbradley authored Nov 17, 2022
1 parent fe39775 commit 652114f
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 73 deletions.
5 changes: 1 addition & 4 deletions provider/cmd/pulumi-resource-aws/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -516704,8 +516704,7 @@
},
"name": {
"type": "string",
"description": "The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.\n",
"deprecationMessage": "Use db_name instead"
"description": "The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.\n"
},
"ncharCharacterSetName": {
"type": "string",
Expand Down Expand Up @@ -517036,7 +517035,6 @@
"name": {
"type": "string",
"description": "The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.\n",
"deprecationMessage": "Use db_name instead",
"willReplaceOnChanges": true
},
"ncharCharacterSetName": {
Expand Down Expand Up @@ -517346,7 +517344,6 @@
"name": {
"type": "string",
"description": "The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.\n",
"deprecationMessage": "Use db_name instead",
"willReplaceOnChanges": true
},
"ncharCharacterSetName": {
Expand Down
2 changes: 1 addition & 1 deletion provider/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (

replace (
github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9
github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20221115140012-f835cc91312a
github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20221117095546-4f71b6571c4a
github.com/hashicorp/terraform-provider-aws/shim => ./shim
github.com/hashicorp/vault => github.com/hashicorp/vault v1.2.0
)
Expand Down
4 changes: 2 additions & 2 deletions provider/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -864,8 +864,8 @@ github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e h1:Di
github.com/pulumi/terraform-diff-reader v0.0.0-20201211191010-ad4715e9285e/go.mod h1:sZ9FUzGO+yM41hsQHs/yIcj/Y993qMdBxBU5mpDmAfQ=
github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9 h1:JMw+t5I+6E8Lna7JF+ghAoOLOl23UIbshJyRNP+K1HU=
github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20220824175045-450992f2f5b9/go.mod h1:mYPs/uchNcBq7AclQv9QUtSf9iNcfp1Ag21jqTlDf2M=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221115140012-f835cc91312a h1:rKkiL6H312G+eyCOEXgQST8nZJ8MfYstDcOsGdZu79A=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221115140012-f835cc91312a/go.mod h1:2v3/UvLrOawJg+Ekk7e6EUX1+5NQ9x1V+ZVoC/omJjo=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221117095546-4f71b6571c4a h1:fDqJ75cjXTGCv3QBApbaJrMAFuQyDkUeaMo2ECzFjGw=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221117095546-4f71b6571c4a/go.mod h1:2v3/UvLrOawJg+Ekk7e6EUX1+5NQ9x1V+ZVoC/omJjo=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
Expand Down
2 changes: 1 addition & 1 deletion provider/shim/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/hashicorp/terraform-provider-aws v1.60.1-0.20220923175450-ca71523cdc36
)

replace github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20221115140012-f835cc91312a
replace github.com/hashicorp/terraform-provider-aws => github.com/pulumi/terraform-provider-aws v1.38.1-0.20221117095546-4f71b6571c4a

require (
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
Expand Down
4 changes: 2 additions & 2 deletions provider/shim/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pquerna/otp v1.3.0 h1:oJV/SkzR33anKXwQU3Of42rL4wbrffP4uvUf1SvS5Xs=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221115140012-f835cc91312a h1:rKkiL6H312G+eyCOEXgQST8nZJ8MfYstDcOsGdZu79A=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221115140012-f835cc91312a/go.mod h1:2v3/UvLrOawJg+Ekk7e6EUX1+5NQ9x1V+ZVoC/omJjo=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221117095546-4f71b6571c4a h1:fDqJ75cjXTGCv3QBApbaJrMAFuQyDkUeaMo2ECzFjGw=
github.com/pulumi/terraform-provider-aws v1.38.1-0.20221117095546-4f71b6571c4a/go.mod h1:2v3/UvLrOawJg+Ekk7e6EUX1+5NQ9x1V+ZVoC/omJjo=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/sebdah/goldie v1.0.0/go.mod h1:jXP4hmWywNEwZzhMuv2ccnqTSFpuq8iyQhtQdkkZBH4=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
Expand Down
12 changes: 0 additions & 12 deletions sdk/go/aws/rds/instance.go

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

4 changes: 0 additions & 4 deletions sdk/java/src/main/java/com/pulumi/aws/rds/Instance.java
Original file line number Diff line number Diff line change
Expand Up @@ -782,11 +782,7 @@ public Output<Boolean> multiAz() {
/**
* The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
@Export(name="name", type=String.class, parameters={})
private Output<String> name;

Expand Down
16 changes: 0 additions & 16 deletions sdk/java/src/main/java/com/pulumi/aws/rds/InstanceArgs.java
Original file line number Diff line number Diff line change
Expand Up @@ -631,22 +631,14 @@ public Optional<Output<Boolean>> multiAz() {
/**
* The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
@Import(name="name")
private @Nullable Output<String> name;

/**
* @return The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
public Optional<Output<String>> name() {
return Optional.ofNullable(this.name);
}
Expand Down Expand Up @@ -1994,11 +1986,7 @@ public Builder multiAz(Boolean multiAz) {
*
* @return builder
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
public Builder name(@Nullable Output<String> name) {
$.name = name;
return this;
Expand All @@ -2009,11 +1997,7 @@ public Builder name(@Nullable Output<String> name) {
*
* @return builder
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
public Builder name(String name) {
return name(Output.of(name));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -723,22 +723,14 @@ public Optional<Output<Boolean>> multiAz() {
/**
* The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
@Import(name="name")
private @Nullable Output<String> name;

/**
* @return The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
public Optional<Output<String>> name() {
return Optional.ofNullable(this.name);
}
Expand Down Expand Up @@ -2276,11 +2268,7 @@ public Builder multiAz(Boolean multiAz) {
*
* @return builder
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
public Builder name(@Nullable Output<String> name) {
$.name = name;
return this;
Expand All @@ -2291,11 +2279,7 @@ public Builder name(@Nullable Output<String> name) {
*
* @return builder
*
* @deprecated
* Use db_name instead
*
*/
@Deprecated /* Use db_name instead */
public Builder name(String name) {
return name(Output.of(name));
}
Expand Down
6 changes: 0 additions & 6 deletions sdk/nodejs/rds/instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,6 @@ export class Instance extends pulumi.CustomResource {
public readonly multiAz!: pulumi.Output<boolean>;
/**
* The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated Use db_name instead
*/
public readonly name!: pulumi.Output<string>;
/**
Expand Down Expand Up @@ -826,8 +824,6 @@ export interface InstanceState {
multiAz?: pulumi.Input<boolean>;
/**
* The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated Use db_name instead
*/
name?: pulumi.Input<string>;
/**
Expand Down Expand Up @@ -1161,8 +1157,6 @@ export interface InstanceArgs {
multiAz?: pulumi.Input<boolean>;
/**
* The name of the database to create when the DB instance is created. If this parameter is not specified, no database is created in the DB instance. Note that this does not apply for Oracle or SQL Server engines. See the [AWS documentation](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/rds/create-db-instance.html) for more details on what applies for those engines. If you are providing an Oracle db name, it needs to be in all upper case. Cannot be specified for a replica.
*
* @deprecated Use db_name instead
*/
name?: pulumi.Input<string>;
/**
Expand Down
Loading

0 comments on commit 652114f

Please sign in to comment.