move deprecation message up near field name

hashicorp · Feb 3, 2022 · b29908a · b29908a
1 parent 2c8cfa8
commit b29908a
Showing 1 changed file with 30 additions and 29 deletions.
diff --git a/internal/service/s3/bucket.go b/internal/service/s3/bucket.go
@@ -395,8 +395,9 @@ func ResourceBucket() *schema.Resource {
 			},
 
 			"replication_configuration": {
-				Type:     schema.TypeList,
-				Computed: true,
+				Type:       schema.TypeList,
+				Computed:   true,
+				Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"role": {
@@ -405,8 +406,9 @@ func ResourceBucket() *schema.Resource {
 							Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 						},
 						"rules": {
-							Type:     schema.TypeSet,
-							Computed: true,
+							Type:       schema.TypeSet,
+							Computed:   true,
+							Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"id": {
@@ -415,8 +417,9 @@ func ResourceBucket() *schema.Resource {
 										Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 									},
 									"destination": {
-										Type:     schema.TypeList,
-										Computed: true,
+										Type:       schema.TypeList,
+										Computed:   true,
+										Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"account_id": {
@@ -440,8 +443,9 @@ func ResourceBucket() *schema.Resource {
 													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 												},
 												"access_control_translation": {
-													Type:     schema.TypeList,
-													Computed: true,
+													Type:       schema.TypeList,
+													Computed:   true,
+													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 													Elem: &schema.Resource{
 														Schema: map[string]*schema.Schema{
 															"owner": {
@@ -451,11 +455,11 @@ func ResourceBucket() *schema.Resource {
 															},
 														},
 													},
-													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 												},
 												"replication_time": {
-													Type:     schema.TypeList,
-													Computed: true,
+													Type:       schema.TypeList,
+													Computed:   true,
+													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 													Elem: &schema.Resource{
 														Schema: map[string]*schema.Schema{
 															"minutes": {
@@ -470,11 +474,11 @@ func ResourceBucket() *schema.Resource {
 															},
 														},
 													},
-													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 												},
 												"metrics": {
-													Type:     schema.TypeList,
-													Computed: true,
+													Type:       schema.TypeList,
+													Computed:   true,
+													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 													Elem: &schema.Resource{
 														Schema: map[string]*schema.Schema{
 															"minutes": {
@@ -489,19 +493,20 @@ func ResourceBucket() *schema.Resource {
 															},
 														},
 													},
-													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 												},
 											},
 										},
 									},
 									"source_selection_criteria": {
-										Type:     schema.TypeList,
-										Computed: true,
+										Type:       schema.TypeList,
+										Computed:   true,
+										Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"sse_kms_encrypted_objects": {
-													Type:     schema.TypeList,
-													Computed: true,
+													Type:       schema.TypeList,
+													Computed:   true,
+													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 													Elem: &schema.Resource{
 														Schema: map[string]*schema.Schema{
 															"enabled": {
@@ -511,11 +516,9 @@ func ResourceBucket() *schema.Resource {
 															},
 														},
 													},
-													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 												},
 											},
 										},
-										Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 									},
 									"prefix": {
 										Type:       schema.TypeString,
@@ -533,19 +536,19 @@ func ResourceBucket() *schema.Resource {
 										Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 									},
 									"filter": {
-										Type:     schema.TypeList,
-										Optional: true,
-										Computed: true,
+										Type:       schema.TypeList,
+										Computed:   true,
+										Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{
 												"prefix": {
-													Type:     schema.TypeString,
-													Computed: true,
+													Type:       schema.TypeString,
+													Computed:   true,
+													Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 												},
 												"tags": tftags.TagsSchemaComputedDeprecated("Use the aws_s3_bucket_replication__configuration resource instead"),
 											},
 										},
-										Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 									},
 									"delete_marker_replication_status": {
 										Type:       schema.TypeString,
@@ -554,11 +557,9 @@ func ResourceBucket() *schema.Resource {
 									},
 								},
 							},
-							Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 						},
 					},
 				},
-				Deprecated: "Use the aws_s3_bucket_replication__configuration resource instead",
 			},
 
 			"server_side_encryption_configuration": {