new resource: aws_cognito_managed_user_pool_client

.ci/.golangci2.yml

@@ -89,6 +89,7 @@ linters-settings:
           # Terraform Plugin Framework
           - int64validator.*
           - listvalidator.*
+          - setvalidator.*
           - stringvalidator.*
           - SetDefaultCreateTimeout
           - SetDefaultReadTimeout

.ci/scripts/markdown-link-check.sh

@@ -3,7 +3,7 @@
 # Local script runner for recursive markdown-link-check
 # Based on: https://github.com/gaurav-nelson/github-action-markdown-link-check/blob/master/entrypoint.sh
 
-link_check_container="markdown-link-check"
+link_check_container="ghcr.io/tcort/markdown-link-check"
 
 if [ "${LINK_CHECK_CONTAINER}" != "" ]; then
   link_check_container="${LINK_CHECK_CONTAINER}"
@@ -24,15 +24,15 @@ output_file="markdown-link-check-output.txt"
 rm -f "$error_file" "$output_file"
 
 docker run --rm -i -t \
-  -v $(pwd):/github/workspace:ro \
+  -v "$(pwd):/github/workspace:ro" \
   -w /github/workspace \
   --entrypoint /usr/bin/find \
   "${link_check_container}" \
   docs -type f -name "*.md" -exec /src/markdown-link-check --config .ci/.markdownlinkcheck.json --quiet --verbose {} \; \
   | tee -a "${output_file}"
 
 docker run --rm -i -t \
-  -v $(pwd):/github/workspace:ro \
+  -v "$(pwd):/github/workspace:ro" \
   -w /github/workspace \
   --entrypoint /usr/bin/find \
   "${link_check_container}" \

.ci/semgrep/framework/flex.yml

@@ -0,0 +1,13 @@
+rules:
+  - id: flex-type-from-framework
+    languages: [go]
+    message: Prefer `flex.<type>FromFramework` to `aws.<type>(x.Value<type>())`
+    paths:
+      include:
+        - internal/service/cognitoidp
+    patterns:
+      - pattern: aws.$TYPE($X.$VALFUNC())
+      - metavariable-comparison:
+          metavariable: $VALFUNC
+          comparison: re.match("\AValue", str($VALFUNC))
+    severity: WARNING

.github/labeler-pr-triage.yml

@@ -244,6 +244,7 @@ service/cognitoidentity:
 service/cognitoidp:
   - 'internal/service/cognitoidp/**/*'
   - 'website/**/cognito_identity_provider*'
+  - 'website/**/cognito_managed_user*'
   - 'website/**/cognito_resource_*'
   - 'website/**/cognito_user*'
   - 'website/**/cognito_risk*'

internal/create/errors.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 
+	fwdiag "github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
@@ -59,6 +60,13 @@ func DiagError(service, action, resource, id string, gotError error) diag.Diagno
 	}
 }
 
+func DiagErrorFramework(service, action, resource, id string, gotError error) fwdiag.Diagnostic {
+	return fwdiag.NewErrorDiagnostic(
+		ProblemStandardMessage(service, action, resource, id, nil),
+		gotError.Error(),
+	)
+}
+
 func DiagErrorMessage(service, action, resource, id, message string) diag.Diagnostics {
 	return diag.Diagnostics{
 		diag.Diagnostic{

internal/framework/attrtypes.go

@@ -40,3 +40,11 @@ func AttributeTypes[T any](ctx context.Context) (map[string]attr.Type, error) {
 
 	return attributeTypes, nil
 }
+
+func AttributeTypesMust[T any](ctx context.Context) map[string]attr.Type {
+	types, err := AttributeTypes[T](ctx)
+	if err != nil {
+		panic(fmt.Sprintf("AttributeTypesMust[%T] received error: %s", *new(T), err))
+	}
+	return types
+}

internal/framework/flex/flex.go

@@ -0,0 +1,80 @@
+package flex
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/aws/arn"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/types"
+	"github.com/hashicorp/terraform-provider-aws/internal/flex"
+	fwtypes "github.com/hashicorp/terraform-provider-aws/internal/framework/types"
+)
+
+// Breaking the cycles without changing all files
+var (
+	BoolFromFramework        = flex.BoolFromFramework
+	ExpandFrameworkStringSet = flex.ExpandFrameworkStringSet
+	Int64FromFramework       = flex.Int64FromFramework
+	StringFromFramework      = flex.StringFromFramework
+)
+
+var (
+	BoolToFramework           = flex.BoolToFramework
+	FlattenFrameworkStringSet = flex.FlattenFrameworkStringSet
+	Int64ToFramework          = flex.Int64ToFramework
+	Int64ToFrameworkLegacy    = flex.Int64ToFrameworkLegacy
+	StringToFramework         = flex.StringToFramework
+	StringToFrameworkLegacy   = flex.StringToFrameworkLegacy
+)
+
+func ARNStringFromFramework(_ context.Context, v fwtypes.ARN) *string {
+	if v.IsNull() || v.IsUnknown() {
+		return nil
+	}
+
+	return aws.String(v.ValueARN().String())
+}
+
+func StringToFrameworkARN(ctx context.Context, v *string, diags *diag.Diagnostics) fwtypes.ARN {
+	if v == nil {
+		return fwtypes.ARNNull()
+	}
+
+	a, err := arn.Parse(aws.ToString(v))
+	if err != nil {
+		diags.AddError(
+			"Parsing Error",
+			fmt.Sprintf("String %s cannot be parsed as an ARN.", aws.ToString(v)),
+		)
+	}
+
+	return fwtypes.ARNValue(a)
+}
+
+func Int64FromFrameworkLegacy(_ context.Context, v types.Int64) *int64 {
+	if v.IsNull() || v.IsUnknown() {
+		return nil
+	}
+
+	i := v.ValueInt64()
+	if i == 0 {
+		return nil
+	}
+
+	return aws.Int64(i)
+}
+
+func StringFromFrameworkLegacy(_ context.Context, v types.String) *string {
+	if v.IsNull() || v.IsUnknown() {
+		return nil
+	}
+
+	s := v.ValueString()
+	if s == "" {
+		return nil
+	}
+
+	return aws.String(s)
+}