Merge pull request #25762 from kamilturek/f-aws-location-geofence-col…

…lection

r/aws_location_geofence_collection: new resource

.changelog/25762.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+aws_location_geofence_collection
+```

internal/provider/provider.go

@@ -1663,10 +1663,11 @@ func Provider() *schema.Provider {
 			"aws_lightsail_static_ip":                            lightsail.ResourceStaticIP(),
 			"aws_lightsail_static_ip_attachment":                 lightsail.ResourceStaticIPAttachment(),
 
-			"aws_location_map":              location.ResourceMap(),
-			"aws_location_place_index":      location.ResourcePlaceIndex(),
-			"aws_location_route_calculator": location.ResourceRouteCalculator(),
-			"aws_location_tracker":          location.ResourceTracker(),
+			"aws_location_geofence_collection": location.ResourceGeofenceCollection(),
+			"aws_location_map":                 location.ResourceMap(),
+			"aws_location_place_index":         location.ResourcePlaceIndex(),
+			"aws_location_route_calculator":    location.ResourceRouteCalculator(),
+			"aws_location_tracker":             location.ResourceTracker(),
 
 			"aws_macie_member_account_association": macie.ResourceMemberAccountAssociation(),
 			"aws_macie_s3_bucket_association":      macie.ResourceS3BucketAssociation(),

internal/service/location/geofence_collection.go

@@ -0,0 +1,237 @@
+package location
+
+import (
+	"context"
+	"errors"
+	"log"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/locationservice"
+	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
+	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	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"
+)
+
+func ResourceGeofenceCollection() *schema.Resource {
+	return &schema.Resource{
+		CreateContext: resourceGeofenceCollectionCreate,
+		ReadContext:   resourceGeofenceCollectionRead,
+		UpdateContext: resourceGeofenceCollectionUpdate,
+		DeleteContext: resourceGeofenceCollectionDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(30 * time.Minute),
+			Update: schema.DefaultTimeout(30 * time.Minute),
+			Delete: schema.DefaultTimeout(30 * time.Minute),
+		},
+
+		Schema: map[string]*schema.Schema{
+			"collection_arn": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"collection_name": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringLenBetween(1, 100),
+			},
+			"create_time": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"description": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringLenBetween(0, 1000),
+			},
+			"kms_key_id": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringLenBetween(1, 2048),
+			},
+			"update_time": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"tags":     tftags.TagsSchema(),
+			"tags_all": tftags.TagsSchemaComputed(),
+		},
+
+		CustomizeDiff: verify.SetTagsDiff,
+	}
+}
+
+const (
+	ResNameGeofenceCollection = "Geofence Collection"
+)
+
+func resourceGeofenceCollectionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	conn := meta.(*conns.AWSClient).LocationConn
+
+	in := &locationservice.CreateGeofenceCollectionInput{
+		CollectionName: aws.String(d.Get("collection_name").(string)),
+	}
+
+	if v, ok := d.GetOk("description"); ok && v != "" {
+		in.Description = aws.String(v.(string))
+	}
+
+	if v, ok := d.GetOk("kms_key_id"); ok && v != "" {
+		in.KmsKeyId = aws.String(v.(string))
+	}
+
+	defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
+	tags := defaultTagsConfig.MergeTags(tftags.New(d.Get("tags").(map[string]interface{})))
+
+	if len(tags) > 0 {
+		in.Tags = Tags(tags.IgnoreAWS())
+	}
+
+	out, err := conn.CreateGeofenceCollectionWithContext(ctx, in)
+	if err != nil {
+		return names.DiagError(names.Location, names.ErrActionCreating, ResNameGeofenceCollection, d.Get("collection_name").(string), err)
+	}
+
+	if out == nil {
+		return names.DiagError(names.Location, names.ErrActionCreating, ResNameGeofenceCollection, d.Get("collection_name").(string), errors.New("empty output"))
+	}
+
+	d.SetId(aws.StringValue(out.CollectionName))
+
+	return resourceGeofenceCollectionRead(ctx, d, meta)
+}
+
+func resourceGeofenceCollectionRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	conn := meta.(*conns.AWSClient).LocationConn
+
+	out, err := findGeofenceCollectionByName(ctx, conn, d.Id())
+
+	if !d.IsNewResource() && tfresource.NotFound(err) {
+		log.Printf("[WARN] Location GeofenceCollection (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return nil
+	}
+
+	if err != nil {
+		return names.DiagError(names.Location, names.ErrActionReading, ResNameGeofenceCollection, d.Id(), err)
+	}
+
+	d.Set("collection_arn", out.CollectionArn)
+	d.Set("collection_name", out.CollectionName)
+	d.Set("create_time", aws.TimeValue(out.CreateTime).Format(time.RFC3339))
+	d.Set("description", out.Description)
+	d.Set("kms_key_id", out.KmsKeyId)
+	d.Set("update_time", aws.TimeValue(out.UpdateTime).Format(time.RFC3339))
+
+	tags, err := ListTagsWithContext(ctx, conn, d.Get("collection_arn").(string))
+	if err != nil {
+		return names.DiagError(names.Location, names.ErrActionReading, ResNameGeofenceCollection, d.Id(), err)
+	}
+
+	defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
+	ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig
+	tags = tags.IgnoreAWS().IgnoreConfig(ignoreTagsConfig)
+
+	if err := d.Set("tags", tags.RemoveDefaultConfig(defaultTagsConfig).Map()); err != nil {
+		return names.DiagError(names.Location, names.ErrActionSetting, ResNameGeofenceCollection, d.Id(), err)
+	}
+
+	if err := d.Set("tags_all", tags.Map()); err != nil {
+		return names.DiagError(names.Location, names.ErrActionSetting, ResNameGeofenceCollection, d.Id(), err)
+	}
+
+	return nil
+}
+
+func resourceGeofenceCollectionUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	conn := meta.(*conns.AWSClient).LocationConn
+
+	update := false
+
+	in := &locationservice.UpdateGeofenceCollectionInput{
+		CollectionName: aws.String(d.Id()),
+	}
+
+	if d.HasChange("description") {
+		in.Description = aws.String(d.Get("description").(string))
+		update = true
+	}
+
+	if d.HasChange("tags_all") {
+		o, n := d.GetChange("tags_all")
+
+		if err := UpdateTags(conn, d.Get("collection_arn").(string), o, n); err != nil {
+			return names.DiagError(names.Location, names.ErrActionUpdating, ResNameGeofenceCollection, d.Id(), err)
+		}
+	}
+
+	if !update {
+		return nil
+	}
+
+	log.Printf("[DEBUG] Updating Location GeofenceCollection (%s): %#v", d.Id(), in)
+	_, err := conn.UpdateGeofenceCollectionWithContext(ctx, in)
+	if err != nil {
+		return names.DiagError(names.Location, names.ErrActionUpdating, ResNameGeofenceCollection, d.Id(), err)
+	}
+
+	return resourceGeofenceCollectionRead(ctx, d, meta)
+}
+
+func resourceGeofenceCollectionDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	conn := meta.(*conns.AWSClient).LocationConn
+
+	log.Printf("[INFO] Deleting Location GeofenceCollection %s", d.Id())
+
+	_, err := conn.DeleteGeofenceCollectionWithContext(ctx, &locationservice.DeleteGeofenceCollectionInput{
+		CollectionName: aws.String(d.Id()),
+	})
+
+	if tfawserr.ErrCodeEquals(err, locationservice.ErrCodeResourceNotFoundException) {
+		return nil
+	}
+
+	if err != nil {
+		return names.DiagError(names.Location, names.ErrActionDeleting, ResNameGeofenceCollection, d.Id(), err)
+	}
+
+	return nil
+}
+
+func findGeofenceCollectionByName(ctx context.Context, conn *locationservice.LocationService, name string) (*locationservice.DescribeGeofenceCollectionOutput, error) {
+	in := &locationservice.DescribeGeofenceCollectionInput{
+		CollectionName: aws.String(name),
+	}
+
+	out, err := conn.DescribeGeofenceCollectionWithContext(ctx, in)
+	if tfawserr.ErrCodeEquals(err, locationservice.ErrCodeResourceNotFoundException) {
+		return nil, &resource.NotFoundError{
+			LastError:   err,
+			LastRequest: in,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if out == nil {
+		return nil, tfresource.NewEmptyResultError(in)
+	}
+
+	return out, nil
+}