New DataSource: aws_appmesh_virtual_gateway

.changelog/27057.txt

@@ -0,0 +1,3 @@
+```release-note:new-data-source
+aws_appmesh_virtual_gateway
+```

internal/service/appmesh/appmesh_test.go

@@ -67,6 +67,7 @@ func TestAccAppMesh_serial(t *testing.T) {
 			"multiListenerValidation":    testAccVirtualGateway_MultiListenerValidation,
 			"logging":                    testAccVirtualGateway_Logging,
 			"tags":                       testAccVirtualGateway_Tags,
+			"dataSourceBasic":            testAccVirtualGatewayDataSource_basic,
 		},
 		"VirtualNode": {
 			"basic":                      testAccVirtualNode_basic,

internal/service/appmesh/find.go

@@ -30,26 +30,3 @@ func FindGatewayRoute(ctx context.Context, conn *appmesh.AppMesh, meshName, virt
 
 	return output.GatewayRoute, nil
 }
-
-// FindVirtualGateway returns the virtual gateway corresponding to the specified mesh name, virtual gateway name and optional mesh owner.
-// Returns an error if no virtual gateway is found.
-func FindVirtualGateway(ctx context.Context, conn *appmesh.AppMesh, meshName, virtualGatewayName, meshOwner string) (*appmesh.VirtualGatewayData, error) {
-	input := &appmesh.DescribeVirtualGatewayInput{
-		MeshName:           aws.String(meshName),
-		VirtualGatewayName: aws.String(virtualGatewayName),
-	}
-	if meshOwner != "" {
-		input.MeshOwner = aws.String(meshOwner)
-	}
-
-	output, err := conn.DescribeVirtualGatewayWithContext(ctx, input)
-	if err != nil {
-		return nil, err
-	}
-
-	if output == nil {
-		return nil, nil
-	}
-
-	return output.VirtualGateway, nil
-}

internal/service/appmesh/mesh.go

@@ -298,22 +298,21 @@ func dataSourcePropertyFromResourceProperty(rs *schema.Schema) *schema.Schema {
 	case schema.TypeSet:
 		ds.Set = rs.Set
 		fallthrough
-	case schema.TypeList:
+	case schema.TypeList, schema.TypeMap:
 		// List & Set types are generally used for 2 cases:
 		// - a list/set of simple primitive values (e.g. list of strings)
 		// - a sub resource
-		if elem, ok := rs.Elem.(*schema.Resource); ok {
+		// Maps are usually used for maps of simple primitives
+		switch elem := rs.Elem.(type) {
+		case *schema.Resource:
 			// handle the case where the Element is a sub-resource
 			ds.Elem = &schema.Resource{
 				Schema: dataSourceSchemaFromResourceSchema(elem.Schema),
 			}
-		} else {
+		case *schema.Schema:
 			// handle simple primitive case
-			ds.Elem = rs.Elem
+			ds.Elem = &schema.Schema{Type: elem.Type}
 		}
-	default:
-		// Elem of all other types are copied as-is
-		ds.Elem = rs.Elem
 	}
 
 	return ds