Merge pull request #4573 from terraform-providers/b-aws_dynamodb_tabl…

…e-pitr-unsupportedoperation resource/aws_dynamodb_table: Handle UnknownOperationException with DescribeContinuousBackups
hashicorp · May 23, 2018 · 1c0f6fa · 1c0f6fa
2 parents 3112fef + 55f422e
commit 1c0f6fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/aws/resource_aws_dynamodb_table.go b/aws/resource_aws_dynamodb_table.go
@@ -527,7 +527,7 @@ func resourceAwsDynamoDbTableRead(d *schema.ResourceData, meta interface{}) erro
 	pitrOut, err := conn.DescribeContinuousBackups(&dynamodb.DescribeContinuousBackupsInput{
 		TableName: aws.String(d.Id()),
 	})
-	if err != nil {
+	if err != nil && !isAWSErr(err, "UnknownOperationException", "") {
 		return err
 	}
 	d.Set("point_in_time_recovery", flattenDynamoDbPitr(pitrOut))

diff --git a/aws/structure.go b/aws/structure.go
@@ -3697,16 +3697,20 @@ func flattenDynamoDbTtl(ttlDesc *dynamodb.TimeToLiveDescription) []interface{} {
 }
 
 func flattenDynamoDbPitr(pitrDesc *dynamodb.DescribeContinuousBackupsOutput) []interface{} {
-	m := map[string]interface{}{}
+	m := map[string]interface{}{
+		"enabled": false,
+	}
+
+	if pitrDesc == nil {
+		return []interface{}{m}
+	}
+
 	if pitrDesc.ContinuousBackupsDescription != nil {
 		pitr := pitrDesc.ContinuousBackupsDescription.PointInTimeRecoveryDescription
 		if pitr != nil {
 			m["enabled"] = (*pitr.PointInTimeRecoveryStatus == dynamodb.PointInTimeRecoveryStatusEnabled)
 		}
 	}
-	if len(m) > 0 {
-		return []interface{}{m}
-	}
 
 	return []interface{}{m}
 }