@@ -8,21 +8,24 @@ import (
88 "log"
99 "regexp"
1010
11- "github.com/aws/aws-sdk-go/aws"
12- "github.com/aws/aws-sdk-go/service/timestreamwrite"
13- "github.com/hashicorp /aws-sdk-go-base/ v2/awsv1shim/v2/tfawserr "
11+ "github.com/aws/aws-sdk-go-v2 /aws"
12+ "github.com/aws/aws-sdk-go-v2 /service/timestreamwrite"
13+ "github.com/aws /aws-sdk-go-v2/service/timestreamwrite/types "
1414 "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
15+ "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
1516 "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1617 "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1718 "github.com/hashicorp/terraform-provider-aws/internal/conns"
19+ "github.com/hashicorp/terraform-provider-aws/internal/errs"
1820 tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
21+ "github.com/hashicorp/terraform-provider-aws/internal/tfresource"
1922 "github.com/hashicorp/terraform-provider-aws/internal/verify"
2023 "github.com/hashicorp/terraform-provider-aws/names"
2124)
2225
2326// @SDKResource("aws_timestreamwrite_database", name="Database")
2427// @Tags(identifierAttribute="arn")
25- func ResourceDatabase () * schema.Resource {
28+ func resourceDatabase () * schema.Resource {
2629 return & schema.Resource {
2730 CreateWithoutTimeout : resourceDatabaseCreate ,
2831 ReadWithoutTimeout : resourceDatabaseRead ,
@@ -38,7 +41,6 @@ func ResourceDatabase() *schema.Resource {
3841 Type : schema .TypeString ,
3942 Computed : true ,
4043 },
41-
4244 "database_name" : {
4345 Type : schema .TypeString ,
4446 Required : true ,
@@ -48,7 +50,6 @@ func ResourceDatabase() *schema.Resource {
4850 validation .StringMatch (regexp .MustCompile (`^[a-zA-Z0-9_.-]+$` ), "must only include alphanumeric, underscore, period, or hyphen characters" ),
4951 ),
5052 },
51-
5253 "kms_key_id" : {
5354 Type : schema .TypeString ,
5455 Optional : true ,
@@ -59,7 +60,6 @@ func ResourceDatabase() *schema.Resource {
5960 // To avoid importing an extra service in this resource, input here is restricted to only ARNs.
6061 ValidateFunc : verify .ValidARN ,
6162 },
62-
6363 "table_count" : {
6464 Type : schema .TypeInt ,
6565 Computed : true ,
@@ -73,43 +73,35 @@ func ResourceDatabase() *schema.Resource {
7373}
7474
7575func resourceDatabaseCreate (ctx context.Context , d * schema.ResourceData , meta interface {}) diag.Diagnostics {
76- conn := meta .(* conns.AWSClient ).TimestreamWriteConn (ctx )
76+ conn := meta .(* conns.AWSClient ).TimestreamWriteClient (ctx )
7777
78- dbName := d .Get ("database_name" ).(string )
78+ name := d .Get ("database_name" ).(string )
7979 input := & timestreamwrite.CreateDatabaseInput {
80- DatabaseName : aws .String (dbName ),
80+ DatabaseName : aws .String (name ),
8181 Tags : getTagsIn (ctx ),
8282 }
8383
8484 if v , ok := d .GetOk ("kms_key_id" ); ok {
8585 input .KmsKeyId = aws .String (v .(string ))
8686 }
8787
88- resp , err := conn .CreateDatabaseWithContext (ctx , input )
88+ output , err := conn .CreateDatabase (ctx , input )
8989
9090 if err != nil {
91- return diag .Errorf ("creating Timestream Database (%s): %s" , dbName , err )
91+ return diag .Errorf ("creating Timestream Database (%s): %s" , name , err )
9292 }
9393
94- if resp == nil || resp .Database == nil {
95- return diag .Errorf ("creating Timestream Database (%s): empty output" , dbName )
96- }
97-
98- d .SetId (aws .StringValue (resp .Database .DatabaseName ))
94+ d .SetId (aws .ToString (output .Database .DatabaseName ))
9995
10096 return resourceDatabaseRead (ctx , d , meta )
10197}
10298
10399func resourceDatabaseRead (ctx context.Context , d * schema.ResourceData , meta interface {}) diag.Diagnostics {
104- conn := meta .(* conns.AWSClient ).TimestreamWriteConn (ctx )
100+ conn := meta .(* conns.AWSClient ).TimestreamWriteClient (ctx )
105101
106- input := & timestreamwrite.DescribeDatabaseInput {
107- DatabaseName : aws .String (d .Id ()),
108- }
109-
110- resp , err := conn .DescribeDatabaseWithContext (ctx , input )
102+ db , err := findDatabaseByName (ctx , conn , d .Id ())
111103
112- if ! d .IsNewResource () && tfawserr . ErrCodeEquals (err , timestreamwrite . ErrCodeResourceNotFoundException ) {
104+ if ! d .IsNewResource () && tfresource . NotFound (err ) {
113105 log .Printf ("[WARN] Timestream Database %s not found, removing from state" , d .Id ())
114106 d .SetId ("" )
115107 return nil
@@ -119,14 +111,7 @@ func resourceDatabaseRead(ctx context.Context, d *schema.ResourceData, meta inte
119111 return diag .Errorf ("reading Timestream Database (%s): %s" , d .Id (), err )
120112 }
121113
122- if resp == nil || resp .Database == nil {
123- return diag .Errorf ("reading Timestream Database (%s): empty output" , d .Id ())
124- }
125-
126- db := resp .Database
127- arn := aws .StringValue (db .Arn )
128-
129- d .Set ("arn" , arn )
114+ d .Set ("arn" , db .Arn )
130115 d .Set ("database_name" , db .DatabaseName )
131116 d .Set ("kms_key_id" , db .KmsKeyId )
132117 d .Set ("table_count" , db .TableCount )
@@ -135,15 +120,15 @@ func resourceDatabaseRead(ctx context.Context, d *schema.ResourceData, meta inte
135120}
136121
137122func resourceDatabaseUpdate (ctx context.Context , d * schema.ResourceData , meta interface {}) diag.Diagnostics {
138- conn := meta .(* conns.AWSClient ).TimestreamWriteConn (ctx )
123+ conn := meta .(* conns.AWSClient ).TimestreamWriteClient (ctx )
139124
140125 if d .HasChange ("kms_key_id" ) {
141126 input := & timestreamwrite.UpdateDatabaseInput {
142127 DatabaseName : aws .String (d .Id ()),
143128 KmsKeyId : aws .String (d .Get ("kms_key_id" ).(string )),
144129 }
145130
146- _ , err := conn .UpdateDatabaseWithContext (ctx , input )
131+ _ , err := conn .UpdateDatabase (ctx , input )
147132
148133 if err != nil {
149134 return diag .Errorf ("updating Timestream Database (%s): %s" , d .Id (), err )
@@ -154,14 +139,14 @@ func resourceDatabaseUpdate(ctx context.Context, d *schema.ResourceData, meta in
154139}
155140
156141func resourceDatabaseDelete (ctx context.Context , d * schema.ResourceData , meta interface {}) diag.Diagnostics {
157- conn := meta .(* conns.AWSClient ).TimestreamWriteConn (ctx )
142+ conn := meta .(* conns.AWSClient ).TimestreamWriteClient (ctx )
158143
159144 log .Printf ("[INFO] Deleting Timestream Database: %s" , d .Id ())
160- _ , err := conn .DeleteDatabaseWithContext (ctx , & timestreamwrite.DeleteDatabaseInput {
145+ _ , err := conn .DeleteDatabase (ctx , & timestreamwrite.DeleteDatabaseInput {
161146 DatabaseName : aws .String (d .Id ()),
162147 })
163148
164- if tfawserr . ErrCodeEquals (err , timestreamwrite . ErrCodeResourceNotFoundException ) {
149+ if errs. IsA [ * types. ResourceNotFoundException ] (err ) {
165150 return nil
166151 }
167152
@@ -171,3 +156,28 @@ func resourceDatabaseDelete(ctx context.Context, d *schema.ResourceData, meta in
171156
172157 return nil
173158}
159+
160+ func findDatabaseByName (ctx context.Context , conn * timestreamwrite.Client , name string ) (* types.Database , error ) {
161+ input := & timestreamwrite.DescribeDatabaseInput {
162+ DatabaseName : aws .String (name ),
163+ }
164+
165+ output , err := conn .DescribeDatabase (ctx , input )
166+
167+ if errs.IsA [* types.ResourceNotFoundException ](err ) {
168+ return nil , & retry.NotFoundError {
169+ LastError : err ,
170+ LastRequest : input ,
171+ }
172+ }
173+
174+ if err != nil {
175+ return nil , err
176+ }
177+
178+ if output == nil || output .Database == nil {
179+ return nil , tfresource .NewEmptyResultError (input )
180+ }
181+
182+ return output .Database , nil
183+ }
0 commit comments