Merge pull request #79 from OpsHelmInc/fix-types

fix some mismatched types

Author: kylemcc

codegen/recipes/ecs.go

@@ -8,7 +8,7 @@ import (
 	"github.com/cloudquery/plugin-sdk/codegen"
 	"github.com/cloudquery/plugin-sdk/schema"
 
-	"github.com/OpsHelmInc/cloudquery/resources/services/ecs/models"
+	"github.com/OpsHelmInc/ohaws"
 )
 
 func ECSResources() []*Resource {
@@ -104,11 +104,12 @@ func ECSResources() []*Resource {
 			Relations: []string{},
 		},
 		{
-			SubService:          "task_definitions",
-			Struct:              &models.TaskDefinitionWrapper{},
-			Description:         "https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskDefinition.html",
-			SkipFields:          []string{"TaskDefinitionArn", "Tags"},
-			PreResourceResolver: "getTaskDefinition",
+			SubService:            "task_definitions",
+			Struct:                &ohaws.TaskDefinition{},
+			UnwrapEmbeddedStructs: true,
+			Description:           "https://docs.aws.amazon.com/AmazonECS/latest/APIReference/API_TaskDefinition.html",
+			SkipFields:            []string{"TaskDefinitionArn", "Tags"},
+			PreResourceResolver:   "getTaskDefinition",
 			ExtraColumns: append(
 				defaultRegionalColumns,
 				[]codegen.ColumnDefinition{

codegen/recipes/kinesis.go

@@ -1,16 +1,17 @@
 package recipes
 
 import (
-	"github.com/aws/aws-sdk-go-v2/service/kinesis/types"
 	"github.com/cloudquery/plugin-sdk/codegen"
 	"github.com/cloudquery/plugin-sdk/schema"
+
+	"github.com/OpsHelmInc/ohaws"
 )
 
 func KinesisResources() []*Resource {
 	resources := []*Resource{
 		{
 			SubService:          "streams",
-			Struct:              &types.StreamDescriptionSummary{},
+			Struct:              &ohaws.KinesisStream{},
 			Description:         "https://docs.aws.amazon.com/kinesis/latest/APIReference/API_StreamDescriptionSummary.html",
 			SkipFields:          []string{"StreamARN"},
 			PreResourceResolver: "getStream",
@@ -23,11 +24,6 @@ func KinesisResources() []*Resource {
 						Resolver: `schema.PathResolver("StreamARN")`,
 						Options:  schema.ColumnCreationOptions{PrimaryKey: true},
 					},
-					{
-						Name:     "tags",
-						Type:     schema.TypeJSON,
-						Resolver: `resolveKinesisStreamTags`,
-					},
 				}...),
 		},
 	}

docs/tables/aws_kinesis_streams.md

@@ -16,14 +16,5 @@ The primary key for this table is **arn**.
 |account_id|String|
 |region|String|
 |arn (PK)|String|
-|tags|JSON|
-|enhanced_monitoring|JSON|
-|open_shard_count|Int|
-|retention_period_hours|Int|
-|stream_creation_timestamp|Timestamp|
-|stream_name|String|
-|stream_status|String|
-|consumer_count|Int|
-|encryption_type|String|
-|key_id|String|
-|stream_mode_details|JSON|
+|stream_description_summary|JSON|
+|tags|JSON|

resources/services/ecs/models/ecs.go

@@ -75,8 +75,3 @@ func getKinesisStreamTags(ctx context.Context, svc services.KinesisClient, strea
 
 	return tags, nil
 }
-
-func resolveKinesisStreamTags(ctx context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error {
-	r := resource.Item.(*ohaws.KinesisStream)
-	return resource.Set(c.Name, client.TagsToMap(r.Tags))
-}