Merge pull request #37361 from DanielRieske/f/add-budgets-tags

Added `tags` to `budgets` resources

.changelog/37361.txt

@@ -0,0 +1,9 @@
+```release-note:enhancement
+resource/aws_budgets_budget: Add `tags` argument
+```
+```release-note:enhancement
+resource/aws_budgets_budget_action: Add `tags` argument
+```
+```release-note:enhancement
+data-source/aws_budgets_budget: Add `tags` attribute
+```

internal/service/budgets/budget.go

@@ -26,13 +26,15 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
+	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
 	"github.com/shopspring/decimal"
 )
 
 // @SDKResource("aws_budgets_budget")
+// @Tags(identifierAttribute="arn")
 func ResourceBudget() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceBudgetCreate,
@@ -272,6 +274,8 @@ func ResourceBudget() *schema.Resource {
 				},
 				ConflictsWith: []string{"limit_amount", "limit_unit"},
 			},
+			names.AttrTags:    tftags.TagsSchema(),
+			names.AttrTagsAll: tftags.TagsSchemaComputed(),
 			"time_period_end": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -290,6 +294,7 @@ func ResourceBudget() *schema.Resource {
 				ValidateDiagFunc: enum.Validate[awstypes.TimeUnit](),
 			},
 		},
+		CustomizeDiff: verify.SetTagsDiff,
 	}
 }
 
@@ -313,8 +318,9 @@ func resourceBudgetCreate(ctx context.Context, d *schema.ResourceData, meta inte
 	}
 
 	_, err = conn.CreateBudget(ctx, &budgets.CreateBudgetInput{
-		AccountId: aws.String(accountID),
-		Budget:    budget,
+		AccountId:    aws.String(accountID),
+		Budget:       budget,
+		ResourceTags: getTagsIn(ctx),
 	})
 
 	if err != nil {

internal/service/budgets/budget_action.go

@@ -24,12 +24,14 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
 	"github.com/hashicorp/terraform-provider-aws/internal/flex"
+	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 	"github.com/hashicorp/terraform-provider-aws/internal/verify"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 // @SDKResource("aws_budgets_budget_action")
+// @Tags(identifierAttribute="arn")
 func ResourceBudgetAction() *schema.Resource {
 	return &schema.Resource{
 		CreateWithoutTimeout: resourceBudgetActionCreate,
@@ -221,7 +223,10 @@ func ResourceBudgetAction() *schema.Resource {
 					},
 				},
 			},
+			names.AttrTags:    tftags.TagsSchema(),
+			names.AttrTagsAll: tftags.TagsSchemaComputed(),
 		},
+		CustomizeDiff: verify.SetTagsDiff,
 	}
 }
 
@@ -243,6 +248,7 @@ func resourceBudgetActionCreate(ctx context.Context, d *schema.ResourceData, met
 		ExecutionRoleArn: aws.String(d.Get("execution_role_arn").(string)),
 		NotificationType: awstypes.NotificationType(d.Get("notification_type").(string)),
 		Subscribers:      expandBudgetActionSubscriber(d.Get("subscriber").(*schema.Set)),
+		ResourceTags:     getTagsIn(ctx),
 	}
 
 	outputRaw, err := tfresource.RetryWhenIsA[*awstypes.AccessDeniedException](ctx, propagationTimeout, func() (interface{}, error) {
@@ -324,40 +330,42 @@ func resourceBudgetActionUpdate(ctx context.Context, d *schema.ResourceData, met
 		return sdkdiag.AppendFromErr(diags, err)
 	}
 
-	input := &budgets.UpdateBudgetActionInput{
-		AccountId:  aws.String(accountID),
-		ActionId:   aws.String(actionID),
-		BudgetName: aws.String(budgetName),
-	}
+	if d.HasChangesExcept(names.AttrTags, names.AttrTagsAll) {
+		input := &budgets.UpdateBudgetActionInput{
+			AccountId:  aws.String(accountID),
+			ActionId:   aws.String(actionID),
+			BudgetName: aws.String(budgetName),
+		}
 
-	if d.HasChange("action_threshold") {
-		input.ActionThreshold = expandBudgetActionActionThreshold(d.Get("action_threshold").([]interface{}))
-	}
+		if d.HasChange("action_threshold") {
+			input.ActionThreshold = expandBudgetActionActionThreshold(d.Get("action_threshold").([]interface{}))
+		}
 
-	if d.HasChange("approval_model") {
-		input.ApprovalModel = awstypes.ApprovalModel(d.Get("approval_model").(string))
-	}
+		if d.HasChange("approval_model") {
+			input.ApprovalModel = awstypes.ApprovalModel(d.Get("approval_model").(string))
+		}
 
-	if d.HasChange("definition") {
-		input.Definition = expandBudgetActionActionDefinition(d.Get("definition").([]interface{}))
-	}
+		if d.HasChange("definition") {
+			input.Definition = expandBudgetActionActionDefinition(d.Get("definition").([]interface{}))
+		}
 
-	if d.HasChange("execution_role_arn") {
-		input.ExecutionRoleArn = aws.String(d.Get("execution_role_arn").(string))
-	}
+		if d.HasChange("execution_role_arn") {
+			input.ExecutionRoleArn = aws.String(d.Get("execution_role_arn").(string))
+		}
 
-	if d.HasChange("notification_type") {
-		input.NotificationType = awstypes.NotificationType(d.Get("notification_type").(string))
-	}
+		if d.HasChange("notification_type") {
+			input.NotificationType = awstypes.NotificationType(d.Get("notification_type").(string))
+		}
 
-	if d.HasChange("subscriber") {
-		input.Subscribers = expandBudgetActionSubscriber(d.Get("subscriber").(*schema.Set))
-	}
+		if d.HasChange("subscriber") {
+			input.Subscribers = expandBudgetActionSubscriber(d.Get("subscriber").(*schema.Set))
+		}
 
-	_, err = conn.UpdateBudgetAction(ctx, input)
+		_, err = conn.UpdateBudgetAction(ctx, input)
 
-	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "updating Budget Action (%s): %s", d.Id(), err)
+		if err != nil {
+			return sdkdiag.AppendErrorf(diags, "updating Budget Action (%s): %s", d.Id(), err)
+		}
 	}
 
 	return append(diags, resourceBudgetActionRead(ctx, d, meta)...)