Merge pull request #34848 from hsiam261/throw-error-if-import-failed

Wait for import to complete during dynamodb table creation

Author: johnsonaj

.changelog/34848.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_dynamodb_table: Fix error when waiting for snapshot to be created
+```

internal/service/dynamodb/status.go

@@ -49,6 +49,25 @@ func statusTable(ctx context.Context, conn *dynamodb.DynamoDB, tableName string)
 	}
 }
 
+func statusImport(ctx context.Context, conn *dynamodb.DynamoDB, importArn string) retry.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		describeImportInput := &dynamodb.DescribeImportInput{
+			ImportArn: &importArn,
+		}
+		output, err := conn.DescribeImportWithContext(ctx, describeImportInput)
+
+		if tfawserr.ErrCodeEquals(err, dynamodb.ErrCodeResourceNotFoundException) {
+			return nil, "", nil
+		}
+
+		if err != nil {
+			return nil, "", err
+		}
+
+		return output, aws.StringValue(output.ImportTableDescription.ImportStatus), nil
+	}
+}
+
 func statusReplicaUpdate(ctx context.Context, conn *dynamodb.DynamoDB, tableName, region string) retry.StateRefreshFunc {
 	return func() (interface{}, string, error) {
 		result, err := conn.DescribeTableWithContext(ctx, &dynamodb.DescribeTableInput{

internal/service/dynamodb/table.go

@@ -602,7 +602,7 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta inter
 
 		input.TableCreationParameters = tcp
 
-		_, err := tfresource.RetryWhen(ctx, createTableTimeout, func() (interface{}, error) {
+		importTableOutput, err := tfresource.RetryWhen(ctx, createTableTimeout, func() (interface{}, error) {
 			return conn.ImportTableWithContext(ctx, input)
 		}, func(err error) (bool, error) {
 			if tfawserr.ErrCodeEquals(err, "ThrottlingException") {
@@ -621,6 +621,12 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta inter
 		if err != nil {
 			return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionCreating, ResNameTable, tableName, err)
 		}
+
+		importArn := importTableOutput.(*dynamodb.ImportTableOutput).ImportTableDescription.ImportArn
+		if _, err = waitImportComplete(ctx, conn, aws.StringValue(importArn), d.Timeout(schema.TimeoutCreate)); err != nil {
+			d.SetId(tableName)
+			return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionCreating, ResNameTable, tableName, err)
+		}
 	} else {
 		input := &dynamodb.CreateTableInput{
 			BillingMode: aws.String(d.Get("billing_mode").(string)),

internal/service/dynamodb/wait.go

@@ -77,6 +77,27 @@ func waitTableActive(ctx context.Context, conn *dynamodb.DynamoDB, tableName str
 	return nil, err
 }
 
+func waitImportComplete(ctx context.Context, conn *dynamodb.DynamoDB, importArn string, timeout time.Duration) (*dynamodb.DescribeImportOutput, error) {
+	stateConf := &retry.StateChangeConf{
+		Pending: []string{dynamodb.ImportStatusInProgress},
+		Target:  []string{dynamodb.ImportStatusCompleted},
+		Timeout: maxDuration(createTableTimeout, timeout),
+		Refresh: statusImport(ctx, conn, importArn),
+	}
+
+	outputRaw, err := stateConf.WaitForStateContext(ctx)
+
+	if err != nil {
+		err = fmt.Errorf("ImportArn %q : %w", importArn, err)
+	}
+
+	if output, ok := outputRaw.(*dynamodb.DescribeImportOutput); ok {
+		return output, err
+	}
+
+	return nil, err
+}
+
 func waitTableDeleted(ctx context.Context, conn *dynamodb.DynamoDB, tableName string, timeout time.Duration) (*dynamodb.TableDescription, error) {
 	stateConf := &retry.StateChangeConf{
 		Pending: []string{dynamodb.TableStatusActive, dynamodb.TableStatusDeleting},