lexv2models/intent: New resource

.changelog/34891.txt

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

GNUmakefile

@@ -90,9 +90,10 @@ cleango: ## Clean up Go cache
 		echo "Killing gopls process $$proc" ; \
 		kill -9 $$proc ; \
 	done ; \
-	go clean -modcache -testcache -cache ; \
+	$(GO_VER) clean -modcache -testcache -cache ; \
 
 clean: cleango build tools ## Clean up Go cache and re-install tools
+	$(GO_VER) mod tidy
 
 copyright: ## Run copywrite (generate source code headers)
 	@copywrite headers

internal/framework/flex/auto_expand_test.go

@@ -464,7 +464,7 @@ func TestExpandGeneric(t *testing.T) {
 		{
 			TestName: "map string",
 			Source: &TestFlexTF11{
-				FieldInner: fwtypes.NewMapValueOf(ctx, map[string]basetypes.StringValue{
+				FieldInner: fwtypes.NewMapValueOfMust[types.String](ctx, map[string]attr.Value{
 					"x": types.StringValue("y"),
 				}),
 			},
@@ -537,7 +537,7 @@ func TestExpandGeneric(t *testing.T) {
 			TestName: "nested string map",
 			Source: &TestFlexTF14{
 				FieldOuter: fwtypes.NewListNestedObjectValueOfPtr(ctx, &TestFlexTF11{
-					FieldInner: fwtypes.NewMapValueOf(ctx, map[string]basetypes.StringValue{
+					FieldInner: fwtypes.NewMapValueOfMust[basetypes.StringValue](ctx, map[string]attr.Value{
 						"x": types.StringValue("y"),
 					}),
 				}),
@@ -744,7 +744,7 @@ func TestExpandGeneric(t *testing.T) {
 						},
 					}),
 				}),
-				SessionAttributes: fwtypes.NewMapValueOf(ctx, map[string]basetypes.StringValue{
+				SessionAttributes: fwtypes.NewMapValueOfMust[basetypes.StringValue](ctx, map[string]attr.Value{
 					"x": basetypes.NewStringValue("y"),
 				}),
 			},

internal/framework/flex/auto_flatten_test.go

@@ -259,11 +259,11 @@ func TestFlatten(t *testing.T) {
 					types.StringValue("a"),
 					types.StringValue("b"),
 				}),
-				Field5: fwtypes.NewMapValueOf[types.String](ctx, map[string]basetypes.StringValue{
+				Field5: fwtypes.NewMapValueOfMust[types.String](ctx, map[string]attr.Value{
 					"A": types.StringValue("a"),
 					"B": types.StringValue("b"),
 				}),
-				Field6: fwtypes.NewMapValueOf[types.String](ctx, map[string]basetypes.StringValue{
+				Field6: fwtypes.NewMapValueOfMust[types.String](ctx, map[string]attr.Value{
 					"A": types.StringValue("a"),
 					"B": types.StringValue("b"),
 				}),
@@ -624,7 +624,7 @@ func TestFlattenGeneric(t *testing.T) {
 			},
 			Target: &TestFlexTF11{},
 			WantTarget: &TestFlexTF11{
-				FieldInner: fwtypes.NewMapValueOf(ctx, map[string]basetypes.StringValue{
+				FieldInner: fwtypes.NewMapValueOfMust[basetypes.StringValue](ctx, map[string]attr.Value{
 					"x": types.StringValue("y"),
 				}),
 			},
@@ -719,7 +719,7 @@ func TestFlattenGeneric(t *testing.T) {
 			Target: &TestFlexTF14{},
 			WantTarget: &TestFlexTF14{
 				FieldOuter: fwtypes.NewListNestedObjectValueOfPtr(ctx, &TestFlexTF11{
-					FieldInner: fwtypes.NewMapValueOf(ctx, map[string]basetypes.StringValue{
+					FieldInner: fwtypes.NewMapValueOfMust[basetypes.StringValue](ctx, map[string]attr.Value{
 						"x": types.StringValue("y"),
 					}),
 				}),
@@ -895,7 +895,7 @@ func TestFlattenGeneric(t *testing.T) {
 						},
 					}),
 				}),
-				SessionAttributes: fwtypes.NewMapValueOf(ctx, map[string]basetypes.StringValue{
+				SessionAttributes: fwtypes.NewMapValueOfMust[basetypes.StringValue](ctx, map[string]attr.Value{
 					"x": basetypes.NewStringValue("y"),
 				}),
 			},

internal/framework/types/mapof.go

@@ -6,25 +6,28 @@ package types
 import (
 	"context"
 	"fmt"
-	"reflect"
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
-	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs/fwdiag"
 )
 
-var _ basetypes.MapTypable = MapTypeOf[struct{}]{}
+var (
+	_ basetypes.MapTypable  = MapTypeOf[basetypes.StringValue]{}
+	_ basetypes.MapValuable = MapValueOf[basetypes.StringValue]{}
+)
 
 // MapTypeOf is the attribute type of a MapValueOf.
-type MapTypeOf[T any] struct {
+type MapTypeOf[T attr.Value] struct {
 	basetypes.MapType
 }
 
-func NewMapTypeOf[T any](ctx context.Context) MapTypeOf[T] {
-	return MapTypeOf[T]{basetypes.MapType{ElemType: ElementTypeMust[T](ctx)}}
+func NewMapTypeOf[T attr.Value](ctx context.Context) MapTypeOf[T] {
+	var zero T
+	return MapTypeOf[T]{basetypes.MapType{ElemType: zero.Type(ctx)}}
 }
 
 func (t MapTypeOf[T]) Equal(o attr.Type) bool {
@@ -38,11 +41,13 @@ func (t MapTypeOf[T]) Equal(o attr.Type) bool {
 }
 
 func (t MapTypeOf[T]) String() string {
-	return "types.MapTypeOf[" + t.ElementType().String() + "]"
+	var zero T
+	return fmt.Sprintf("%T", zero)
 }
 
 func (t MapTypeOf[T]) ValueFromMap(ctx context.Context, in basetypes.MapValue) (basetypes.MapValuable, diag.Diagnostics) {
 	var diags diag.Diagnostics
+	var zero T
 
 	if in.IsNull() {
 		return NewMapValueOfNull[T](ctx), diags
@@ -55,10 +60,10 @@ func (t MapTypeOf[T]) ValueFromMap(ctx context.Context, in basetypes.MapValue) (
 	// internal organs of framework and autoflex only to discover the
 	// first argument in this call should be an element type not the map
 	// type.
-	mapValue, d := basetypes.NewMapValue(t.ElementType(), in.Elements())
+	mapValue, d := basetypes.NewMapValue(zero.Type(ctx), in.Elements())
 	diags.Append(d...)
 	if diags.HasError() {
-		return NewMapValueOfUnknown[T](ctx), diags
+		return basetypes.NewMapUnknown(types.StringType), diags
 	}
 
 	value := MapValueOf[T]{
@@ -92,10 +97,8 @@ func (t MapTypeOf[T]) ValueType(ctx context.Context) attr.Value {
 	return MapValueOf[T]{}
 }
 
-var _ basetypes.MapValuable = MapValueOf[struct{}]{}
-
 // MapValueOf represents a Terraform Plugin Framework Map value whose elements are of type MapTypeOf.
-type MapValueOf[T any] struct {
+type MapValueOf[T attr.Value] struct {
 	basetypes.MapValue
 }
 
@@ -113,32 +116,27 @@ func (v MapValueOf[T]) Type(ctx context.Context) attr.Type {
 	return NewMapTypeOf[T](ctx)
 }
 
-func NewMapValueOfNull[T any](ctx context.Context) MapValueOf[T] {
-	return MapValueOf[T]{MapValue: basetypes.NewMapNull(NewMapTypeOf[T](ctx))}
-}
+func NewMapValueOf[T attr.Value](ctx context.Context, elements map[string]attr.Value) (MapValueOf[T], diag.Diagnostics) {
+	var zero T
 
-func NewMapValueOfUnknown[T any](ctx context.Context) MapValueOf[T] {
-	return MapValueOf[T]{MapValue: basetypes.NewMapUnknown(NewMapTypeOf[T](ctx))}
-}
+	mapValue, diags := basetypes.NewMapValue(zero.Type(ctx), elements)
+	if diags.HasError() {
+		return NewMapValueOfUnknown[T](ctx), diags
+	}
 
-func NewMapValueOf[T any](ctx context.Context, elements map[string]T) MapValueOf[T] {
-	return MapValueOf[T]{MapValue: fwdiag.Must(basetypes.NewMapValueFrom(ctx, ElementTypeMust[T](ctx), elements))}
+	return MapValueOf[T]{MapValue: mapValue}, diags
 }
 
-func ElementType[T any](ctx context.Context) (attr.Type, error) {
-	var t T
-	val := reflect.ValueOf(t)
-	typ := val.Type()
-
-	v, ok := val.Interface().(attr.Value)
-
-	if !ok {
-		return nil, fmt.Errorf("%T has unsupported type: %s", t, typ)
-	}
+func NewMapValueOfNull[T attr.Value](ctx context.Context) MapValueOf[T] {
+	var zero T
+	return MapValueOf[T]{MapValue: basetypes.NewMapNull(zero.Type(ctx))}
+}
 
-	return v.Type(ctx), nil
+func NewMapValueOfUnknown[T attr.Value](ctx context.Context) MapValueOf[T] {
+	var zero T
+	return MapValueOf[T]{MapValue: basetypes.NewMapUnknown(zero.Type(ctx))}
 }
 
-func ElementTypeMust[T any](ctx context.Context) attr.Type {
-	return errs.Must(ElementType[T](ctx))
+func NewMapValueOfMust[T attr.Value](ctx context.Context, elements map[string]attr.Value) MapValueOf[T] {
+	return fwdiag.Must(NewMapValueOf[T](ctx, elements))
 }

internal/service/lexv2models/bot_locale.go

@@ -374,6 +374,7 @@ func waitBotLocaleCreated(ctx context.Context, conn *lexmodelsv2.Client, id stri
 		Target:                    enum.Slice(awstypes.BotLocaleStatusBuilt, awstypes.BotLocaleStatusNotBuilt),
 		Refresh:                   statusBotLocale(ctx, conn, id),
 		Timeout:                   timeout,
+		MinTimeout:                5 * time.Second,
 		NotFoundChecks:            20,
 		ContinuousTargetOccurence: 2,
 	}

internal/service/lexv2models/exports_test.go

@@ -8,4 +8,5 @@ var (
 	ResourceBot        = newResourceBot
 	ResourceBotLocale  = newResourceBotLocale
 	ResourceBotVersion = newResourceBotVersion
+	ResourceIntent     = newResourceIntent
 )